Commit graph

269 commits

Author SHA1 Message Date
caa3c57b71 Merge & Port 2021-03-28 10:58:25 +02:00
simibubi
fcae7e5c9a Motion commotion
- Update recipe for redstone contact
- Counteracted ejector inaccuracies caused by deferred activation
- Rewired ponder vertex sorting to evade Optifine incompatibilities
2021-03-28 00:45:14 +01:00
60bc6102e2 Add Create stone to base_stone_overworld block tag (terraforged was complaining) 2021-03-26 23:21:44 +01:00
35c62360be Merge & Port 2021-03-26 16:03:09 +01:00
simibubi
718142e26f Faith in your Depot
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
2021-03-26 00:15:38 +01:00
simibubi
a356f8a91a Ponder and Polish
- Ponder scenes for depot, chute and smart chute
- Fixed saws and drains ejecting items when mounted funnel is backstuffed
- Fixed extracting funnels allowing items to be inserted by arms and belt input
- Vanilla items in ponder tags are marked purple instead of red
- Vertical funnels now block chutes
- Large cogs can no longer be placed right next to crafters or millstones
- Mechanical Arms now stall targeted belt items
2021-03-21 03:51:22 +01:00
7199068189 Fix some stuff, break othter stuff
- Ponder Scenes have misplaced icons
- placement helper arrows don't render
- Particles in ponders *should* work
-> added WrappedClientWorld to make that work
- fixed ponder crashingon 1.16
- moved gui stuff to matrix stacks
- remove BlockHalper#hasBlockStateProperty, as BlockState#contains is a thing
- ran runData
2021-03-20 17:33:35 +01:00
zelophed
d03ea3488a Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/blockstates/andesite_funnel.json
#	src/generated/resources/assets/create/blockstates/brass_funnel.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/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/pt_br.json
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
#	src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java
#	src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
#	src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
#	src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
#	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
#	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
#	src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
#	src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java
#	src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java
#	src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
#	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
#	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
#	src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
#	src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java
#	src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
#	src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java
#	src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java
#	src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java
#	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
#	src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java
#	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/Lang.java
#	src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java
#	src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
#	src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
2021-03-20 12:58:02 +01:00
simibubi
c0de8c4eb6 The grind continues
- Scenes for Millstone, Crushing wheels, blaze burners, basin, mixer, press, speedometer and stressometer
2021-03-19 20:05:55 +01:00
simibubi
1d3e057dda Last kinetic relays and generators
- Fixed transparency depth sorting inside ponder UI
- Scenes for Seq. Gearshift, Furnace Engine/Flywheel and Rotation Speed Controllers
2021-03-17 01:23:16 +01:00
simibubi
a897b5e78b Scene machine
- Fix funnels not rendering filter slot items
- Ponder scenes for the Deployer, Harvester and Plough
- Fixed uvs on Deployer model
- Ploughs can now harvest snow layers
2021-03-16 21:04:42 +01:00
simibubi
f1b940ea18 Cutting imaginary trees
- Fixed TEs not ticking properly when wrap-around-skipping to a keyframe
- Added a block restoration instruction
- Scenes for the Saw
- runData catching up
2021-03-15 05:49:29 +01:00
simibubi
21d87a0cfe Change mixin repo 2021-03-08 17:29:42 +01:00
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
simibubi
3bc2a9e30f Sanity for translators
- Generated lang entries of re-used scenes now refer to the same set of keys
- Scenes for Chain Drive and Chain Gearshift
2021-03-06 18:08:03 +01:00
simibubi
aa0a58b0da Tooltips except it takes one hour per block
- Added and assigned more ponder tags
- Ponder Scenes for cog, large cog, gearbox, clutch, gearshift, and casings
- Fixed TE model data not queried on schematics and ponder scenes
2021-03-06 04:06:49 +01:00
simibubi
8bf82aff79 Refactor Goggles Fluid Information
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
2021-03-03 19:17:56 +01:00
simibubi
c1c6e5e046 Controlled attachment
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
2021-03-03 05:21:58 +01:00
simibubi
5949dd376b Fixed honey bottles on belt/depots 2021-03-03 02:34:57 +01:00
simibubi
e87849deca Vector's food expansion
- Added honeyed apples
- Added sweet rolls
- Added chocolate glazed berries
- New goggles item model
- Other texture tweaks
2021-03-03 02:30:21 +01:00
simibubi
2e1129a3a5 Thinking about Gantries
- Added Ponder entries for gantry shafts and carriages
- Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates
- Gantry Pinion -> Gantry Carriage
- Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh
- removed the requirement of editor provided lang keys for text windows
- couple fixes, changes to instructions
2021-03-02 05:53:43 +01:00
simibubi
0a1be94cbb Funnel Fantasy VII
- Finished ponder entries about funnels
- Smart TEs can now enter "virtual mode" to run both client and server code (support for it needs individual adjustment)
- Removed obsolete quads from the andesite funnels' model
- Not enough ponder instructions
- Fixed upright belt items in ponder UI
2021-02-28 23:49:51 +01:00
simibubi
c4e1f680c9 Such convenience
- Organized util and scene builder methods into nested classes
- Selection rework, allows for addition and substraction
- World sections now merge into a global world section after fading in
- Support for managing reference to elements created by previous instructions
- more util
- Support for animating world sections to roughly simulate a contraption
- Less paperwork for making new scenes
- Support for outliner chaseAABB
- Support for outlining selections
2021-02-21 03:18:04 +01:00
31e3c5b0bd Port recent changes 2021-02-20 17:27:51 +01:00
simibubi
45fc0ca7ee post-merge fixup 2021-02-19 20:21:29 +01:00
5b65a5d78b better fan stream advancement trigger 2021-02-19 16:39:01 +01:00
d0357df863 Move stuff of RegistryTrigger over to StringSerializableTrigger to make future expansion possible 2021-02-19 15:08:50 +01:00
589572df6c kill kinetic block trigger, clean up unused stuff 2021-02-19 14:49:22 +01:00
3f9ee09953 Rework Bracket trigger to now be a registry trigger based on base block 2021-02-19 14:12:26 +01:00
d9aa912796 generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger) 2021-02-19 09:09:29 +01:00
7023148e7f generic infinite fluid triggers 2021-02-18 23:00:17 +01:00
simibubi
2700832dff Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 21:41:02 +01:00
Snownee
2baa3f9922 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches 2021-02-06 04:16:26 +08:00
simibubi
c85efe141f Soulfire heating
- Integrate #724 on correct branch and through use of the data generator
2021-02-05 18:49:10 +01:00
simibubi
374f3c9547 Climb or Convey
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
2021-02-04 21:02:30 +01:00
Snownee
c5447d5b9c Add NBTProcessors to enable detailed control to tile data.
Add safe check when contraption blocks adding back to world
2021-01-31 14:56:46 +08:00
simibubi
525fc03278 Demise of the hopper funnel
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
2021-01-22 20:43:59 +01:00
simibubi
bf73a24401 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
simibubi
a1cac6d852 Why are we still here, 1.16 Special
- Removed invalid compat recipe containing a removed item from the mod "Charm"
- Added sawing recipes for Crimson and Warped stems
- Adjusted crushing outputs of nether wart blocks
- Fixed Deployers unable to break leaves and other specific translucent blocks
- Saws and Deforesters can now take down Crimson and Warped fungus
2021-01-03 23:35:03 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
garyantonyo
089ed5ca6f Adding support for Ice and Fire silver and copper, even though Ice and Fire does not support Create... 2021-01-01 22:46:04 -05:00
garyantonyo
76c17d32e2 add lead crushed ore recipes when Eidolon present 2020-12-31 02:06:57 -05:00
simibubi
788f92705d Why are we still here
- Added chocolate and tea fluid tag #580
- Fixed item drain accepting stacks of items to empty
- Fixed basins mistakingly ignoring recipes with 4 or 9 equal ingredients
- Fixed schematicannon not able to place glass pipes, encased pipes, belt funnels and encased shafts
- Fixed race condition with other mods registering spawn eggs
- Belts no longer consume dye
- Tweaked placement constraints and control of cogwheels
- Chocolate and honey buckets can no longer stack
- Minecarts can now collide with non-mounted contraptions
- Attempted some optimizations to contraption lighting
2020-12-27 23:09:19 +01:00
Snownee
49b5e4957e Fix a typo 2020-12-25 18:11:13 +08:00
simibubi
ecd5858ece Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-18 18:36:51 +01:00
simibubi
6c6760ef17 More content, who dis?
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
2020-12-18 15:13:57 +01:00
simibubi
6f9ee792f4 Port recent changes 2020-12-15 23:22:12 +01:00
simibubi
67cb69aaea Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-15 23:21:52 +01:00
simibubi
1840b40e2e Advancing toward the day
- Added advancements for exploring the content
- Adjusted some recipes
2020-12-15 21:16:17 +01:00
simibubi
78036195ab Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a Fun with Recipes
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
simibubi
4b597f7b86 Mek has more metals now
- Also reduced speed penalty of coupling hard-collision
2020-12-12 17:57:48 +01:00
simibubi
7760db875c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-12 17:42:12 +01:00
simibubi
45465fb69b Minor adjustments
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
2020-12-12 17:33:16 +01:00
simibubi
a26988db70
Merge pull request #533 from Creators-of-Create/mc1.15/safe-nbt
Safe NBT tag
2020-12-12 15:37:44 +01:00
Snownee
f64dc8c43f Signs are not nbt-safe, due to the ability to execute command 2020-12-12 19:10:59 +08:00
Snownee
1a052d1ec1 Tag data-gen 2020-12-12 05:00:25 +08:00
simibubi
42215b8eb0 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-11 21:23:31 +01:00
simibubi
2744cabf14 How to 0.3
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
2020-12-11 19:36:13 +01:00
simibubi
17ba73dedf Thermal compat
- Apparently this mod is still a thing
2020-12-11 13:02:04 +01:00
4de7c118f4 merge and port. I WANT IT NOOOOW! 2020-12-05 11:42:14 +01:00
simibubi
9e4b92babf Other options are available
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
simibubi
16705c5cb5 A flock of fluids
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +01:00
simibubi
e3bef624a0 Casing case closed
- Encased shafts and gearboxes can now join textures with respective casing blocks
- Added back encased shaft items for creative mode
- Fixed encased shafts able to be created with casing and cogs
2020-12-02 21:49:57 +01:00
simibubi
da5aaebe1b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-30 15:26:43 +01:00
simibubi
ccae111ec8 Reversing the reversed
- Controller rails can now control furnace minecarts
- Controller rails now snap to adjacent rails with the correct facing
- Controller rails no longer get reversed when transitioning to or from a slope in certain orientations
- Controller rails are now craftable
- Fun refactors
- Updated texture
- Recipe adjustments
2020-11-30 15:23:37 +01:00
628afa52d1 Fix cocoa beans on contraptions crashing the server 2020-11-30 13:23:35 +01:00
59e377c7ef merge recent changes 2020-11-30 09:48:38 +01:00
tterrag
696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.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/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
#	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
0231b32866 Someone get those damn mine carts under control!! 2020-11-28 21:12:31 +01:00
simibubi
e7a22c96e9 Funnels for everybody
- Fixed flapfunnels not taking secondary items off depots
- Funnels can now sit horizontally on saws and drains
- Added a recipe from natural to regular scoria
2020-11-27 17:19:11 +01:00
simibubi
757b65f136 All caught up
- Port recent changes to 1.16
2020-11-26 00:57:50 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00
simibubi
8ff98dc3fb Fluid Delivery
- Fluid Tanks and Creative Fluid Tanks now form a combined fluid inventory on contraptions
- Added the Portable Fluid Interface
- Fixed tanks placed with nbt not clamping their contained fluids
- Item Storage information on Contraptions no longer get sent to the client
- Combined fluid storage synchronizes to the client and applies new contents to the corresponding mounted TE renderers
- Fixed motion of dripping potion particles from fluid pipe flow indication
- Portable Storage interfaces now interrupt their connection when receiving redstone power
2020-11-25 18:54:59 +01:00
1a7bf39fc1 Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
2020-11-15 15:21:38 +01:00
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01:00
simibubi
e4fa2de11e PR dusting
- Some lang fixes/adjustments
- runData
2020-11-14 22:53:15 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
simibubi
103c1a7441 Lifeless Flames
- Empty blaziers can now be lit using flint and steel
- Blaze burners now have ambient sounds and sounds played when fed items
2020-11-12 12:58:26 +01:00
Snownee
c730517fb4 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/snownee
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2020-11-12 08:03:24 +08:00
simibubi
675af419ce Fixing user errors
- Added hints when looking at
-    Mechanical arms with no targets
-    Funnels attempted to be used like 0.2 transposers
-    Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +01:00
Snownee
1afab1dd51 Fix slab loot tables 2020-11-11 00:57:29 +08:00
Snownee
5958370900 Give ProcessingOutput a default count 2020-11-08 17:30:40 +08:00
Snownee
073e3980ee Fix water rendering overlay on glass blocks 2020-11-08 16:29:58 +08:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +01:00
simibubi
d5f08aab76 Brackets and spilled potions
- Added wooden and metal brackets
- Brackets can be applied to shafts, cogs and fluid pipes
- Brackets prevent pipes from connecting to adjacent pipes
- Fixed blockzapper not showing up in the searchable creative menu
- Added config values for hose pulleys
- Hose pulleys now extinguish lit waterloggable blocks
- Hose pulley now break blocks that cannot withstand vanilla fluid flows
- Spout is now wrenchable
- Fixed spout not activating properly
- Added fluid particles that supports fluids without a block variant
- Potion fluids now apply their effects to nearby entities when spilling from an open end
- Fixed pumps not rendering fluid particles when spilling/pulling fluids directly
- Hose Pulley no longer accepts fluids that cannot be placed
- Hose Pulleys and open pipes can no longer place water in the nether
- Some Refactors to the particle system
- Reverted reversed crtl activation for schematic tools
- Added a command to fix broken lighting in some of creates models (enables experimental forge block rendering)
- Fixed fluid ingredients in jei once again
- Fixed fluid tag ingredients being resolved on the client
2020-11-04 19:08:01 +01:00
simibubi
d26139576c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-30 19:36:03 +01:00
simibubi
e701569fee Automatic Acrobatics
- Added the item drain
- Refactored pulley renderers
- Fixed belt funnel not dropping filters
- Fixed funnel filter slot positioning on upward facing funnels
- Sails can now be sheared
- Fixed the kinetic connectivity of the rotation speed controller
- Valve handles can now by dyed in world
- Seats can now be dyed in world
- Fixed Stockpile Switch emitting redstone power towards its detection target
- Organized Imports
- Fixed server launch issues
2020-10-30 19:28:33 +01:00
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04:00
simibubi
5abfc15e9e Destroyer of Lakes
- Added the hose pulley
- Added creative tanks
- Fixed sails not getting consumed when placed against each other
- Items can now be inserted onto belts regardless of it moving or not
- Fixed item duplication on stopped belts
- Refactored fluid block rendering in JEI
- Reworked model of the schematic table
2020-10-30 02:16:08 +01:00
521ce8a766 port recent changes 2020-10-23 19:01:25 +02:00
simibubi
b2cd378b52 Back in the early game
- Hand cranks can now be made without the need of brass
- Fixed tooltip referrals
- Crafters can no longer be covered when while they are holding an item
- Pushed some numbers around
2020-10-22 01:48:24 +02:00
simibubi
b14664d45f Windmill is Bearing is Clockwork
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +02:00
simibubi
a8031b7569 Missed Tags 2020-10-20 17:34:39 +02:00
Bob Dole
b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-19 23:22:24 -04:00
simibubi
b7bed44a61 Basic Brewing
- Refactored JEI plugin to use a builder for categories
- The mixer can now process vanilla potion recipes
- JEI support for fluid potion mixing
- Refined some categories to not show obsolete information
- Compacting and automatic vanilla packing are now in separate tabs
- Fluids can now be manually picked up from a basin
- Basins and Spouts can now extract from and fill vanilla potion items
- Improved the filtering for fluid tests, such as the basin recipe and smart pipes
- Fixed CombinedTankWrapper losing nbt data of transferred fluidstacks
2020-10-19 22:07:05 +02:00
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-18 00:22:25 -04:00
simibubi
dd95096bfa Smart Fluid Pipes
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
2020-10-17 18:20:05 +02:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
simibubi
9852d84fb8 More logistical errands
- Arms can no longer feed random junk to a jukebox
- Arms are no longer oblivious to hot-swapped blocks in its target areas
- Arms can now directly extract from and insert to Deployers and Crafters
- Arms can now feed blaze burners
- Fixed brass funnels deleting items inserted into a full or stalled inventory
- Fixed brass funnels in hopper mode not showing amounts on filters when transferring between server-only inventories
- Arms & Deployers can now be paused using a redstone signal; stopping them after their next completed cycle
- Fixed zapper tools not applying changes when the screen is closed using the confirm button
- Reorganized valve handle registration
- Added more preliminary recipes
2020-10-12 16:03:26 +02:00
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
a15937b5fc Fix datagen issues, ingame achieved! 2020-10-03 17:36:32 -04:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
simibubi
6e285e2f8b Valves and Valve handles
- Added a straight pipe variant to cut flows using rotational input
- Added a slower more precise variant of the hand crank
- Basins now render their contained fluids
2020-09-25 17:22:16 +02:00
simibubi
aef451e3bf Logistics' final stretch, Part II
- Belt observer -> Content observer
- Content observers can now monitor any inventory and funnel transactions
- Stockpile switches no longer only access slots exposed to a specific side of an inventory
- Stockpile switches can now take a filter
2020-09-20 21:34:36 +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
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
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
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
simibubi
2855a22221 Grunthog Day
- Migrated Shaped and Shapeless crafting recipes to generated
- Added the reworked spout asset by Kryppers
2020-08-31 12:49:36 +02:00
simibubi
230a6cf848 Sploosh
- Added the Spout
- Added Safety check to the drain cap rendering condition
Highly unstable
2020-08-28 22:45:27 +02:00
simibubi
0349217082 Grunt work detected
- Added a foundation for generating recipes of vanilla types
- Transferred a couple recipes from main to generated as POC
2020-08-27 02:35:57 +02:00
simibubi
e52765cce0 Encased and Windowed Pipes
- Added encased and non-opaque versions of the fluid pipe.
- Added new generic te behaviour across pipe blocks for their rims/attachment models
- Pipes and pumps now render a little drain cap when connected to a fluid inventory
2020-08-25 20:12:33 +02:00
Zelophed
bc5bcd0a6d whoops, forgot about this 😳 👉👈
- encased shaft supports multiple casings, applied with right click
- fix gl state after rendering our cube particle
2020-08-18 13:53:05 +02:00
simibubi
a5e666d85e casings, indeed.
- Implemented the new casing variants
- Fixed missing particle textures on cogwheels
- Implemented Copper Tiles
2020-08-05 00:41:07 +02:00
simibubi
80406e8782 Cleanup crew
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
simibubi
f5af1cd81e Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-22 19:07:33 +02:00
e7a851c8c0 Fixed block tag gen and loading, fixed fan generating over extinguished camp fires 2020-07-17 09:40:09 +02:00
42b78b01eb Blaze heater fan interaction
- moved fan transparent blocks to block tag
- added blaze heater as transparent
- blaze heater on lowest level is now a valid bulk smokig block
- blaze heater on heat 2 and higher is now a valid bulk smelting block (that requires fuel but does not spill lava or set your house on fire)
2020-07-14 00:05:22 +02:00
509edd9181 Empty Blaze Heater
- added empty blaze heater
- catching blazes (rclick blazes or a blaze spawner)
- only blaze heaters with blaze can heat basins or power fans
- updated item tooltip to fit the discussed fueling system
2020-07-13 23:33:55 +02:00
a44ef1733b Merge branch 'heatedMixer' into mc1.15/dev 2020-07-12 14:54:03 +02:00
12595490c7 Heater functionality:
- Heated Mixing: Mixing can now require the player to heat the basin (with either the usual fan heaters for a heat level of 1 or the blaze heater for higher heat levels)
- Made mixing brass ingots from copper and zinc ingots require heating (as example)
- added the blaze heater to valid fan heaters
- added TE renderer for fan heater to display a blaze head always facing the player
- added fueling of blaze heater with furnace fuel (onUse event, not with inventory to challenge the automation. To be discussed.)

