Commit Graph

699 Commits

Author SHA1 Message Date
tterrag
4beaab9b97 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
Update to 1.16.3

Conflicts:
	src/main/java/com/simibubi/create/AllBlockPartials.java
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/ClientEvents.java
	src/main/java/com/simibubi/create/CommonEvents.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankCTBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
	src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java
	src/main/java/com/simibubi/create/foundation/utility/AngleHelper.java
	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
	src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
2020-09-20 00:37:27 -04:00
simibubi
990d80412e Logistics' final stretch, Part I
- Brass tunnels once again have the ability to synchronize inputs among a chain
- Mechanical arms now have a range limitation
- Mechanical arms now wait with initialization until their area is fully loaded
- Chutes no longer ignore the direction of an attached fans air flow
- Chutes now render particles indicating their movement direction
- Chutes can now pull items up from belts or off the ground
- Fixed item model of shadow casing
- Fixed invisible quads under funnels when no casing is applied to the belt
- Belt mounted funnels can now be perpendicular to the belt theyre on
- Funnels can now transpose items like a hopper when facing down
2020-09-19 15:19:22 +02:00
simibubi
f58a7c8482 Fun with funnels
- Reworked funnel assets
- Andesite funnels can now be controlled via redstone input
- Re-introduced creative mounted storage
2020-09-14 21:10:38 +02:00
simibubi
2061072f8c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-09-13 22:00:15 +02:00
simibubi
03cf441674 Distribution modes for tunnels
- Item distribution across belts using brass tunnels can now be configured with a wrench
- Added new icons for the distribution options of arms and tunnels
- Removed obsolete code
- Fixed some weirdness with creative crates and funnels
2020-09-13 22:00:11 +02:00
LordGrimmauld
a015901571
Merge pull request #459 from gamrguy/render-fix
Fix unsided filters that shouldn't render
2020-09-13 11:37:56 +02:00
simibubi
651e06a70a Down the Refactor rabbit hole
- Reworked tileentity behaviours for inventory interaction
- Deployers no longer actively pull items from other inventories
- Some more work on basins
- Added a new inventory type wrapping an itemstack handler that automatically syncs the tile entity. It also implements IInventory for recipe shenanigans
- Held items of a deployer can now only be extracted by other blocks if it does not match the filter
- Fixed excess items not able to be extracted from deployers
- Removed some things
- Funnels no longer actively transpose items between chutes and inventories unless they are vertical
- Chutes can now active pull and insert items from/to inventories above/below them
2020-09-13 00:59:14 +02:00
Kryppers
bf00406cad Mind your fingers
Replaced the terrifying wooden saw bed with something more practical.
2020-09-12 21:46:54 +01:00
Colman Davenport
adfeeba5a1 Fix unsided unplaced filters still rendering 2020-09-12 15:50:12 -04:00
6604096131 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-09-12 16:37:34 +02:00
d1c6352629 Creative Crate on contraptions 2020-09-12 16:27:48 +02:00
f58245158d Chest Minecart contraptions 2020-09-12 14:59:31 +02:00
2e938c11bd Fix dispense location to be actually where the opening of the dispenser is 2020-09-12 10:23:25 +02:00
simibubi
fe2c27db35 Spout refinements
- Fixed upright items rendering inconsistently between belt and depot
- Fixed various timing and sync issues with the spout
- Added a recipe type for spout filling
- Fixed more co-modification on belts
- Item and fluid nbt tags in recipes are now data-generated as json objects rather than strings
- Transported item processing can now leave items behind
- Transported item processing now has more meaningful result data
- Tweaked spout animation
- Fixed cullfaces on spout model
2020-09-11 14:31:26 +02:00
c572b48bbe MovedProjectileDispenserBehaviour#of now takes vanilla inaccuracy and velocity into account 2020-09-11 10:58:17 +02:00
54f91c82aa Fixed entity lookup for projectile dispense behaviours not working outside the dev environment 2020-09-11 09:53:32 +02:00
simibubi
bfd4b9dbda Fixed processing recipe packet data 2020-09-11 00:00:16 +02:00
simibubi
f564ce1a33 The Buffer Kerfuffle
- Refactored animated bytebuffers
- Fixed animated buffers bleeding vertices and rendering inconsitently when switching from/to optifine shaders
2020-09-10 23:37:14 +02:00
4325cef8dc split buffering to prevent crashes when the registered ProjectileDispenseBehavior has some weird stuff going on (mod compat) 2020-09-10 16:33:29 +02:00
34f9516d54 Added indirect projectile dispense behaviours for compatibility with modded projectiles right out of the box. Removed the direct projectile behaviours from vanilla as they are now covered from the indirect implementation. 2020-09-10 16:28:55 +02:00
3d006e7e87 refactor getDispenseStack to getDispenseLocation, delete unused variable declaration in getUseableLocations, added accidentially removed comment back 2020-09-10 13:28:33 +02:00
7784e5b58d Added potion moved dispense behaviour, fixed dispense behaviour output stack not being used resulting in potential dupes 2020-09-10 13:23:05 +02:00
3b516f5022 Unstackable items are a thing, i guess 2020-09-10 11:41:23 +02:00
simibubi
59339a7bcb Re-attached MovementBehaviour to funnels 2020-09-08 18:42:11 +02:00
e493ab9ce1 Fix hopper minecart being unable to pick up item entities on top of the saw. Remove item handler capability from bottom of saw to achieve this. It is unlocigal logistical components could access the saw from the bottom anyways. 2020-09-06 13:14:52 +02:00
25bce3fc17 Fix schematicannon bedrock breaking with doors, tall flowers and beds 2020-09-06 12:43:41 +02:00
fb7b2e64b2 Fix extendo grip breaking item frames instead of making the item pop off 2020-09-06 12:07:33 +02:00
f85894b232 Fix deployer beehive crash #2 2020-09-06 11:52:41 +02:00
0a4aaaf81e Fix beehive deployer crash 2020-09-06 11:15:01 +02:00
d89807fad9 Fix wand of symmetry not applying fortune or silk touch 2020-09-06 09:35:49 +02:00
3c128946f3 Fix seapickle blockzapper dupe 2020-09-05 22:05:57 +02:00
637dee0919 Zapper and cannon now place crops in basic growth state 2020-09-05 22:02:07 +02:00
7fea4a66a0 fixed client to-desktop crash with ":" in schematic name 2020-09-05 21:30:36 +02:00
1f06acb497 Change item requirements for block zapper and schematicannon
grass path -> grass block
farmland -> dirt block
2020-09-05 21:24:00 +02:00
d73ebd0253 Changed polished stone crafting recipe to yield 4 stones to match polished vanilla stones and 1:1 stonecutter recipe 2020-09-05 20:48:34 +02:00
235cc445e8 Made AbstractEncasedShaftBlock#getPushReaction return PushReaction.NORMAL
This disables pushing of clutch, encased shaft and gearshift with vanilla piston, but is overall more consistent.
 To move TEs, use quark.
