Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:02:48 +01:00
Code Issues Projects Releases Packages Wiki Activity
2087 commits 31 branches 14 tags 108 MiB
Commit graph

2087 commits

This branch
This branch
All branches
Author SHA1 Message Date
simibubi
9a020dd02a Thinking via Pipes 
- Pondering for Pumps, Smart Pipes, Valves
 2021-06-24 11:49:46 +02:00
JozsefA
0c5fb3de3e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-24 01:21:45 -07:00
JozsefA
abf8bc8a4e Fix crash on resource reload 
- Invalidate contraption renderers on context gathering
 2021-06-24 01:21:33 -07:00
PepperBell
178af2061f Fix harvester culling 
- Make harvester's render box a unit cube
- Expose manually animated speed through getter
 2021-06-23 23:05:31 -07:00
PepperBell
8d90137b1a Remove TooltipHelper.getUnformattedDeepText 
- Replace it with ITextComponent.getString
 2021-06-23 22:32:42 -07:00
JozsefA
1e65e3aee6 Bump flywheel build 2021-06-23 13:29:45 -07:00
JozsefA
3ce4e2c5e8 Cleanup flywheel event listeners, fix crash on server startup 2021-06-23 13:19:03 -07:00
PepperBell
0bc1a71558 Crash-proof nixie tubes 
- Add many checks when reading NBT to prevent crashes
- Store rendered strings and only update when necessary
- Reorganize some code and rename some members
 2021-06-23 12:34:12 -07:00
PepperBell
c9f9be73ff Buildscript tweaks 
- Move Flywheel version to gradle.properties
- Use implementation instead of compile
 2021-06-23 12:30:10 -07:00
JozsefA
c9d95e83ae Bump flywheel build 2021-06-23 09:13:31 -07:00
JozsefA
d189efd987 Whoops missed some classes 2021-06-23 00:16:24 -07:00
JozsefA
312b327161 Fix fluid rendering bug 
- ContraptionRenderDispatcher wasn't cleaning up its state, so fluids were being drawn with the wrong shader program
 2021-06-23 00:01:19 -07:00
JozsefA
64c55c1205 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	README.md
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pl_pl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
 2021-06-22 21:13:34 -07:00
JozsefA
dd63c6c4e3 Cleanup and get ready to merge 2021-06-22 21:09:32 -07:00
grimmauld
e4a340deef Maybe fix NPE in basin tile entity. Probably should check more thoroughly, but this should patch it for now 2021-06-22 20:58:23 +02:00
simibubi
02ff18fcce
The CF badge broke 2021-06-22 12:00:17 +02:00
simibubi
0a376b719e Thinking with Pipes 
- Implemented ponder scenes for Fluid Pipes and Copper Casing
- Adjusted Fluid transfer, containment and rendering behaviours to function in 'virtual' environments
 2021-06-21 18:46:31 +02:00
reidbhuntley
813a1ccaba Prevent Belts under Tunnels from picking up item entities 2021-06-20 15:00:31 -04:00
reidbhuntley
ba0e851487 Fix inconsistency with Deployers on contraptions 
- Previously Deployers would sometimes collide with the contraption entity they were a part of and their activation would be consumed
 2021-06-20 11:07:27 -04:00
reidbhuntley
e71d03c375 Fix Deployer inventory-voiding bug 
- Deployers' inventories will no longer be voided when their contraption is disassembled and reassembled before the DeployerTileEntity can initialize
 2021-06-20 01:55:08 -04:00
JozsefA
aeff644cc3 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.json
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pl_pl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/AllContainerTypes.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
#	src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterContainer.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
#	src/main/java/com/simibubi/create/foundation/gui/mainMenu/CreateMainMenuScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
#	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/assets/create/lang/default/messages.json
#	src/main/resources/assets/create/lang/default/tooltips.json
 2021-06-19 16:11:18 -07:00
PepperBell
6d177c4366 Post-PR datagen 2021-06-19 12:44:03 -07:00
PepperCode1
1459be7926
Merge pull request #1565 from MarioSMB/mc1.16/dev 
Various recipe fixes and adjustments to improve mod compatibility
 2021-06-19 12:37:24 -07:00
JozsefA
652111c233 Yeet 2021-06-19 00:29:18 -07:00
reidbhuntley
cded120a0c Write NBT 2021-06-18 21:37:17 -04:00
reidbhuntley
e0941d7ba2
Merge pull request #1781 from AtlaStar/mc1.16/issue-1779-fix 
Make Basin spouts properly empty into paired Funnels
 2021-06-18 21:25:12 -04:00