todo:
- add heat requirement display to JEI
- better item model for blaze heater
- new special fuel for higher heat levels
- fan stoking
2020-07-12 13:13:43 +02:00
ae785b5a66 blaze_heater 2020-07-12 10:57:53 +02:00
simibubi
1ea7eeb040 Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-11 12:33:01 +02:00
simibubi
04b81128cd SeatState
- Added textures, models and blockstates for seats
2020-07-11 01:28:37 +02:00
simibubi
367296e6c1 Logistical enhancements and fixes
- Arms can no longer insert into powered brass funnels
- Slight ArmInteractionPoint refactor
- Arms can now interact with Millstones, Basins, Jukeboxes, Crushing Wheels and the Mechanical Saw
- Fixed crash when logging into a world with a running mixer
- Arms now start to dance when one of their in or outputs is a running jukebox
- Arms can now be mounted on the ceiling
- Arms now always prefer the interaction points that were selected first
- Fixed belt funnels not updating their blockstate properly when transitioning from other funnel types
- Vertical funnels next to the end of a belt will now stall the belt when unable to collect incoming items
- Minor model & texture touch ups
- Arm no longer cancels player interaction when its empty handed
- Fixed chutes not vertically interacting with andesite funnels
2020-07-10 19:48:04 +02:00
simibubi
dbd89199ac Andesite Logistics
- Removed pre-0.3 funnel blocks
- Added andesite variant to reality funnels, without filtering or redstone control
- Added andesite variant to belt tunnels
- Reality Funnel -> Brass Funnel
2020-07-08 01:36:34 +02:00
0c6bbcc5ed Brittle and Non-movable block tags
- added a block tag non_movable conatining blocks that should not be moved with contraptions
- added a block tag for brittle blocks breaking without support
- moved obsidian from hardcoded to non_movable block tag
- moved flower pots, doors and bells from hardcoded to brittle block tag
- registrate block tagging of brittle blocks
- made immersive engineering connectors non-movable to avoid reported weird behavior
2020-07-06 23:37:44 +02:00
d0d981fba5 More compat
- Made Create cobble stone variants part of forge:cobblestone
- autumnity wood compat
- changed biomes o'plenty flower crushing to milling (as it is with vanilla flowers)
2020-07-06 11:40:58 +02:00
simibubi
f79d168bc7 Directed Funneling and Chute Funnels
- Added a funnel block variant that interacts with chutes horizontally (same item)
- Belt and Chute Funnels now have a push/pull property
- Removed Chute Ports
2020-06-25 21:38:23 +02:00
simibubi
5b07073e00 Logistical Mockups Part III
- Added the depot block
2020-06-20 20:02:27 +02:00
simibubi
9af22b5578 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-06-20 16:10:11 +02:00
simibubi
769e585e53 Logistical Mockups Part II
- Added mockups for:
  - Packager
  - Chutes & Chute interfaces
  - Least's Reality Funnel (tm)