2020-09-05 18:41:40 +02:00
44bc5506cf Fix zinc ore sound inconsistency 2020-09-05 18:39:06 +02:00
a2e4ffbf86 Fix deployer adding empty NBT tag to items ike food or bonemeal if they could not be used 2020-09-05 17:43:02 +02:00
fd457c1216 Fix superglued pressure plates 2020-09-05 17:11:18 +02:00
2d94838a3e Fix beacon reading 2020-09-05 12:33:16 +02:00
Zelophed
770fbd6aaa crude dev tool for chunk unloading
- add a dev utility that allows us to force-unload chunks
- move mechanical arm scrollbox
- fix oxidizing blocks trying to access a blockstate from unloaded chunks when on the border
2020-09-04 18:04:00 +02:00
simibubi
5a7c09aa25 Filtered Basin Processing
- Basins can now be assigned a filter to narrow down the range of recipes that can be applied to its ingredients
- Some random asset updates
2020-09-04 15:16:07 +02:00
121dd935b5 Fix turtle egg blockzapper dupe 2020-09-04 14:35:49 +02:00
simibubi
00a9b1c6c7 Not enough datagen
- Expanded the RecipeProvider infrastructure
- Migrated mechanical crafting recipes to generated
- Migrated cooking recipes to generated
- Fixed missing particles on vertical motor model
- Adjusted a few recipes
2020-09-04 12:20:19 +02:00
simibubi
213b504854 ProcessingRecipe Refactor
- Reworked and cleaned up Create's ProcessingRecipes
- Prepared ProcessingRecipes for fluid ingredients and outputs
- Added datagen infrastructure to ProcessingRecipes
- Migrated all hand-written ProcessingRecipes to generated
- Removed scrollinput on mixers
- Fixed recipe lookup cache not invalidating on datapack reload
- Removed "catalyst" ingredients
2020-09-04 01:23:09 +02:00
fc048d4e76 Access transform go poof 2020-09-03 12:41:08 +02:00
bbac660048 Is this a Helmet? 2020-09-02 15:53:13 +02:00
a792880351 Clay pigeons 2020-09-02 15:38:24 +02:00
b070adc3e3 oops, double particles 2020-09-02 10:49:05 +02:00
25712f8b39 Drop and Dispense in inventories 2020-09-02 10:45:24 +02:00