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
62c3ae4040
Captain Distracto
...
- Removed processing recipes from recipe book
- Reorganized items in creative tab
- Tweaked a few model transforms
- Fixed belt uvs
- ponder birbs can now face the cursor
- fix interpolation on ponder birbs
- Fixed log spam when assembling certain blocks (Points of interest) in a contraption
- Fixed content observers not triggering for in-line belt funnels
2021-03-09 01:49:49 +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
4ee9dd8a8a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-19 00:49:39 +01:00
simibubi
d59fea1079
Bloat.
...
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01: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
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
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
d16f41ccfb
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
8dff92e0bf
Added chest minecart contraption item and wrenching of chest minecart contraptions
2020-11-17 14:35:07 +01:00
simibubi
69cbfff8ed
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-10-14 21:06:46 +02:00
simibubi
62434fd564
That's hot
...
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
2020-10-14 20:52:38 +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
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
7e167f3b29
Couple things, Part I
...
- Added Foundation and POC of minecart couplings and carriage contraptions. highly unstable
2020-08-05 22:10:05 +02:00
simibubi
80406e8782
Cleanup crew
...
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
tterrag
716840116b
Port everything in root package
...
CommonEvents / All***
2020-07-22 22:34:05 -04:00
simibubi
217138255e
Tanks, Obama
...
- Reworked fluid tanks to incorporate new assets and functionality
2020-07-19 00:22:14 +02:00
d4f0743522
fix build issue
2020-07-14 17:46:26 +02:00
0580318b38
new heater fuel and fueling system
2020-07-14 15:54:02 +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
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
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
simibubi
77835c3a65
Helper swap
...
- Replaced temporary AllItems#typeOf with ItemEntry's non-static isIn
2020-06-03 22:17:11 +02:00
simibubi
daee93dc48
Stone variant recipes
...
- Setup automated recipes for stone palette blocks and their stairs/slabs/etc
- Fixed datagen putting air blocks as drops for attached logistical blocks
- Fixed recipes and lang entries using outdated registry names
- Fixed kinetic blocks appearing twice in the main creative tab
2020-05-31 19:17:00 +02:00
simibubi
9973a853cc
Fix build issues outside IDE (again)
2020-05-29 00:19:47 +02:00
simibubi
467af2ea20
Renamed AllItemsNew to AllItems
2020-05-28 01:30:14 +02:00
simibubi
3d68bec18a
Item registrates, and more porty
...
- All Items are now using registrate
- Blockzapper now renders an outline around its affected area
- Ported rainbow debug ™️
- Reworked the custom item model/renderer system
- Schematics now preview their structure again
- SuperByteBuffers now support being rendered into non-BufferBuilders
2020-05-28 01:29:26 +02:00
simibubi
4e9cd1db49
ColorRegistrate, Part II
...
- Added functional interface for block vertex coloring
- Removed several unused type-check-based behaviours
- Belt now registers its color handler in the builder
- Natural scoria now registers its color handler in the builder
- Fixed wrong offset in colored vertex models
2020-05-24 12:31:05 +02:00
simibubi
78ad674c22
Re-organized packages and utilities
2020-05-23 14:02:38 +02:00
simibubi
78b3d2c47e
Goodbye, tools
...
- Removed shadow steel, rose quartz and blazing toolsets
- Removed some other unused assets
- Fixed limesand not registering an item
2020-05-15 02:05:01 +02:00
simibubi
2696fc2a51
BlockState gen progress
...
- Clutch, Gearshift and Gearbox joined the registrate
- Fixed belt and gearbox items not being assigned creative tabs properly
- Cleaned up and extended the blockstate generator helpers
- Removed advancements from static assets
- Added datagen .cache to gitignore
- Split the palettes section into its own Creative tab
- Fixed Clutch and Gearshift rendering their casing in the TER
2020-05-12 14:06:50 +02:00
simibubi
901c530f62
Merge branch 'master' into mc1.15/dev
2020-05-11 00:23:28 +02:00
simibubi
0a869190b2
Deployer dupes
...
- Fixed blazing sword taking damage in the nether
- Fixed blazing sword not igniting entities
- More safety checks
- Fixed stack overflow when overpowering a RSC from both inputs
- Fixed outrageous duplication glitch in deployer item handler
- Fixed crafters not able to return multiple buckets
- Super glue can now be used to make chassis sticky
2020-05-09 14:27:09 +02:00
simibubi
e27927de15
Sections
...
- Removed pseudo-modularity of Create's content
2020-05-02 18:07:46 +02:00
simibubi
901cb00426
merged mc1.15/dev into mc1.15-registrate
2020-05-02 00:34:36 +02:00
simibubi
83ceb7d215
Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15/dev
2020-05-02 00:16:04 +02:00
simibubi
75638b7c8d
Pocket Carts
...
- Minecarts with mounted contraptions can now be picked up as an item
- Furnace Minecarts can now be used in the cart assembler
- Fixed superglue not re-appearing when moved in piston contraptions
- Fixed deployer not being able to interact with non-living entities
- Fixed Schematic deploy tool outline not rendering at the right location for certain boundary sizes
- Fixed leaking GL texture parameters from outline rendering
- Added Italian localization
- Fixed file extension of Japanese localization
2020-04-30 16:45:35 +02:00
tterrag
c330d163ec
Update Registrate, add proof of concept new block registration pattern
2020-04-26 00:58:38 -04:00
simibubi
c62d356f9b
Superglue
...
- Added superglue, an alternative to chassis blocks
- Added some random safety checks
- Fixed some more bad gl states left by event handlers
2020-04-20 23:27:34 +02:00
tterrag
2cccbca11b
Add registrate as dependency, experimental refactor of AllBlocks
2020-04-19 16:16:00 -04:00
simibubi
db8e52be2e
Bugs & Refactors
...
- Added new selection/outline particles for use in place of bounding box rendering
- Refactored JEI categories
- Slots for chance outputs now have a slighly different appearance in JEI
- Redstone links no longer cause a redstone update when loaded in
- Redstone links no longer mess up windmill bearings on chunk reload
- Fixed redstone links not working properly after movement in a contraption
- Filter output amounts can no longer be increased beyond the stack limit
- Chassis range visualization now uses the new outline particle
- Kinetic networks are now aware of movement, such as NBT-item placement, schematic placement and other means of tileentity movement and will reset/reconnect
- Fixed pistons/bearings/etc not being movable by chassis
- Fixed pistons/bearings/etc moving a clone of themselves when attached to the initial block
- Fixed pistons/bearings/etc stopping or losing their structure when loaded incorrecly
- Pulleys can now be moved while extended, moving attached ropes and their own attached structure with them
- Brittle blocks such as ladders/torches/etc can no longer be moved unless their attached block is moved
- Fixed mechanical pistons messing up their kinetic information when changing into a different extension state.
- Fixed misplaced client code introduced by a ScreenOpener hotfix
- Fixed inconsistent belt initialization when belts are placed by schematics or structures, causing them to break at random
- Clutches and Gearshifts now await their turn to re-attach when changed, allowing multiple to be used in a network and swapped within one tick without causing components to break.
- Fixed flexcrate interface crashing if the block gets removed while open
- Some additions/modifications in texture assets
- Pistons no longer get blocked by their push limit if the blocks pushed are attached to each other
2020-04-16 20:46:15 +02:00
tterrag
a1605af46a
Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15-v0.2.2
...
# Conflicts:
# build.gradle
# src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java
# src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java
# src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/components/fan/EncasedFanBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/components/millstone/MillstoneBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/processing/BasinBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java
# src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java
# src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockModel.java
# src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java
# src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java
# src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java
# src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java
# src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java
# src/main/resources/META-INF/mods.toml
2020-04-12 15:25:52 -04:00