2020-06-20 16:10:07 +02:00
8ab1a6d59c fix piston head not dropping 2020-06-20 13:18:21 +02:00
b5afa41152 simplify duplicate tagging 2020-06-19 23:01:13 +02:00
38dbed2518 Tagging Changes
- Copper, Brass and Zinc blocks can now be used as beacon base block
- Copper, Brass and Zinc can now be used to activate a beacon
- Create ingots are now listed under the forge:ingots tag (not only forge:ingots/type)
- Create nuggets are now listed under the forge:nuggets tag (not only forge:nuggets/type)
- Create plates are now listed under the forge:plates tag (not only forge:plates/type)
- Updated registrate to support multiple tags
2020-06-19 18:37:11 +02:00
simibubi
cc6efa5aa2 Logistical Mockups Part I
- Added blockstates and TER for the Mechanical Arm
- Mechanical Arms will start a Grab Rave at random intervals
2020-06-16 12:54:24 +02:00
simibubi
dc1ccb6741 TankState
- Added blockstates and dynamic models for the fluid tank
- "Copper Pipe" -> "Fluid Pipe"
- BlockPartials are no longer an enum
2020-06-15 19:14:03 +02:00
simibubi
0a9816504b PumpState
- Added blockstates, models and TE rendering for mechanical pumps
- Removed unused pipe textures
- Removed hasStaticPart in IWrenchable as it became obsolete in 1.15
- Bumped version
2020-06-15 02:25:33 +02:00
simibubi
20de324b72 PipeState
- Implemented dynamic models and blockstates of copper pipes
2020-06-14 22:24:46 +02:00
a57a35e867 reinforced rails 2020-06-09 23:49:39 +02:00
simibubi
285cb52894 Bug and Lang Fixes
- Patched some localization gaps from the registry wipe
- TE's with an ItemStackHandler capability are now viable for mounted storage
- Fixed pulley placing down ropes when destroyed while moving
- Fixed inconsistency with glue removal and placement
2020-06-08 18:40:21 +02:00
simibubi
34a16b05bf In memory of Gilded Rose Quartz
- Added the Extendo Grip
- Cart assemblers now center a held minecart on their position
- Fixed Minecart contraptions facing backwards upon assembly
2020-06-06 22:36:58 +02:00