reidbhuntley
f8111205b3 Temporary turnaround 
- Fixed Minecart Contraption Item's initial orientation being incorrect inconsistent in certain situations
 2021-06-18 20:44:15 -04:00
reidbhuntley
ecfa554c05 Spawn control 
- Cart Contraptions with attached Spawners can no longer be picked up with a wrench (configurable)
 2021-06-18 17:34:39 -04:00
simibubi
bc2b5169c8 The forgotten Keyframes 
- Added Keyframes to scenes created before the feature existed
 2021-06-18 22:13:34 +02:00
simibubi
91bc678ab4 Finding bugs explaining things 
- The portable fluid interface now waits until extracting pipes have completed their flow before disengaging
 2021-06-18 18:48:12 +02:00
simibubi
1bab1bc6d3 Ponder prep, Part II 
- Added scene for deployer's new item processing
- Fixed particles rendering faced away from the camera
- Fixed airflow particles not getting lit properly
- Fixed lack of culling in Gui ItemStack elements
- Prepared texts for all fluid-related storyboards
- Fixed ponder progress bar not displaying
 2021-06-18 18:13:40 +02:00
simibubi
c23071863d Ponder prep 
- Added tooltips for newly added tools and equipment
- Fixed depth issues in Ponder UI
- Fixed lack of backface culling in ponder
- Added placeholder storyboards for missing ponder scenes
- Fixed menu screen cogs rendering behind the background
- Fixed menu screen not pausing the game
 2021-06-18 12:45:43 +02:00
PepperBell
57c68409f5 Downgrade Registrate 
- Downgrade Registrate from 1.0.5 to 1.0.4
 2021-06-17 22:29:02 -07:00
PepperBell
1e41a390e4 Update buildscript 
- Update Gradle from 5.6.3 to 5.6.4
- Move some versions to gradle.properties
- Switch to new Forge Maven URL
- Update JEI to 1.16.5 and Mixin processor to 0.8.2
- Add out/ to .gitignore
 2021-06-17 22:04:21 -07:00
PepperBell
a15c9b0ad5 Fix errors from last commit 
- Create method overload in SchematicItem to solve errors
- Organize imports and do formatting in schematic related classes
 2021-06-17 20:32:52 -07:00
reidbhuntley
96e865be02 Schematic insta-placement now uses Schematicannon logic 2021-06-17 22:47:38 -04:00
PepperBell
e55ae22d7d Fix fluid tank render boxes 
- Update render box on client TE initialization and update packet
- Resolves #1669
 2021-06-17 14:43:40 -07:00
grimmauld
c1d88bbad4 Shut up non_movable. Please. 2021-06-17 22:27:48 +02:00
grimmauld
a6f0816611 No longer move obsidian by contraption (Stoopid datagen), this time for real 2021-06-17 21:55:13 +02:00
grimmauld
b76f2dffb5 Revert "No longer move obsidian by contraption (Stoopid datagen)" bc i was stupid 
This reverts commit f5b7dd7f7f.
 2021-06-17 21:45:49 +02:00
grimmauld
f5b7dd7f7f No longer move obsidian by contraption (Stoopid datagen) 2021-06-17 21:43:29 +02:00
simibubi
57f6e739e3 Return of the buttons 
- Added recipe for linked controller
- Removed soundspam of saws, needs continuous replacement
- Soundscapes are now reset on resource reload
 2021-06-17 16:20:15 +02:00
grimmauld
0a0acb3d4c Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-17 14:01:27 +02:00
grimmauld
084d240f05 Fix #1801 2021-06-17 14:01:20 +02:00
simibubi
4265a2855c Finally bearable 
- Entities can now jump on Mechanical Belts
- Entities on belts no longer get force-centered while actively moving or strafing
 2021-06-17 11:28:29 +02:00
simibubi
761fa2c1e9
Update README.md 2021-06-17 10:00:47 +02:00
PepperBell
1d476160cc Mechanical arm tweaks 
- Don't dance if arm speed is zero
- Rerender arm after switching back from dancing state (flywheel only)
- Formatting
 2021-06-16 17:17:16 -07:00
simibubi
06ca8b0d1c What's inside? 
- Blueprint crafting overlay now attempts to show a list of items matching an ingredient filter in the respective slot
- Fixed JEI prematurely transferring the blueprint recipe when viewed
 2021-06-17 00:54:48 +02:00
simibubi
bf1c86ed87 Flow transfer 
- Fluid pipes no longer reset their contained flows when changed to/from their windowed or encased variant
 2021-06-16 22:32:58 +02:00
simibubi
ee3d359a9a Reorder main menu 2021-06-16 21:58:46 +02:00