f4b16852af
Merge all the new stuff
2021-06-26 19:24:59 +02:00
9763631984
Fix up the dynamic trees
2021-06-26 19:13:44 +02: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
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
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
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
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
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
c1d88bbad4
Shut up non_movable. Please.
2021-06-17 22:27:48 +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
0a0acb3d4c
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-06-17 14:01:27 +02:00
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
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
158c0eba15
Blending in with Entities
...
- Changed blueprint entity and item rendering to be more Optifine friendly (?)
- Punching blueprints now clears the slot before breaking it
- Fix a dist issue with KTEs
- Added recipe for blueprint
2021-06-16 21:39:38 +02:00
simibubi
788a00efdf
Breaks in every port
...
- Fixed the schematic hotbar overlay
- Goggles overlay is no longer its own eventhandler
2021-06-16 17:17:55 +02:00
reidbhuntley
d94a7faaa5
Tweaks n' configs
...
- Fixed ejectors stacking unstackable items
- Tweaked infinite fluid source size configuration
- Fixed a Schematicannon crash my code from a previous commit caused
- Added config for disabling large Firework Rocket recipes
- Added config for disabling movable Spawners
2021-06-14 22:03:06 -04:00
HebaruSan
18af709c9b
Scale hose pulley timer with server's infinite block threshold ( #1752 )
...
Thanks for the detailed writeup!
2021-06-14 18:02:47 -04:00
D Melton
673fc3cd8e
Make Basin interaction with Funnels work
...
Allows Basins to interact with downward facing Funnels located at an offset below and to the side. Previously would show a connection between basin and funnel but would not interact with them.
2021-06-13 09:53:05 -07:00
JozsefA
d612cfdd34
Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector
2021-06-11 10:31:18 -07:00
reidbhuntley
5bd0c73f45
Flipping pipes
...
- Pipes not connected to anything will no longer change direction when a non-connective block is placed next to them
2021-06-10 17:12:45 -04:00
simibubi
1f48c698e8
ITE refactor
2021-06-09 23:48:34 +02:00
simibubi
2852756a68
Deny ProcessingInventories from Mounted Storage
2021-06-09 17:16:10 +02:00
JozsefA
b4a1fbf2c7
Instanced entities are lit
2021-06-09 00:26:54 -07:00
JozsefA
1ce141850b
Merge remote-tracking branch 'origin/chromatic-projector' into mc1.16/chromatic-projector
2021-06-07 18:24:25 -07:00
JozsefA
9cc03a81d7
Instanced entities stage 1
2021-06-07 18:12:46 -07:00
PepperCode1
3c84087f15
Fix saw and PSI diffuse
...
- Fix saw and portable storage/fluid interface diffuse lighting
- Remove "disableDiffuseTransform" option from SuperByteBuffer
- Switch argument order in RenderedContraption constructor to be consistent with superclass (ContraptionWorldHolder)
2021-06-07 16:14:51 -07:00
JozsefA
285b8f98cf
Instanced entities stage 0
2021-06-07 02:43:36 -07:00
JozsefA
d47f898c76
Move away from a static backend class, add a registration event
2021-06-06 15:46:16 -07:00
reidbhuntley
12bfc78443
Bundle o' bugfixes
...
- Fix Extendo Grip not applying extended reach when equipped on rejoin
- Fix mechanical crafters duping + dropping their items when added to minecart contraption
- Fix Wand of Symmetry duping rails under placed cart assemblers
- Lecterns now keep NBT when moved by contraption
- Super glue entities hanging on positions above build limit now get removed
- Fix harvester replanting sweet berry bushes in wrong state
- Cuckoo clock and clockwork bearing now go crazy in unnatural dimensions
2021-06-06 16:59:15 -04:00
PepperBell
823520e047
Improve handling of dyed blocks
...
- Create DyedBlockList for storing and accessing a set of dyed blocks
- Switch usage of BlockEntry<?>[] to DyedBlockList in AllBlocks
- These changes also finally fix the compilation error related to generic arrays
2021-06-05 10:43:16 -07:00
reidbhuntley
fec329e3d2
Make deployer check for consumed actions too
2021-06-05 12:29:56 -04:00
PepperBell
2bada365b3
Registrate colors and organized item rendering
...
- Use Registrate's block and item color registration instead of running
the events manually
- Move utility color handler methods to foundation.utility
- Move all item rendering classes to foundation.item.render
- Move IBlockVertexColor from foundation.block to
foundation.block.render
- Remove unnecessary raw cast in CreateRegistrate
2021-06-04 21:26:25 -07:00
JozsefA
457fff78f3
Mostly untangle the loading functions, enforce triangles
2021-06-04 17:55:05 -07:00
JozsefA
9bac709dfd
Event system, sort of untangle backend
2021-06-04 15:56:46 -07:00
JozsefA
bef6d77a59
Start working on instanced enti- oh wait I've got to do all this other stuff first
...
- Separate model-level instance management from object-level instance management
- Separate material management from rendering
- A few things here and there related to entity instancing
- Add a rudimentary command to spawn superglue
2021-06-03 21:23:06 -07:00
JozsefA
59dd21b85a
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/main/java/com/simibubi/create/AllContainerTypes.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
2021-06-01 11:47:15 -07:00
JozsefA
c4b828ba56
Allocate no more than 3 quad->triangle EBOs ever.
2021-05-31 14:58:49 -07:00
simibubi
8fe3901c98
Remove leftover debug call
2021-05-31 22:48:45 +02:00
JozsefA
a526156440
Move a package
2021-05-31 12:51:11 -07:00
reidbhuntley
53ba59c082
Improve stability of sequenced gearshift (esp. for rotations) ( #1695 )
2021-05-31 15:42:12 -04:00
simibubi
a9ced3fea2
SoundScapes, Part IV
...
- Fixed diving helmet activating when wielder is only partially submerged in water
- Fixed diving helmet activating for players in creative mode
- Added sounds for the Mechanical Saw
- Added clicking sounds for the Linked Controller
- Gantry contraptions now make contraption noises
- Soundscapes now lower their volume based on the distance between listener and center of noise
2021-05-31 20:48:22 +02:00