From e27927de15e8da6576afabea434a83b8f6d4d481 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 2 May 2020 18:07:46 +0200 Subject: [PATCH] Sections - Removed pseudo-modularity of Create's content --- .../java/com/simibubi/create/AllBlocks.java | 222 ++++++++++-------- .../com/simibubi/create/AllBlocksNew.java | 12 +- .../java/com/simibubi/create/AllItems.java | 37 +-- src/main/java/com/simibubi/create/Create.java | 3 - .../com/simibubi/create/CreateItemGroup.java | 7 +- .../com/simibubi/create/CreateRegistrate.java | 28 +-- .../com/simibubi/create/config/CServer.java | 15 +- .../foundation/item/ItemDescription.java | 1 + .../create/foundation/item/TooltipHelper.java | 8 +- .../com/simibubi/create/modules/IModule.java | 93 -------- .../create/modules/ModuleLoadedCondition.java | 54 ----- .../com/simibubi/create/modules/Sections.java | 69 ++++++ .../CocoaLogBlock.java | 2 +- .../TreeFertilizerItem.java | 2 +- .../schematics/block/CreativeCrateBlock.java | 5 +- .../schematics/block/SchematicTableBlock.java | 5 +- .../schematics/block/SchematicannonBlock.java | 5 +- .../schematicannon/item.json} | 0 .../create/recipes/crafting_shaped/basin.json | 8 +- .../recipes/crafting_shaped/belt_funnel.json | 8 +- .../recipes/crafting_shaped/belt_tunnel.json | 8 +- .../recipes/crafting_shaped/brass_hand.json | 8 +- .../recipes/crafting_shaped/contact.json | 8 +- .../contraptions/adjustable_pulley.json | 8 +- .../contraptions/analog_lever.json | 8 +- .../contraptions/belt_connector.json | 8 +- .../contraptions/cart_assembler.json | 8 +- .../contraptions/clockwork_bearing.json | 8 +- .../crafting_shaped/contraptions/clutch.json | 8 +- .../contraptions/cogwheel.json | 8 +- .../contraptions/cuckoo_clock.json | 8 +- .../contraptions/deployer.json | 8 +- .../crafting_shaped/contraptions/drill.json | 8 +- .../contraptions/encased_belt.json | 8 +- .../contraptions/encased_fan.json | 8 +- .../contraptions/encased_shaft.json | 8 +- .../crafting_shaped/contraptions/gearbox.json | 8 +- .../contraptions/gearshift.json | 8 +- .../contraptions/harvester.json | 8 +- .../contraptions/large_cogwheel.json | 8 +- .../contraptions/mechanical_bearing.json | 8 +- .../contraptions/mechanical_crafter.json | 8 +- .../contraptions/mechanical_mixer.json | 8 +- .../contraptions/mechanical_piston.json | 8 +- .../contraptions/mechanical_press.json | 8 +- .../contraptions/millstone.json | 8 +- .../contraptions/mysterious_cuckoo_clock.json | 8 +- .../contraptions/piston_pole.json | 8 +- .../crafting_shaped/contraptions/plough.json | 8 +- .../portable_storage_interface.json | 8 +- .../contraptions/rope_pulley.json | 8 +- .../contraptions/rotation_chassis.json | 8 +- .../rotation_speed_controller.json | 8 +- .../crafting_shaped/contraptions/saw.json | 8 +- .../contraptions/sequenced_gearshift.json | 8 +- .../crafting_shaped/contraptions/shaft.json | 8 +- .../contraptions/speed_gauge.json | 8 +- .../sticky_mechanical_piston.json | 8 +- .../contraptions/translation_chassis.json | 8 +- .../contraptions/turntable.json | 8 +- .../contraptions/water_wheel.json | 8 +- .../curiosities/deforester.json | 8 +- .../crafting_shaped/curiosities/filter.json | 8 +- .../crafting_shaped/curiosities/goggles.json | 8 +- .../curiosities/placement_handgun.json | 8 +- .../curiosities/property_filter.json | 8 +- .../curiosities/shadow_steel_mattock.json | 8 +- .../curiosities/shadow_steel_pickaxe.json | 8 +- .../curiosities/shadow_steel_sword.json | 8 +- .../curiosities/symmetry_wand.json | 8 +- .../crafting_shaped/curiosities/wrench.json | 8 +- .../crafting_shaped/electron_tube.json | 8 +- .../crafting_shaped/entity_detector.json | 8 +- .../recipes/crafting_shaped/extractor.json | 8 +- .../recipes/crafting_shaped/flexcrate.json | 8 +- .../recipes/crafting_shaped/flexpeater.json | 8 +- .../crafting_shaped/flexpulsepeater.json | 8 +- .../recipes/crafting_shaped/hand_crank.json | 8 +- .../materials/andesite_casing.json | 8 +- .../materials/brass_casing.json | 8 +- .../materials/brass_ingot.json | 8 +- .../materials/copper_casing.json | 8 +- .../materials/copper_ingot.json | 8 +- .../crafting_shaped/materials/zinc_ingot.json | 8 +- .../recipes/crafting_shaped/nozzle.json | 8 +- .../palettes/acacia_glass.json | 8 +- .../palettes/acacia_glass_pane.json | 8 +- .../crafting_shaped/palettes/birch_glass.json | 8 +- .../palettes/birch_glass_pane.json | 8 +- .../palettes/dark_oak_glass.json | 8 +- .../palettes/dark_oak_glass_pane.json | 8 +- .../crafting_shaped/palettes/dark_scoria.json | 8 +- .../palettes/dark_scoria_bricks.json | 8 +- .../palettes/dark_scoria_bricks_slab.json | 8 +- .../palettes/dark_scoria_bricks_stairs.json | 8 +- .../palettes/dark_scoria_bricks_wall.json | 8 +- .../palettes/dark_scoria_tiles.json | 8 +- .../palettes/dark_scoria_tiles_slab.json | 8 +- .../palettes/dark_scoria_tiles_stairs.json | 8 +- .../palettes/dolomite_bricks.json | 8 +- .../palettes/dolomite_slab.json | 8 +- .../palettes/dolomite_stairs.json | 8 +- .../palettes/dolomite_wall.json | 8 +- .../palettes/framed_glass_pane.json | 8 +- .../palettes/gabbro_bricks.json | 8 +- .../palettes/gabbro_bricks_stairs.json | 8 +- .../palettes/gabbro_bricks_wall.json | 8 +- .../crafting_shaped/palettes/gabbro_slab.json | 8 +- .../palettes/gabbro_stairs.json | 8 +- .../crafting_shaped/palettes/gabbro_wall.json | 8 +- .../horizontal_framed_glass_pane.json | 8 +- .../palettes/indented_gabbro_slab.json | 8 +- .../crafting_shaped/palettes/iron_glass.json | 8 +- .../palettes/iron_glass_pane.json | 8 +- .../palettes/jungle_glass.json | 8 +- .../palettes/jungle_glass_pane.json | 8 +- .../crafting_shaped/palettes/limesand.json | 8 +- .../palettes/limestone_bricks.json | 8 +- .../palettes/limestone_bricks_slab.json | 8 +- .../palettes/limestone_bricks_stairs.json | 8 +- .../palettes/limestone_bricks_wall.json | 8 +- .../palettes/limestone_slab.json | 8 +- .../palettes/limestone_stairs.json | 8 +- .../palettes/limestone_wall.json | 8 +- .../crafting_shaped/palettes/oak_glass.json | 8 +- .../palettes/oak_glass_pane.json | 8 +- .../palettes/paved_gabbro_bricks_slab.json | 8 +- .../palettes/polished_dark_scoria.json | 8 +- .../palettes/polished_dolomite.json | 8 +- .../palettes/polished_gabbro.json | 8 +- .../palettes/polished_limestone.json | 8 +- .../palettes/polished_limestone_slab.json | 8 +- .../palettes/polished_scoria.json | 8 +- .../palettes/polished_scoria_slab.json | 8 +- .../polished_weathered_limestone.json | 8 +- .../polished_weathered_limestone_slab.json | 8 +- .../palettes/scoria_bricks.json | 8 +- .../crafting_shaped/palettes/scoria_slab.json | 8 +- .../palettes/scoria_stairs.json | 8 +- .../crafting_shaped/palettes/scoria_wall.json | 8 +- .../palettes/spruce_glass.json | 8 +- .../palettes/spruce_glass_pane.json | 8 +- .../palettes/tiled_glass_pane.json | 8 +- .../palettes/vertical_framed_glass_pane.json | 8 +- .../palettes/weathered_limestone.json | 8 +- .../palettes/weathered_limestone_bricks.json | 8 +- .../weathered_limestone_bricks_slab.json | 8 +- .../weathered_limestone_bricks_stairs.json | 8 +- .../weathered_limestone_bricks_wall.json | 8 +- .../palettes/weathered_limestone_slab.json | 8 +- .../palettes/weathered_limestone_stairs.json | 8 +- .../palettes/weathered_limestone_wall.json | 8 +- .../recipes/crafting_shaped/propeller.json | 8 +- .../crafting_shaped/pulse_repeater.json | 8 +- .../crafting_shaped/redstone_bridge.json | 8 +- .../crafting_shaped/redstone_latch.json | 8 +- .../schematics/schematic_table.json | 8 +- .../schematics/schematicannon.json | 8 +- .../recipes/crafting_shaped/slot_cover.json | 8 +- .../recipes/crafting_shaped/stockswitch.json | 8 +- .../recipes/crafting_shaped/toggle_latch.json | 8 +- .../recipes/crafting_shaped/transposer.json | 8 +- .../create/recipes/crafting_shaped/whisk.json | 8 +- .../blueprint_and_quill.json | 8 +- .../recipes/crafting_shapeless/cocoa_log.json | 8 +- .../recipes/crafting_shapeless/dough.json | 8 +- .../crafting_shapeless/empty_blueprint.json | 8 +- .../recipes/crafting_shapeless/extractor.json | 8 +- .../recipes/crafting_shapeless/gearbox.json | 8 +- .../crafting_shapeless/linked_extractor.json | 8 +- .../crafting_shapeless/linked_transposer.json | 8 +- .../crafting_shapeless/red_sand_paper.json | 8 +- .../crafting_shapeless/rose_quartz.json | 8 +- .../crafting_shapeless/sand_paper.json | 8 +- .../crafting_shapeless/slime_ball.json | 8 +- .../crafting_shapeless/speed_gauge.json | 8 +- .../crafting_shapeless/stress_gauge.json | 8 +- .../translation_chassis.json | 8 +- .../translation_chassis_secondary.json | 8 +- .../crafting_shapeless/transposer.json | 8 +- .../crafting_shapeless/tree_fertilizer.json | 8 +- .../crafting_shapeless/vertical_gearbox.json | 8 +- .../mechanical_crafting/crushing_wheel.json | 8 +- .../recipes/mechanical_crafting/flywheel.json | 8 +- .../mechanical_crafting/furnace_engine.json | 8 +- .../integrated_circuit.json | 8 +- .../mechanical_crafting/rose_quartz_axe.json | 8 +- .../rose_quartz_pickaxe.json | 8 +- .../rose_quartz_shovel.json | 8 +- .../rose_quartz_sword.json | 8 +- .../data/create/recipes/smelting/diorite.json | 8 +- .../create/recipes/smelting/framed_glass.json | 8 +- .../recipes/smelting/framed_glass_pane.json | 8 +- .../data/create/recipes/smelting/granite.json | 8 +- .../smelting/horizontal_framed_glass.json | 8 +- .../horizontal_framed_glass_pane.json | 8 +- .../create/recipes/smelting/limesand.json | 8 +- .../create/recipes/smelting/soul_sand.json | 8 +- .../create/recipes/smelting/tiled_glass.json | 8 +- .../recipes/smelting/tiled_glass_pane.json | 8 +- .../smelting/vertical_framed_glass.json | 8 +- .../smelting/vertical_framed_glass_pane.json | 8 +- .../recipes/stonecutting/andesite_bricks.json | 8 +- .../recipes/stonecutting/andesite_layers.json | 8 +- .../stonecutting/dark_scoria_bricks.json | 8 +- .../stonecutting/dark_scoria_bricks_slab.json | 8 +- .../dark_scoria_bricks_slab2.json | 8 +- .../dark_scoria_bricks_stairs.json | 8 +- .../dark_scoria_bricks_stairs2.json | 8 +- .../stonecutting/dark_scoria_bricks_wall.json | 8 +- .../dark_scoria_bricks_wall2.json | 8 +- .../stonecutting/dark_scoria_tiles.json | 8 +- .../stonecutting/dark_scoria_tiles_slab.json | 8 +- .../stonecutting/dark_scoria_tiles_slab2.json | 8 +- .../dark_scoria_tiles_stairs.json | 8 +- .../dark_scoria_tiles_stairs2.json | 8 +- .../recipes/stonecutting/diorite_bricks.json | 8 +- .../recipes/stonecutting/diorite_layers.json | 8 +- .../recipes/stonecutting/dolomite_bricks.json | 8 +- .../recipes/stonecutting/dolomite_layers.json | 8 +- .../recipes/stonecutting/dolomite_pillar.json | 8 +- .../recipes/stonecutting/dolomite_slab.json | 8 +- .../recipes/stonecutting/dolomite_stairs.json | 8 +- .../recipes/stonecutting/dolomite_wall.json | 8 +- .../recipes/stonecutting/framed_glass.json | 8 +- .../stonecutting/framed_glass_pane.json | 8 +- .../recipes/stonecutting/gabbro_bricks.json | 8 +- .../stonecutting/gabbro_bricks_stairs.json | 8 +- .../stonecutting/gabbro_bricks_stairs2.json | 8 +- .../stonecutting/gabbro_bricks_wall.json | 8 +- .../stonecutting/gabbro_bricks_wall2.json | 8 +- .../recipes/stonecutting/gabbro_layers.json | 8 +- .../recipes/stonecutting/gabbro_slab.json | 8 +- .../recipes/stonecutting/gabbro_stairs.json | 8 +- .../recipes/stonecutting/gabbro_wall.json | 8 +- .../recipes/stonecutting/granite_bricks.json | 8 +- .../recipes/stonecutting/granite_layers.json | 8 +- .../stonecutting/horizontal_framed_glass.json | 8 +- .../horizontal_framed_glass_pane.json | 8 +- .../stonecutting/indented_gabbro_slab.json | 8 +- .../stonecutting/indented_gabbro_slab2.json | 8 +- .../stonecutting/limestone_bricks.json | 8 +- .../stonecutting/limestone_bricks_slab.json | 8 +- .../stonecutting/limestone_bricks_slab2.json | 8 +- .../stonecutting/limestone_bricks_stairs.json | 8 +- .../limestone_bricks_stairs2.json | 8 +- .../stonecutting/limestone_bricks_wall.json | 8 +- .../stonecutting/limestone_bricks_wall2.json | 8 +- .../stonecutting/limestone_layers.json | 8 +- .../stonecutting/limestone_pillar.json | 8 +- .../recipes/stonecutting/limestone_slab.json | 8 +- .../stonecutting/limestone_stairs.json | 8 +- .../recipes/stonecutting/limestone_wall.json | 8 +- .../stonecutting/mossy_gabbro_bricks.json | 8 +- .../stonecutting/paved_gabbro_bricks.json | 8 +- .../paved_gabbro_bricks_slab.json | 8 +- .../paved_gabbro_bricks_slab2.json | 8 +- .../stonecutting/polished_dolomite.json | 8 +- .../recipes/stonecutting/polished_gabbro.json | 8 +- .../stonecutting/polished_limestone.json | 8 +- .../stonecutting/polished_limestone_slab.json | 8 +- .../polished_limestone_slab2.json | 8 +- .../recipes/stonecutting/polished_scoria.json | 8 +- .../stonecutting/polished_scoria_slab.json | 8 +- .../stonecutting/polished_scoria_slab2.json | 8 +- .../polished_weathered_limestone.json | 8 +- .../polished_weathered_limestone_slab.json | 8 +- .../polished_weathered_limestone_slab2.json | 8 +- .../recipes/stonecutting/scoria_bricks.json | 8 +- .../recipes/stonecutting/scoria_layers.json | 8 +- .../recipes/stonecutting/scoria_pillar.json | 8 +- .../recipes/stonecutting/scoria_slab.json | 8 +- .../recipes/stonecutting/scoria_stairs.json | 8 +- .../recipes/stonecutting/scoria_wall.json | 8 +- .../slightly_mossy_gabbro_bricks.json | 8 +- .../recipes/stonecutting/tiled_glass.json | 8 +- .../stonecutting/tiled_glass_pane.json | 8 +- .../stonecutting/vertical_framed_glass.json | 8 +- .../vertical_framed_glass_pane.json | 8 +- .../weathered_limestone_bricks.json | 8 +- .../weathered_limestone_bricks_slab.json | 8 +- .../weathered_limestone_bricks_slab2.json | 8 +- .../weathered_limestone_bricks_stairs.json | 8 +- .../weathered_limestone_bricks_stairs2.json | 8 +- .../weathered_limestone_bricks_wall.json | 8 +- .../weathered_limestone_bricks_wall2.json | 8 +- .../weathered_limestone_layers.json | 8 +- .../weathered_limestone_pillar.json | 8 +- .../weathered_limestone_slab.json | 8 +- .../weathered_limestone_stairs.json | 8 +- .../weathered_limestone_wall.json | 8 +- 291 files changed, 528 insertions(+), 2224 deletions(-) delete mode 100644 src/main/java/com/simibubi/create/modules/IModule.java delete mode 100644 src/main/java/com/simibubi/create/modules/ModuleLoadedCondition.java create mode 100644 src/main/java/com/simibubi/create/modules/Sections.java rename src/main/java/com/simibubi/create/modules/{gardens => curiosities}/CocoaLogBlock.java (98%) rename src/main/java/com/simibubi/create/modules/{gardens => curiosities}/TreeFertilizerItem.java (98%) rename src/main/resources/assets/create/models/{item/schematicannon.json => block/schematicannon/item.json} (100%) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 32c5cea0b..f1cb5a459 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.block.ProperStairsBlock; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.data.ITaggable; import com.simibubi.create.foundation.world.OxidizingBlock; -import com.simibubi.create.modules.IModule; +import com.simibubi.create.modules.Sections; import com.simibubi.create.modules.contraptions.CasingBlock; import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; @@ -60,11 +60,11 @@ import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftBlock import com.simibubi.create.modules.contraptions.relays.encased.GearshiftBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; +import com.simibubi.create.modules.curiosities.CocoaLogBlock; import com.simibubi.create.modules.curiosities.partialWindows.WindowInABlockBlock; import com.simibubi.create.modules.curiosities.symmetry.block.CrossPlaneSymmetryBlock; import com.simibubi.create.modules.curiosities.symmetry.block.PlaneSymmetryBlock; import com.simibubi.create.modules.curiosities.symmetry.block.TriplePlaneSymmetryBlock; -import com.simibubi.create.modules.gardens.CocoaLogBlock; import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; import com.simibubi.create.modules.logistics.block.StockswitchBlock; import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; @@ -120,12 +120,8 @@ import net.minecraftforge.common.ToolType; public enum AllBlocks implements NonNullSupplier { -// __SCHEMATICS__(), -// SCHEMATICANNON(SchematicannonBlock::new), -// CREATIVE_CRATE(CreativeCrateBlock::new), -// SCHEMATIC_TABLE(SchematicTableBlock::new), + _1_(Sections.KINETICS), - __CONTRAPTIONS__(), SHAFT(() -> new ShaftBlock(Properties.from(Blocks.ANDESITE))), COGWHEEL(() -> new CogWheelBlock(false), (b, p) -> new CogwheelBlockItem(b, p, false)), LARGE_COGWHEEL(() -> new CogWheelBlock(true), (b, p) -> new CogwheelBlockItem(b, p, true)), @@ -186,7 +182,8 @@ public enum AllBlocks implements NonNullSupplier { FURNACE_ENGINE(FurnaceEngineBlock::new), ROTATION_SPEED_CONTROLLER(SpeedControllerBlock::new), - __LOGISTICS__(), + _2_(Sections.LOGISTICS), + CONTACT(ContactBlock::new), REDSTONE_BRIDGE(RedstoneLinkBlock::new), STOCKSWITCH(StockswitchBlock::new), @@ -208,18 +205,42 @@ public enum AllBlocks implements NonNullSupplier { FLEXPULSEPEATER(FlexpeaterBlock::new), REDSTONE_LATCH(LatchBlock::new), TOGGLE_LATCH(ToggleLatchBlock::new), + + _3_(Sections.MATERIALS), + + COPPER_ORE(() -> new OxidizingBlock(Properties.from(Blocks.IRON_ORE), 1), + ITaggable.create().withForgeTags("ores/copper")), + ZINC_ORE(() -> new Block(Properties.from(Blocks.GOLD_ORE).harvestLevel(2).harvestTool(ToolType.PICKAXE)), + ITaggable.create().withForgeTags("ores/zinc")), + COPPER_BLOCK(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f), + ITaggable.create().withForgeTags("storage_blocks/copper")), + COPPER_SHINGLES(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f)), + ZINC_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), + ITaggable.create().withForgeTags("storage_blocks/zinc")), + BRASS_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), + ITaggable.create().withForgeTags("storage_blocks/brass")), + + _4_(Sections.CURIOSITIES), - __CURIOSITIES__(), SYMMETRY_PLANE(PlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM), SYMMETRY_CROSSPLANE(CrossPlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM), SYMMETRY_TRIPLEPLANE(TriplePlaneSymmetryBlock::new, ComesWith.NO_BLOCKITEM), WINDOW_IN_A_BLOCK(WindowInABlockBlock::new, ComesWith.NO_BLOCKITEM), COCOA_LOG(CocoaLogBlock::new, ITaggable.create().withVanillaTags(ITaggable.BLOCK, "jungle_logs")), - __PALETTES__(), - TILED_GLASS(() -> new GlassBlock(Properties.from(Blocks.GLASS)), ITaggable.create().withVanillaTags(ITaggable.BLOCK, "impermeable").withForgeTags("glass")), + _5_(Sections.SCHEMATICS), + +// SCHEMATICANNON(SchematicannonBlock::new), +// CREATIVE_CRATE(CreativeCrateBlock::new), +// SCHEMATIC_TABLE(SchematicTableBlock::new), + + _6_(Sections.PALETTES), + + TILED_GLASS(() -> new GlassBlock(Properties.from(Blocks.GLASS)), + ITaggable.create().withVanillaTags(ITaggable.BLOCK, "impermeable").withForgeTags("glass")), FRAMED_GLASS(() -> new CTGlassBlock(AllCTs.FRAMED_GLASS, false)), - HORIZONTAL_FRAMED_GLASS(() -> new HorizontalCTGlassBlock(AllCTs.HORIZONTAL_FRAMED_GLASS, AllCTs.FRAMED_GLASS, false)), + HORIZONTAL_FRAMED_GLASS( + () -> new HorizontalCTGlassBlock(AllCTs.HORIZONTAL_FRAMED_GLASS, AllCTs.FRAMED_GLASS, false)), VERTICAL_FRAMED_GLASS(() -> new VerticalCTGlassBlock(AllCTs.VERTICAL_FRAMED_GLASS, false)), OAK_GLASS(() -> new CTWindowBlock(AllCTs.OAK_GLASS, false)), @@ -230,7 +251,8 @@ public enum AllBlocks implements NonNullSupplier { ACACIA_GLASS(() -> new CTWindowBlock(AllCTs.ACACIA_GLASS, false)), IRON_GLASS(() -> new CTWindowBlock(AllCTs.IRON_GLASS, false)), - TILED_GLASS_PANE(() -> new GlassPaneBlock(Properties.from(Blocks.GLASS)), ITaggable.create().withForgeTags("glass_panes")), + TILED_GLASS_PANE(() -> new GlassPaneBlock(Properties.from(Blocks.GLASS)), + ITaggable.create().withForgeTags("glass_panes")), FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(FRAMED_GLASS.get())), HORIZONTAL_FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(HORIZONTAL_FRAMED_GLASS.get())), VERTICAL_FRAMED_GLASS_PANE(() -> new CTGlassPaneBlock(VERTICAL_FRAMED_GLASS.get())), @@ -243,109 +265,118 @@ public enum AllBlocks implements NonNullSupplier { IRON_GLASS_PANE(() -> new CTGlassPaneBlock(IRON_GLASS.get())), GRANITE_BRICKS(() -> new Block(Properties.from(Blocks.GRANITE))), - GRANITE_LAYERS(() -> new LayeredCTBlock(Properties.from(Blocks.GRANITE), AllCTs.GRANITE_LAYERS, AllCTs.POLISHED_GRANITE)), + GRANITE_LAYERS( + () -> new LayeredCTBlock(Properties.from(Blocks.GRANITE), AllCTs.GRANITE_LAYERS, AllCTs.POLISHED_GRANITE)), DIORITE_BRICKS(() -> new Block(Properties.from(Blocks.DIORITE))), - DIORITE_LAYERS(() -> new LayeredCTBlock(Properties.from(Blocks.DIORITE), AllCTs.DIORITE_LAYERS, AllCTs.POLISHED_DIORITE)), + DIORITE_LAYERS( + () -> new LayeredCTBlock(Properties.from(Blocks.DIORITE), AllCTs.DIORITE_LAYERS, AllCTs.POLISHED_DIORITE)), ANDESITE_BRICKS(() -> new Block(Properties.from(Blocks.ANDESITE))), - ANDESITE_LAYERS(() -> - new LayeredCTBlock(Properties.from(Blocks.ANDESITE), AllCTs.ANDESITE_LAYERS, AllCTs.POLISHED_ANDESITE)), + ANDESITE_LAYERS(() -> new LayeredCTBlock(Properties.from(Blocks.ANDESITE), AllCTs.ANDESITE_LAYERS, + AllCTs.POLISHED_ANDESITE)), - GABBRO(() -> new Block(Properties.from(Blocks.GRANITE)), ITaggable.create().withForgeTags("stone"), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + GABBRO(() -> new Block(Properties.from(Blocks.GRANITE)), ITaggable.create().withForgeTags("stone"), + ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_GABBRO(() -> new Block(Properties.from(GABBRO.get())), ITaggable.create().withForgeTags("stone")), GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get())), ComesWith.STAIRS, ComesWith.WALL), PAVED_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get())), ComesWith.SLAB), INDENTED_GABBRO(() -> new Block(Properties.from(GABBRO.get())), ComesWith.SLAB), SLIGHTLY_MOSSY_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get()))), MOSSY_GABBRO_BRICKS(() -> new Block(Properties.from(GABBRO.get()))), - GABBRO_LAYERS(() -> new LayeredCTBlock(Properties.from(GABBRO.get()), AllCTs.GABBRO_LAYERS, AllCTs.POLISHED_GABBRO)), + GABBRO_LAYERS( + () -> new LayeredCTBlock(Properties.from(GABBRO.get()), AllCTs.GABBRO_LAYERS, AllCTs.POLISHED_GABBRO)), - DOLOMITE(() -> new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ITaggable.create().withForgeTags("stone"), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + DOLOMITE(() -> new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ITaggable.create().withForgeTags("stone"), + ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), DOLOMITE_BRICKS(() -> new Block(Properties.from(DOLOMITE.get()))), POLISHED_DOLOMITE(() -> new Block(Properties.from(DOLOMITE.get())), ITaggable.create().withForgeTags("stone")), DOLOMITE_PILLAR(() -> new RotatedPillarBlock(Properties.from(DOLOMITE.get()))), - DOLOMITE_LAYERS(() -> - new LayeredCTBlock(Properties.from(DOLOMITE.get()), AllCTs.DOLOMITE_LAYERS, AllCTs.POLISHED_DOLOMITE)), + DOLOMITE_LAYERS(() -> new LayeredCTBlock(Properties.from(DOLOMITE.get()), AllCTs.DOLOMITE_LAYERS, + AllCTs.POLISHED_DOLOMITE)), LIMESAND(() -> new FallingBlock(Properties.from(Blocks.SAND))), - LIMESTONE(() -> new Block(Properties.from(Blocks.SANDSTONE)), ITaggable.create().withForgeTags("stone"), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - LIMESTONE_BRICKS(() -> new Block(Properties.from(LIMESTONE.get())), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - POLISHED_LIMESTONE(() -> new Block(Properties.from(LIMESTONE.get())), ITaggable.create().withForgeTags("stone"), ComesWith.SLAB), - LIMESTONE_PILLAR(() -> new RotatedPillarBlock(Properties.from(LIMESTONE.get()))), - LIMESTONE_LAYERS(() -> - new LayeredCTBlock(Properties.from(LIMESTONE.get()), AllCTs.LIMESTONE_LAYERS, AllCTs.POLISHED_LIMESTONE)), - WEATHERED_LIMESTONE(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - WEATHERED_LIMESTONE_BRICKS(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())), ComesWith.STAIRS, ComesWith.SLAB, + LIMESTONE(() -> new Block(Properties.from(Blocks.SANDSTONE)), ITaggable.create().withForgeTags("stone"), + ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + LIMESTONE_BRICKS(() -> new Block(Properties.from(LIMESTONE.get())), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - POLISHED_WEATHERED_LIMESTONE(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())), ITaggable.create().withForgeTags("stone"), ComesWith.SLAB), + POLISHED_LIMESTONE(() -> new Block(Properties.from(LIMESTONE.get())), ITaggable.create().withForgeTags("stone"), + ComesWith.SLAB), + LIMESTONE_PILLAR(() -> new RotatedPillarBlock(Properties.from(LIMESTONE.get()))), + LIMESTONE_LAYERS(() -> new LayeredCTBlock(Properties.from(LIMESTONE.get()), AllCTs.LIMESTONE_LAYERS, + AllCTs.POLISHED_LIMESTONE)), + WEATHERED_LIMESTONE(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"), + ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + WEATHERED_LIMESTONE_BRICKS(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())), ComesWith.STAIRS, + ComesWith.SLAB, ComesWith.WALL), + POLISHED_WEATHERED_LIMESTONE(() -> new Block(Properties.from(WEATHERED_LIMESTONE.get())), + ITaggable.create().withForgeTags("stone"), ComesWith.SLAB), WEATHERED_LIMESTONE_PILLAR(() -> new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.get()))), WEATHERED_LIMESTONE_LAYERS(() -> new LayeredCTBlock(Properties.from(WEATHERED_LIMESTONE.get()), AllCTs.WEATHERED_LIMESTONE_LAYERS, AllCTs.POLISHED_WEATHERED_LIMESTONE)), NATURAL_SCORIA(ScoriaBlock::new), - SCORIA(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - POLISHED_SCORIA(() -> new Block(Properties.from(SCORIA.get())), ITaggable.create().withForgeTags("stone"), ComesWith.SLAB), + SCORIA(() -> new Block(Properties.from(Blocks.ANDESITE)), ITaggable.create().withForgeTags("stone"), + ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), + POLISHED_SCORIA(() -> new Block(Properties.from(SCORIA.get())), ITaggable.create().withForgeTags("stone"), + ComesWith.SLAB), SCORIA_BRICKS(() -> new Block(Properties.from(SCORIA.get()))), - SCORIA_LAYERS(() -> new LayeredCTBlock(Properties.from(SCORIA.get()), AllCTs.SCORIA_LAYERS, AllCTs.POLISHED_SCORIA)), + SCORIA_LAYERS( + () -> new LayeredCTBlock(Properties.from(SCORIA.get()), AllCTs.SCORIA_LAYERS, AllCTs.POLISHED_SCORIA)), SCORIA_PILLAR(() -> new RotatedPillarBlock(Properties.from(SCORIA.get()))), DARK_SCORIA(() -> new Block(Properties.from(Blocks.ANDESITE))), POLISHED_DARK_SCORIA(() -> new Block(Properties.from(DARK_SCORIA.get()))), DARK_SCORIA_TILES(() -> new Block(Properties.from(DARK_SCORIA.get())), ComesWith.STAIRS, ComesWith.SLAB), - DARK_SCORIA_BRICKS(() -> new Block(Properties.from(DARK_SCORIA.get())), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), - - __MATERIALS__(), - COPPER_ORE(() -> new OxidizingBlock(Properties.from(Blocks.IRON_ORE), 1), ITaggable.create().withForgeTags("ores/copper")), - ZINC_ORE(() -> new Block(Properties.from(Blocks.GOLD_ORE).harvestLevel(2).harvestTool(ToolType.PICKAXE)), ITaggable.create().withForgeTags("ores/zinc")), - COPPER_BLOCK(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f), ITaggable.create().withForgeTags("storage_blocks/copper")), - COPPER_SHINGLES(() -> new OxidizingBlock(Properties.from(Blocks.IRON_BLOCK), 1 / 32f)), - ZINC_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), ITaggable.create().withForgeTags("storage_blocks/zinc")), - BRASS_BLOCK(() -> new Block(Properties.from(Blocks.IRON_BLOCK)), ITaggable.create().withForgeTags("storage_blocks/brass")), + DARK_SCORIA_BRICKS(() -> new Block(Properties.from(DARK_SCORIA.get())), ComesWith.STAIRS, ComesWith.SLAB, + ComesWith.WALL), ; - + private enum ComesWith { NO_BLOCKITEM, WALL, FENCE, FENCE_GATE, SLAB, STAIRS } public final RegistryEntry block; public final ImmutableList> alsoRegistered; - public final IModule module; + public final Sections section; - AllBlocks() { - Create.registrate().setModule(Lang.asId(name()).replaceAll("__", "")); + AllBlocks(Sections section) { + Create.registrate().startSection(section); this.block = null; this.alsoRegistered = ImmutableList.of(); - this.module = Create.registrate().getModule(); + this.section = Create.registrate().currentSection(); } AllBlocks(NonNullSupplier block, ComesWith... comesWith) { this(block, ITaggable.create(), comesWith); } - - AllBlocks(NonNullSupplier block, NonNullBiFunction customItemCreator, ComesWith... comesWith) { - this(block, customItemCreator, ITaggable.create(), comesWith); - } - AllBlocks(NonNullSupplier block, ITaggable tags, ComesWith... comesWith) { - this(block, null, tags, comesWith); + AllBlocks(NonNullSupplier block, + NonNullBiFunction customItemCreator, + ComesWith... comesWith) { + this(block, customItemCreator, ITaggable.create(), comesWith); } - AllBlocks(NonNullSupplier block, NonNullBiFunction customItemCreator, ITaggable tags, ComesWith... comesWith){ - this.module = Create.registrate().getModule(); - + AllBlocks(NonNullSupplier block, ITaggable tags, ComesWith... comesWith) { + this(block, null, tags, comesWith); + } + + AllBlocks(NonNullSupplier block, + NonNullBiFunction customItemCreator, ITaggable tags, + ComesWith... comesWith) { + this.section = Create.registrate().currentSection(); + this.block = Create.registrate().block(Lang.asId(name()), $ -> block.get()) // TODO take properties as input - .blockstate(NonNullBiConsumer.noop()) // TODO + .blockstate(NonNullBiConsumer.noop()) // TODO .loot(NonNullBiConsumer.noop()) // TODO .setData(ProviderType.LANG, NonNullBiConsumer.noop()) // TODO - .transform(applyTags(tags)) - .transform(b -> registerItemBlock(b, customItemCreator, comesWith)) - .register(); + .transform(applyTags(tags)).transform(b -> registerItemBlock(b, customItemCreator, comesWith)) + .register(); ImmutableList.Builder> alsoRegistered = ImmutableList.builder(); for (ComesWith with : comesWith) { - if (with != ComesWith.NO_BLOCKITEM) { - alsoRegistered.add(makeRelatedBlock(this.block, with)); - } + if (with != ComesWith.NO_BLOCKITEM) { + alsoRegistered.add(makeRelatedBlock(this.block, with)); + } } this.alsoRegistered = alsoRegistered.build(); } @@ -353,19 +384,21 @@ public enum AllBlocks implements NonNullSupplier { public static void register() { } - public BlockBuilder registerItemBlock(BlockBuilder builder, NonNullBiFunction customItemCreator, ComesWith... comesWith) { - if (ArrayUtils.contains(comesWith, ComesWith.NO_BLOCKITEM)) { - return builder; - } + public BlockBuilder registerItemBlock(BlockBuilder builder, + NonNullBiFunction customItemCreator, + ComesWith... comesWith) { + if (ArrayUtils.contains(comesWith, ComesWith.NO_BLOCKITEM)) { + return builder; + } return registerAsItem(builder, customItemCreator); } - private BlockBuilder registerAsItem(BlockBuilder builder, NonNullBiFunction customItemCreator) { - ItemBuilder> itemBuilder = customItemCreator == null ? builder.item() : builder.item(customItemCreator); - return itemBuilder - .model(NonNullBiConsumer.noop()) // TODO - .properties($ -> AllItems.includeInItemGroup()) - .build(); + private BlockBuilder registerAsItem(BlockBuilder builder, + NonNullBiFunction customItemCreator) { + ItemBuilder> itemBuilder = + customItemCreator == null ? builder.item() : builder.item(customItemCreator); + return itemBuilder.model(NonNullBiConsumer.noop()) // TODO + .properties($ -> AllItems.includeInItemGroup()).build(); } @Override @@ -387,44 +420,41 @@ public enum AllBlocks implements NonNullSupplier { switch (feature) { case FENCE: - creator = FenceBlock::new; - tag = BlockTags.FENCES; + creator = FenceBlock::new; + tag = BlockTags.FENCES; break; case SLAB: - creator = SlabBlock::new; - tag = BlockTags.SLABS; + creator = SlabBlock::new; + tag = BlockTags.SLABS; break; case STAIRS: - creator = p -> new ProperStairsBlock(block.get()); - tag = BlockTags.STAIRS; + creator = p -> new ProperStairsBlock(block.get()); + tag = BlockTags.STAIRS; break; case WALL: - creator = WallBlock::new; - tag = BlockTags.WALLS; + creator = WallBlock::new; + tag = BlockTags.WALLS; break; case FENCE_GATE: - creator = FenceGateBlock::new; - tag = null; + creator = FenceGateBlock::new; + tag = null; break; default: - throw new IllegalArgumentException("Unknown ComesWith type?"); + throw new IllegalArgumentException("Unknown ComesWith type?"); } return Create.registrate().block(block.getId().getPath() + "_" + Lang.asId(feature.name()), creator) - .blockstate(NonNullBiConsumer.noop()) // TODO + .blockstate(NonNullBiConsumer.noop()) // TODO .loot(NonNullBiConsumer.noop()) // TODO - .item() - .model(NonNullBiConsumer.noop()) // TODO - .build() - .transform(b -> tag != null ? b.tag(tag) : b) - .register(); + .item().model(NonNullBiConsumer.noop()) // TODO + .build().transform(b -> tag != null ? b.tag(tag) : b).register(); } - + private NonNullUnaryOperator> applyTags(ITaggable tags) { - return b -> { - tags.getDataTags(ITaggable.BLOCK).forEach(b::tag); - return b; - }; + return b -> { + tags.getDataTags(ITaggable.BLOCK).forEach(b::tag); + return b; + }; } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 1c46ab971..2b4f8f9f8 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -1,29 +1,37 @@ package com.simibubi.create; +import static com.simibubi.create.modules.Sections.SCHEMATICS; + import com.simibubi.create.modules.schematics.block.CreativeCrateBlock; import com.simibubi.create.modules.schematics.block.SchematicTableBlock; import com.simibubi.create.modules.schematics.block.SchematicannonBlock; import com.tterrag.registrate.util.RegistryEntry; +import net.minecraft.block.Blocks; + public class AllBlocksNew { private static final CreateRegistrate REGISTRATE = Create.registrate(); - static { REGISTRATE.setModule("SCHEMATICS"); } + // Tools for strucuture movement and replication + static { REGISTRATE.startSection(SCHEMATICS); } public static final RegistryEntry SCHEMATICANNON = REGISTRATE.block("schematicannon", SchematicannonBlock::new) + .initialProperties(() -> Blocks.DISPENSER) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), prov.models().getExistingFile(prov.modLoc("block/" + ctx.getName() + "/base")))) .item() - .model((ctx, prov) -> prov.blockItem(ctx.getEntry()::getBlock, "/base")) + .model((ctx, prov) -> prov.blockItem(ctx.getEntry()::getBlock, "/item")) .build() .register(); public static final RegistryEntry CREATIVE_CRATE = REGISTRATE.block("creative_crate", CreativeCrateBlock::new) + .initialProperties(() -> Blocks.CHEST) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), prov.models().getExistingFile(ctx.getId()))) .simpleItem() .register(); public static final RegistryEntry SCHEMATIC_TABLE = REGISTRATE.block("schematic_table", SchematicTableBlock::new) + .initialProperties(() -> Blocks.LECTERN) .blockstate((ctx, prov) -> prov.horizontalBlock(ctx.getEntry(), prov.models().getExistingFile(ctx.getId()), 0)) .simpleItem() .register(); diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index b61642f0d..ff97ef7ff 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.item.IHaveCustomItemModel; import com.simibubi.create.foundation.item.IItemWithColorHandler; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.data.ITaggable; -import com.simibubi.create.modules.IModule; +import com.simibubi.create.modules.Sections; import com.simibubi.create.modules.contraptions.GogglesItem; import com.simibubi.create.modules.contraptions.WrenchItem; import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueItem; @@ -23,6 +23,7 @@ import com.simibubi.create.modules.contraptions.relays.gearbox.VerticalGearboxIt import com.simibubi.create.modules.curiosities.ChromaticCompoundCubeItem; import com.simibubi.create.modules.curiosities.RefinedRadianceItem; import com.simibubi.create.modules.curiosities.ShadowSteelItem; +import com.simibubi.create.modules.curiosities.TreeFertilizerItem; import com.simibubi.create.modules.curiosities.deforester.DeforesterItem; import com.simibubi.create.modules.curiosities.symmetry.SymmetryWandItem; import com.simibubi.create.modules.curiosities.tools.AllToolTiers; @@ -32,7 +33,6 @@ import com.simibubi.create.modules.curiosities.tools.SandPaperItem; import com.simibubi.create.modules.curiosities.tools.ShadowSteelToolItem; import com.simibubi.create.modules.curiosities.zapper.blockzapper.BlockzapperItem; import com.simibubi.create.modules.curiosities.zapper.terrainzapper.TerrainzapperItem; -import com.simibubi.create.modules.gardens.TreeFertilizerItem; import com.simibubi.create.modules.logistics.item.filter.FilterItem; import com.simibubi.create.modules.schematics.item.SchematicAndQuillItem; import com.simibubi.create.modules.schematics.item.SchematicItem; @@ -57,7 +57,8 @@ import net.minecraftforge.registries.IForgeRegistry; @EventBusSubscriber(value = Dist.CLIENT, bus = Bus.MOD) public enum AllItems { - __MATERIALS__(module()), + _1_(Sections.MATERIALS), + COPPER_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/copper")), ZINC_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/zinc")), BRASS_NUGGET((TaggedItem) new TaggedItem().withForgeTags("nuggets/brass")), @@ -88,8 +89,9 @@ public enum AllItems { REFINED_RADIANCE(RefinedRadianceItem::new, rarity(Rarity.UNCOMMON)), ELECTRON_TUBE, INTEGRATED_CIRCUIT, + + _2_(Sections.KINETICS), - __CONTRAPTIONS__(module()), BELT_CONNECTOR(BeltConnectorItem::new), VERTICAL_GEARBOX(VerticalGearboxItem::new), PROPELLER, @@ -104,11 +106,13 @@ public enum AllItems { MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.RIDEABLE, p)), FURNACE_MINECART_CONTRAPTION(p -> new MinecartContraptionItem(Type.FURNACE, p)), - __LOGISTICS__(module()), + _3_(Sections.LOGISTICS), + FILTER(FilterItem::new), PROPERTY_FILTER(FilterItem::new), - __CURIOSITIES__(module()), + _4_(Sections.CURIOSITIES), + TREE_FERTILIZER(TreeFertilizerItem::new), PLACEMENT_HANDGUN(BlockzapperItem::new), TERRAIN_ZAPPER(TerrainzapperItem::new), @@ -129,27 +133,28 @@ public enum AllItems { SHADOW_STEEL_PICKAXE(p -> new ShadowSteelToolItem(2.5F, -2.0F, p, PICKAXE)), SHADOW_STEEL_MATTOCK(p -> new ShadowSteelToolItem(2.5F, -1.5F, p, SHOVEL, AXE, HOE)), SHADOW_STEEL_SWORD(p -> new SwordItem(AllToolTiers.SHADOW_STEEL, 3, -2.0F, p)), - - __SCHEMATICS__(module()), + + _5_(Sections.SCHEMATICS), + EMPTY_BLUEPRINT(Item::new, stackSize(1)), BLUEPRINT_AND_QUILL(SchematicAndQuillItem::new, stackSize(1)), BLUEPRINT(SchematicItem::new), ; - private static class CategoryTracker { - static IModule currentModule; + private static class SectionTracker { + static Sections currentSection; } // Common - public IModule module; + public Sections section; private Function specialProperties; private TaggedItem taggedItem; private Item item; - AllItems(int moduleMarker) { - CategoryTracker.currentModule = () -> Lang.asId(name()).replaceAll("__", ""); + AllItems(Sections section) { + SectionTracker.currentSection = section; taggedItem = new TaggedItem(null); } @@ -171,7 +176,7 @@ public enum AllItems { AllItems(TaggedItem taggedItemIn, Function specialProperties) { this.taggedItem = taggedItemIn; - this.module = CategoryTracker.currentModule; + this.section = SectionTracker.currentSection; this.specialProperties = specialProperties; } @@ -187,10 +192,6 @@ public enum AllItems { return includeInItemGroup().setISTER(() -> item::getRenderer); } - private static int module() { - return 0; - } - public static Properties includeInItemGroup() { return new Properties().group(Create.creativeTab); } diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 17eb30a86..ed162dd78 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.command.CreateCommand; import com.simibubi.create.foundation.command.ServerLagger; import com.simibubi.create.foundation.world.AllWorldFeatures; -import com.simibubi.create.modules.ModuleLoadedCondition; import com.simibubi.create.modules.contraptions.TorquePropagator; import com.simibubi.create.modules.logistics.RedstoneLinkNetworkHandler; import com.simibubi.create.modules.schematics.ServerSchematicLoader; @@ -23,7 +22,6 @@ import net.minecraft.particles.ParticleType; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -75,7 +73,6 @@ public class Create { torquePropagator = new TorquePropagator(); lagger = new ServerLagger(); - CraftingHelper.register(new ModuleLoadedCondition.Serializer()); AllPackets.registerPackets(); AllTriggers.register(); diff --git a/src/main/java/com/simibubi/create/CreateItemGroup.java b/src/main/java/com/simibubi/create/CreateItemGroup.java index 8f0563fff..d6cb24cbc 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroup.java +++ b/src/main/java/com/simibubi/create/CreateItemGroup.java @@ -40,15 +40,12 @@ public final class CreateItemGroup extends ItemGroup { Block def = entry.get(); if (def == null) continue; - if (!Create.registrate().getModule(entry).isEnabled()) - continue; if (def instanceof IAddedByOther) continue; Item item = def.asItem(); - if (item != Items.AIR) { + if (item != Items.AIR) item.fillItemGroup(this, items); - } } } @@ -59,8 +56,6 @@ public final class CreateItemGroup extends ItemGroup { for (AllItems item : AllItems.values()) { if (item.get() == null) continue; - if (!item.module.isEnabled()) - continue; IBakedModel model = itemRenderer.getItemModelWithOverrides(item.asStack(), Minecraft.getInstance().world, null); if (model.isGui3d() != specialItems) continue; diff --git a/src/main/java/com/simibubi/create/CreateRegistrate.java b/src/main/java/com/simibubi/create/CreateRegistrate.java index c923a6d24..70a18c4fc 100644 --- a/src/main/java/com/simibubi/create/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/CreateRegistrate.java @@ -1,11 +1,10 @@ package com.simibubi.create; import java.util.IdentityHashMap; -import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import com.simibubi.create.modules.IModule; +import com.simibubi.create.modules.Sections; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.Builder; @@ -41,18 +40,17 @@ public class CreateRegistrate extends AbstractRegistrate { super(modid); } - private Map, IModule> moduleLookup = new IdentityHashMap<>(); + private Map, Sections> sectionLookup = new IdentityHashMap<>(); - private IModule module; + private Sections section; - public CreateRegistrate setModule(String module) { - final String moduleName = module.toLowerCase(Locale.ROOT); - this.module = () -> moduleName; + public CreateRegistrate startSection(Sections section) { + this.section = section; return self(); } - public IModule getModule() { - return module; + public Sections currentSection() { + return section; } @Deprecated @@ -64,19 +62,19 @@ public class CreateRegistrate extends AbstractRegistrate { protected , T extends R> RegistryEntry accept(String name, Class type, Builder builder, NonNullSupplier creator) { RegistryEntry ret = super.accept(name, type, builder, creator); - moduleLookup.put(ret, getModule()); + sectionLookup.put(ret, currentSection()); return ret; } - public IModule getModule(RegistryEntry entry) { - return moduleLookup.getOrDefault(entry, IModule.of("unknown")); + public Sections getSection(RegistryEntry entry) { + return sectionLookup.getOrDefault(entry, Sections.UNASSIGNED); } - public IModule getModule(IForgeRegistryEntry entry) { - return moduleLookup.entrySet().stream() + public Sections getSection(IForgeRegistryEntry entry) { + return sectionLookup.entrySet().stream() .filter(e -> e.getKey().get() == entry) .map(Entry::getValue) .findFirst() - .orElse(IModule.of("unknown")); + .orElse(Sections.UNASSIGNED); } } diff --git a/src/main/java/com/simibubi/create/config/CServer.java b/src/main/java/com/simibubi/create/config/CServer.java index 582ea3fa7..461828a8d 100644 --- a/src/main/java/com/simibubi/create/config/CServer.java +++ b/src/main/java/com/simibubi/create/config/CServer.java @@ -2,12 +2,6 @@ package com.simibubi.create.config; public class CServer extends ConfigBase { - public ConfigGroup modules = group(0, "modules", Comments.modules); - public ConfigBool enableSchematics = b(true, "enableSchematics"); - public ConfigBool enableCuriosities = b(true, "enableCuriosities"); - public ConfigBool enablePalettes = b(true, "enablePalettes"); - public ConfigBool enableLogistics = b(true, "enableLogistics"); - public ConfigGroup infrastructure = group(0, "infrastructure", Comments.infrastructure); public ConfigInt tickrateSyncTimer = i(20, 5, "tickrateSyncTimer", "[in Ticks]", Comments.tickrateSyncTimer, Comments.tickrateSyncTimer2); @@ -24,11 +18,10 @@ public class CServer extends ConfigBase { } private static class Comments { - static String schematics = "The Schematics Module"; - static String kinetics = "The Contraptions Module"; - static String logistics = "The Logistics Module"; - static String curiosities = "Everything that spins"; - static String modules = "Configure which Modules should be accessible in recipes and creative menus."; + static String schematics = "Everything related to Schematic tools"; + static String kinetics = "Parameters and abilities of Create's kinetic mechanisms"; + static String logistics = "Tweaks for logistical components"; + static String curiosities = "Gadgets and other Shenanigans added by Create"; static String control = "You can try inhibiting related game mechanics for troubleshooting repeated crashes."; static String infrastructure = "The Backbone of Create"; static String tickrateSyncTimer = diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java index f77b975f4..a2e5a4cad 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java @@ -56,6 +56,7 @@ public class ItemDescription { Yellow(GOLD, YELLOW), Red(DARK_RED, RED), Purple(DARK_PURPLE, LIGHT_PURPLE), + Gray(DARK_GRAY, GRAY), ; diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index d7afff84c..a31a3d20d 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -11,7 +11,7 @@ import com.mojang.bridge.game.Language; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.IModule; +import com.simibubi.create.modules.Sections; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.components.flywheel.engine.EngineBlock; import com.simibubi.create.modules.curiosities.tools.AllToolTiers; @@ -130,11 +130,11 @@ public class TooltipHelper { } private static ItemDescription buildToolTip(String translationKey, ItemStack stack) { - IModule module = IModule.of(stack); + Sections module = Sections.of(stack); if (I18n.format(translationKey).equals("WIP")) - return new WipScription(module.getToolTipColor()); + return new WipScription(module.getTooltipPalette()); - ItemDescription tooltip = new ItemDescription(module.getToolTipColor()); + ItemDescription tooltip = new ItemDescription(module.getTooltipPalette()); String summaryKey = translationKey + ".summary"; // Summary diff --git a/src/main/java/com/simibubi/create/modules/IModule.java b/src/main/java/com/simibubi/create/modules/IModule.java deleted file mode 100644 index 9b72d330e..000000000 --- a/src/main/java/com/simibubi/create/modules/IModule.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.simibubi.create.modules; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; -import com.simibubi.create.Create; -import com.simibubi.create.config.AllConfigs; -import com.simibubi.create.config.CServer; -import com.simibubi.create.foundation.item.ItemDescription.Palette; - -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public interface IModule { - - public static boolean isActive(String module) { - if (module.equals("materials")) - return true; - - CServer conf = AllConfigs.SERVER; - switch (module) { - case "contraptions": - return true; - case "palettes": - return conf.enablePalettes.get(); - case "curiosities": - return conf.enableCuriosities.get(); - case "logistics": - return conf.enableLogistics.get(); - case "schematics": - return conf.enableSchematics.get(); - default: - return false; - } - } - - public default Palette getToolTipColor() { - String module = getModuleName(); - - if (module.equals("materials")) - return Palette.Purple; - - switch (module) { - case "contraptions": - return Palette.Red; - case "palettes": - return Palette.Green; - case "curiosities": - return Palette.Purple; - case "logistics": - return Palette.Yellow; - case "schematics": - return Palette.Blue; - default: - return Palette.Purple; - } - } - - public static IModule of(String name) { - return () -> name; - } - - public static IModule of(ItemStack stack) { - Item item = stack.getItem(); - if (item instanceof BlockItem) - return ofBlock(((BlockItem) item).getBlock()); - return ofItem(item); - } - - static IModule ofItem(Item item) { - for (AllItems allItems : AllItems.values()) { - if (allItems.get() == item) - return allItems.module; - } - return null; - } - - static IModule ofBlock(Block block) { - for (AllBlocks allBlocks : AllBlocks.values()) { - if (allBlocks.get() == block) - return allBlocks.module; - } - return Create.registrate().getModule(block); - } - - public default boolean isEnabled() { - return isActive(getModuleName()); - } - - public String getModuleName(); - -} diff --git a/src/main/java/com/simibubi/create/modules/ModuleLoadedCondition.java b/src/main/java/com/simibubi/create/modules/ModuleLoadedCondition.java deleted file mode 100644 index 85989685e..000000000 --- a/src/main/java/com/simibubi/create/modules/ModuleLoadedCondition.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simibubi.create.modules; - -import com.google.gson.JsonObject; -import com.simibubi.create.Create; - -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; - -public class ModuleLoadedCondition implements ICondition { - - private static final ResourceLocation NAME = new ResourceLocation(Create.ID, "module"); - protected String module; - - public ModuleLoadedCondition(String module) { - this.module = module; - } - - @Override - public ResourceLocation getID() { - return NAME; - } - - @Override - public boolean test() { - return IModule.isActive(module); - } - - @Override - public String toString() { - return "module_loaded(\"" + module + "\")"; - } - - public static class Serializer implements IConditionSerializer { - public static final Serializer INSTANCE = new Serializer(); - - @Override - public void write(JsonObject json, ModuleLoadedCondition value) { - json.addProperty("module", value.module); - } - - @Override - public ModuleLoadedCondition read(JsonObject json) { - return new ModuleLoadedCondition(JSONUtils.getString(json, "module")); - } - - @Override - public ResourceLocation getID() { - return NAME; - } - } - -} diff --git a/src/main/java/com/simibubi/create/modules/Sections.java b/src/main/java/com/simibubi/create/modules/Sections.java new file mode 100644 index 000000000..31b5c251b --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/Sections.java @@ -0,0 +1,69 @@ +package com.simibubi.create.modules; + +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllItems; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.item.ItemDescription.Palette; + +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public enum Sections { + + /** Create's kinetic mechanisms */ + KINETICS(Palette.Red), + + /** Item transport and other Utility */ + LOGISTICS(Palette.Yellow), + + /** Helpful gadgets and other shenanigans */ + CURIOSITIES(Palette.Purple), + + /** Tools for strucuture movement and replication */ + SCHEMATICS(Palette.Blue), + + /** Decorative blocks */ + PALETTES(Palette.Green), + + /** Base materials, ingredients and tools */ + MATERIALS(Palette.Green), + + /** Fallback section */ + UNASSIGNED(Palette.Gray) + + ; + + private Palette tooltipPalette; + + private Sections(Palette tooltipPalette) { + this.tooltipPalette = tooltipPalette; + } + + public Palette getTooltipPalette() { + return tooltipPalette; + } + + public static Sections of(ItemStack stack) { + Item item = stack.getItem(); + if (item instanceof BlockItem) + return ofBlock(((BlockItem) item).getBlock()); + return ofItem(item); + } + + static Sections ofItem(Item item) { + for (AllItems allItems : AllItems.values()) + if (allItems.get() == item) + return allItems.section; + return UNASSIGNED; + } + + static Sections ofBlock(Block block) { + for (AllBlocks allBlocks : AllBlocks.values()) + if (allBlocks.get() == block) + return allBlocks.section; + return Create.registrate().getSection(block); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/gardens/CocoaLogBlock.java b/src/main/java/com/simibubi/create/modules/curiosities/CocoaLogBlock.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/gardens/CocoaLogBlock.java rename to src/main/java/com/simibubi/create/modules/curiosities/CocoaLogBlock.java index f4eaf9406..badef535a 100644 --- a/src/main/java/com/simibubi/create/modules/gardens/CocoaLogBlock.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/CocoaLogBlock.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.gardens; +package com.simibubi.create.modules.curiosities; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/com/simibubi/create/modules/gardens/TreeFertilizerItem.java b/src/main/java/com/simibubi/create/modules/curiosities/TreeFertilizerItem.java similarity index 98% rename from src/main/java/com/simibubi/create/modules/gardens/TreeFertilizerItem.java rename to src/main/java/com/simibubi/create/modules/curiosities/TreeFertilizerItem.java index 6061504e5..5684dfe73 100644 --- a/src/main/java/com/simibubi/create/modules/gardens/TreeFertilizerItem.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/TreeFertilizerItem.java @@ -1,4 +1,4 @@ -package com.simibubi.create.modules.gardens; +package com.simibubi.create.modules.curiosities; import com.simibubi.create.foundation.utility.PlacementSimulationServerWorld; diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/CreativeCrateBlock.java b/src/main/java/com/simibubi/create/modules/schematics/block/CreativeCrateBlock.java index ce88646cc..83df75282 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/CreativeCrateBlock.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/CreativeCrateBlock.java @@ -4,7 +4,6 @@ import com.simibubi.create.foundation.utility.AllShapes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -15,8 +14,8 @@ import net.minecraft.world.IBlockReader; public class CreativeCrateBlock extends Block { - public CreativeCrateBlock() { - super(Properties.create(Material.WOOD)); + public CreativeCrateBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java index 67aa38774..f08971e65 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.foundation.utility.AllShapes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.HorizontalBlock; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; @@ -26,8 +25,8 @@ import net.minecraftforge.fml.network.NetworkHooks; public class SchematicTableBlock extends HorizontalBlock implements ITE { - public SchematicTableBlock() { - super(Properties.from(Blocks.OAK_PLANKS)); + public SchematicTableBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java index 5bded53d7..1a03f8920 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.foundation.utility.AllShapes; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -24,8 +23,8 @@ import net.minecraftforge.fml.network.NetworkHooks; public class SchematicannonBlock extends Block implements ITE { - public SchematicannonBlock() { - super(Properties.from(Blocks.DISPENSER)); + public SchematicannonBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/resources/assets/create/models/item/schematicannon.json b/src/main/resources/assets/create/models/block/schematicannon/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/schematicannon.json rename to src/main/resources/assets/create/models/block/schematicannon/item.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/basin.json b/src/main/resources/data/create/recipes/crafting_shaped/basin.json index 37566ac76..c7ab2bc51 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/basin.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/basin.json @@ -12,11 +12,5 @@ "result": { "item": "create:basin", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json b/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json index c9ff5ab82..fdfe4ac60 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json @@ -22,11 +22,5 @@ "result": { "item": "create:belt_funnel", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json b/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json index cb0b166d5..c428b7c2b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json @@ -18,11 +18,5 @@ "result": { "item": "create:belt_tunnel", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json b/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json index 07a869e8e..8b3ed08c7 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json @@ -16,11 +16,5 @@ "result": { "item": "create:brass_hand", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contact.json b/src/main/resources/data/create/recipes/crafting_shaped/contact.json index b7eb73a63..abee0ef3c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contact.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contact.json @@ -19,11 +19,5 @@ "result": { "item": "create:contact", "count": 2 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/adjustable_pulley.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/adjustable_pulley.json index 225c1bad5..4cb953612 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/adjustable_pulley.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/adjustable_pulley.json @@ -19,11 +19,5 @@ "result": { "item": "create:adjustable_pulley", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/analog_lever.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/analog_lever.json index 207e37148..a710226ae 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/analog_lever.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/analog_lever.json @@ -15,11 +15,5 @@ "result": { "item": "create:analog_lever", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json index d3b268ab2..815c06973 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json @@ -12,11 +12,5 @@ "result": { "item": "create:belt_connector", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json index 8f49c240d..350bbf5e5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json @@ -22,11 +22,5 @@ "result": { "item": "create:cart_assembler", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clockwork_bearing.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clockwork_bearing.json index fa7091d71..452c38601 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clockwork_bearing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clockwork_bearing.json @@ -22,11 +22,5 @@ "result": { "item": "create:clockwork_bearing", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json index 59dfdca44..933404197 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json @@ -19,11 +19,5 @@ "result": { "item": "create:clutch", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json index 4bdfbd623..863720207 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json @@ -16,11 +16,5 @@ "result": { "item": "create:cogwheel", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cuckoo_clock.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cuckoo_clock.json index 6cbd4aa3c..bca9adf20 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cuckoo_clock.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cuckoo_clock.json @@ -22,11 +22,5 @@ "result": { "item": "create:cuckoo_clock", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json index 2200161ab..be500f49a 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json @@ -23,11 +23,5 @@ "result": { "item": "create:deployer", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json index b3a1cf66c..724ab7936 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json @@ -19,11 +19,5 @@ "result": { "item": "create:drill", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json index 5707231e4..5ab5234ca 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json @@ -16,11 +16,5 @@ "result": { "item": "create:encased_belt", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json index c053bcec2..c21000c14 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json @@ -25,11 +25,5 @@ "result": { "item": "create:encased_fan", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json index 070c61406..3175e91b2 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json @@ -14,11 +14,5 @@ "result": { "item": "create:encased_shaft", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json index 700454a33..fec3d8dcb 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json @@ -16,11 +16,5 @@ "result": { "item": "create:gearbox", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json index fa2064208..6f7b670d0 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json @@ -19,11 +19,5 @@ "result": { "item": "create:gearshift", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json index 6902f99e5..20e43ccce 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json @@ -19,11 +19,5 @@ "result": { "item": "create:harvester", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json index d7b9fbfd9..c650f029f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json @@ -19,11 +19,5 @@ "result": { "item": "create:large_cogwheel", "count": 2 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json index 9baee3fba..76c1919a0 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json @@ -22,11 +22,5 @@ "result": { "item": "create:mechanical_bearing", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json index fcf6efa70..edabb6252 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json @@ -26,11 +26,5 @@ "result": { "item": "create:mechanical_crafter", "count": 3 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json index 4e706eff0..79d6b3747 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json @@ -22,11 +22,5 @@ "result": { "item": "create:mechanical_mixer", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json index 0c7f5dff1..d7efb91b9 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json @@ -22,11 +22,5 @@ "result": { "item": "create:mechanical_piston", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json index 8abcad784..9db6f0dc5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json @@ -23,11 +23,5 @@ "result": { "item": "create:mechanical_press", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/millstone.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/millstone.json index 7e9d78ec0..37ccdb8e6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/millstone.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/millstone.json @@ -22,11 +22,5 @@ "result": { "item": "create:millstone", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mysterious_cuckoo_clock.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mysterious_cuckoo_clock.json index 79397873a..b1b337d4f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mysterious_cuckoo_clock.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mysterious_cuckoo_clock.json @@ -16,11 +16,5 @@ "result": { "item": "create:mysterious_cuckoo_clock", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json index 33b01ac29..6d7e759fc 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json @@ -16,11 +16,5 @@ "result": { "item": "create:piston_pole", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/plough.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/plough.json index 9547e94b5..2a459185d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/plough.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/plough.json @@ -19,11 +19,5 @@ "result": { "item": "create:plough", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/portable_storage_interface.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/portable_storage_interface.json index 4cbcbaadd..844377886 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/portable_storage_interface.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/portable_storage_interface.json @@ -14,11 +14,5 @@ "result": { "item": "create:portable_storage_interface", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rope_pulley.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rope_pulley.json index 1b86ec51e..b411301ae 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rope_pulley.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rope_pulley.json @@ -22,11 +22,5 @@ "result": { "item": "create:rope_pulley", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json index 9f44fd865..c5d68f148 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json @@ -16,11 +16,5 @@ "result": { "item": "create:rotation_chassis", "count": 3 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_speed_controller.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_speed_controller.json index d375e21f8..14854082b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_speed_controller.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_speed_controller.json @@ -18,11 +18,5 @@ "result": { "item": "create:rotation_speed_controller", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json index b4f344a01..f599e0593 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json @@ -19,11 +19,5 @@ "result": { "item": "create:saw", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sequenced_gearshift.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sequenced_gearshift.json index 20d3df096..58683bed5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sequenced_gearshift.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sequenced_gearshift.json @@ -23,11 +23,5 @@ "result": { "item": "create:sequenced_gearshift", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json index 13f9aec61..1f2a41442 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json @@ -12,11 +12,5 @@ "result": { "item": "create:shaft", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json index 6e9fa457e..6dce14f00 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json @@ -18,11 +18,5 @@ "result": { "item": "create:speed_gauge", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json index b3e7da35f..0fddfe2e6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json @@ -15,11 +15,5 @@ "result": { "item": "create:sticky_mechanical_piston", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json index b7fe8a47b..6a92647ff 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json @@ -16,11 +16,5 @@ "result": { "item": "create:translation_chassis", "count": 3 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json index d205d439e..ad6294cd5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json @@ -15,11 +15,5 @@ "result": { "item": "create:turntable", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json index 8385d0780..a9e343df2 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json @@ -16,11 +16,5 @@ "result": { "item": "create:water_wheel", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/deforester.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/deforester.json index d1ff1bcd5..a8d634381 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/deforester.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/deforester.json @@ -19,11 +19,5 @@ "result": { "item": "create:deforester", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/filter.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/filter.json index 7024edd88..dca598e22 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/filter.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/filter.json @@ -14,11 +14,5 @@ "result": { "item": "create:filter", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/goggles.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/goggles.json index fdd392de2..0aefd8657 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/goggles.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/goggles.json @@ -18,11 +18,5 @@ "result": { "item": "create:goggles", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/placement_handgun.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/placement_handgun.json index 2a2221b5c..7807b5554 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/placement_handgun.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/placement_handgun.json @@ -19,11 +19,5 @@ "result": { "item": "create:placement_handgun", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/property_filter.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/property_filter.json index 555065396..51d945fe2 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/property_filter.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/property_filter.json @@ -14,11 +14,5 @@ "result": { "item": "create:property_filter", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json index 2568e2c0d..e44b90ed0 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_mattock.json @@ -16,11 +16,5 @@ "result": { "item": "create:shadow_steel_mattock", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json index 5259d3aaa..83d1c42bb 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_pickaxe.json @@ -16,11 +16,5 @@ "result": { "item": "create:shadow_steel_pickaxe", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json index 6892edb88..84e02faac 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/shadow_steel_sword.json @@ -16,11 +16,5 @@ "result": { "item": "create:shadow_steel_sword", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/symmetry_wand.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/symmetry_wand.json index 5ef8d5c08..0a639f61a 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/symmetry_wand.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/symmetry_wand.json @@ -22,11 +22,5 @@ "result": { "item": "create:symmetry_wand", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/wrench.json b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/wrench.json index b34c59de0..318f66fbc 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/curiosities/wrench.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/curiosities/wrench.json @@ -19,11 +19,5 @@ "result": { "item": "create:wrench", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/electron_tube.json b/src/main/resources/data/create/recipes/crafting_shaped/electron_tube.json index ffc9f1268..d0f331ab2 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/electron_tube.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/electron_tube.json @@ -19,11 +19,5 @@ "result": { "item": "create:electron_tube", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json b/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json index 6d43bae93..cd435b700 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json @@ -21,11 +21,5 @@ "result": { "item": "create:entity_detector", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/extractor.json b/src/main/resources/data/create/recipes/crafting_shaped/extractor.json index 880b840a3..793f07cb7 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/extractor.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/extractor.json @@ -22,11 +22,5 @@ "result": { "item": "create:extractor", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json b/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json index f9a00f72c..b6a5eeb5e 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json @@ -13,11 +13,5 @@ "result": { "item": "create:flexcrate", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json b/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json index 1b9a63661..1e7784270 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json @@ -21,11 +21,5 @@ "result": { "item": "create:flexpeater", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json b/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json index 70d48bb12..2c64cf03c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json @@ -14,11 +14,5 @@ "result": { "item": "create:flexpulsepeater", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/hand_crank.json b/src/main/resources/data/create/recipes/crafting_shaped/hand_crank.json index 158a4507f..7f861df46 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/hand_crank.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/hand_crank.json @@ -19,11 +19,5 @@ "result": { "item": "create:hand_crank", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/andesite_casing.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/andesite_casing.json index 1ec494b13..e3d5f8d97 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/andesite_casing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/andesite_casing.json @@ -19,11 +19,5 @@ "result": { "item": "create:andesite_casing", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_casing.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_casing.json index 82f697ff1..28788c5d1 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_casing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_casing.json @@ -19,11 +19,5 @@ "result": { "item": "create:brass_casing", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_ingot.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_ingot.json index 1fe46c76e..7b44e107f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_ingot.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/brass_ingot.json @@ -12,11 +12,5 @@ }, "result": { "item": "create:brass_ingot" - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_casing.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_casing.json index 2d6510cf2..70524fd2b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_casing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_casing.json @@ -19,11 +19,5 @@ "result": { "item": "create:copper_casing", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_ingot.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_ingot.json index bf2dacad4..77b6a3625 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_ingot.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/copper_ingot.json @@ -12,11 +12,5 @@ }, "result": { "item": "create:copper_ingot" - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/materials/zinc_ingot.json b/src/main/resources/data/create/recipes/crafting_shaped/materials/zinc_ingot.json index a480284ca..e62729509 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/materials/zinc_ingot.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/materials/zinc_ingot.json @@ -12,11 +12,5 @@ }, "result": { "item": "create:zinc_ingot" - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/nozzle.json b/src/main/resources/data/create/recipes/crafting_shaped/nozzle.json index f412d9267..ca6d4d1c3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/nozzle.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/nozzle.json @@ -16,11 +16,5 @@ "result": { "item": "create:nozzle", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json index ee9aa413f..b261917bf 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:acacia_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json index da116603a..d4733c958 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:acacia_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json index 5048cb608..1f133cfcd 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:birch_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json index ada5713f3..1f76df04d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:birch_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json index 562a94005..414d01b71 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:dark_oak_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json index ba2ffe6cb..2a6d87008 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:dark_oak_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json index 1dd3ac7db..6278aad24 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json @@ -16,11 +16,5 @@ "result": { "item": "create:dark_scoria", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json index 79ab029da..087c8642d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:dark_scoria_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json index 7cda4d17d..b391d2b76 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:dark_scoria_bricks_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json index cdff6dd49..3f28b49a7 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:dark_scoria_bricks_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json index b925afe5e..52c6ad89c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:dark_scoria_bricks_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json index 771ffe357..28164b8f4 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json @@ -11,11 +11,5 @@ "result": { "item": "create:dark_scoria_tiles", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json index dd9f43614..b4ab84eb0 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:dark_scoria_tiles_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json index 9d2c39207..fe3c37d8c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:dark_scoria_tiles_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_bricks.json index d59e95b22..1f6baef99 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:dolomite_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_slab.json index efd5c8f93..6b77d81c9 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:dolomite_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_stairs.json index 75a6d0b8e..4e094f3bb 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:dolomite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json index f34e747b6..18c10a2bb 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:dolomite_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json index a9bb02d74..5da8b0706 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:framed_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks.json index 7d3dd8ef7..60a32f678 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:gabbro_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_stairs.json index 0eacbcd24..1ba3b48b0 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:gabbro_bricks_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json index c9b9cdcbf..da3e48bcc 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:gabbro_bricks_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_slab.json index a4ab5da74..bfc5f8f63 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:gabbro_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_stairs.json index b2a9d1d38..171176b7c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:gabbro_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json index dbf3db7d3..ed76575a8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:gabbro_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json index 276621f48..6159bcee5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:horizontal_framed_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/indented_gabbro_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/indented_gabbro_slab.json index c7fb6a998..d0122bcb6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/indented_gabbro_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/indented_gabbro_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:indented_gabbro_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json index cb3d7180c..c7281d485 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:iron_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json index ed5ab6e84..a56fb8c1c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:iron_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json index f15383737..bbf1e4328 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:jungle_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json index da5a5a4e2..1963deda8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:jungle_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limesand.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limesand.json index 936f5b40e..f8b0f8831 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limesand.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limesand.json @@ -15,11 +15,5 @@ "result": { "item": "create:limesand", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks.json index eae0a8f21..f9081bc89 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:limestone_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_slab.json index 2916e13e5..fe91d2bd1 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:limestone_bricks_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_stairs.json index 65157573e..b25bacc12 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:limestone_bricks_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json index 3ad232736..331d042ab 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:limestone_bricks_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_slab.json index 4a985153d..18c746461 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:limestone_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_stairs.json index 7f5eb1c55..f8d1c6e3d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:limestone_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json index 1fc316735..573b589e8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:limestone_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json index abaa47387..5112a1142 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:oak_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json index 2a4ad1e7a..7e98436ac 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:oak_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/paved_gabbro_bricks_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/paved_gabbro_bricks_slab.json index 7ed214620..e5f24e407 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/paved_gabbro_bricks_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/paved_gabbro_bricks_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:paved_gabbro_bricks_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json index 26eaf18ab..7b8140112 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_dark_scoria", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dolomite.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dolomite.json index 98327a766..9c86b7cfc 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dolomite.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dolomite.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_dolomite", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_gabbro.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_gabbro.json index e6d4300df..f7e796fb9 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_gabbro.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_gabbro.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_gabbro", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone.json index 50153c753..9add521e5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_limestone", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone_slab.json index 4cde0244d..48a2eaca8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_limestone_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:polished_limestone_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json index 004c5bc97..fcc113e68 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_scoria", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json index 04b8b31ee..f84dd727b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:polished_scoria_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone.json index 60952d009..620e79f66 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone.json @@ -12,11 +12,5 @@ "result": { "item": "create:polished_weathered_limestone", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone_slab.json index 5f25daaa6..05bf108eb 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_weathered_limestone_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:polished_weathered_limestone_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json index 800331b23..2962ae31e 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:scoria_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json index 7ff1ae588..cbfab2a36 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:scoria_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json index c59d48af3..be5fd403b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:scoria_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json index 98b82c1fb..24281ae71 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:scoria_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json index 6152517b9..8fd498d80 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json @@ -16,11 +16,5 @@ "result": { "item": "create:spruce_glass", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json index 6854031c5..5c6693153 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:spruce_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json index 0e4bca273..0d0b1ded3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/tiled_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:tiled_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json index d2e1854a7..7180ac0af 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json @@ -12,11 +12,5 @@ "result": { "item": "create:vertical_framed_glass_pane", "count": 16 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone.json index b2a2c7112..a92e9916f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone.json @@ -16,11 +16,5 @@ "result": { "item": "create:weathered_limestone", "count": 8 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks.json index f942efbea..ccea8c165 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks.json @@ -12,11 +12,5 @@ "result": { "item": "create:weathered_limestone_bricks", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_slab.json index 1496ba41d..05cdc2293 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:weathered_limestone_bricks_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_stairs.json index cbf762b9e..65b44d72e 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:weathered_limestone_bricks_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json index c0833d7b8..6ece23c1a 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:weathered_limestone_bricks_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_slab.json index 99017c4c3..1471da269 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_slab.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_slab.json @@ -11,11 +11,5 @@ "result": { "item": "create:weathered_limestone_slab", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_stairs.json index f7353945c..07f3105ec 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_stairs.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_stairs.json @@ -13,11 +13,5 @@ "result": { "item": "create:weathered_limestone_stairs", "count": 4 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json index 239b0ac10..7810d9270 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json @@ -12,11 +12,5 @@ "result": { "item": "create:weathered_limestone_wall", "count": 6 - }, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/propeller.json b/src/main/resources/data/create/recipes/crafting_shaped/propeller.json index d9f00b1ef..a7393b082 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/propeller.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/propeller.json @@ -16,11 +16,5 @@ "result": { "item": "create:propeller", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json b/src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json index 0fc6a3a62..0b6d9874e 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json @@ -18,11 +18,5 @@ "result": { "item": "create:pulse_repeater", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json b/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json index bf1c6b139..755930779 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json @@ -18,11 +18,5 @@ "result": { "item": "create:redstone_bridge", "count": 2 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json b/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json index 087f52d14..0739ef907 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json @@ -22,11 +22,5 @@ "result": { "item": "create:redstone_latch", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematic_table.json b/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematic_table.json index 19ff98b57..b239d0cee 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematic_table.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematic_table.json @@ -16,11 +16,5 @@ "result": { "item": "create:schematic_table", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "schematics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematicannon.json b/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematicannon.json index 9fffacf1c..bb2a9b902 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematicannon.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/schematics/schematicannon.json @@ -25,11 +25,5 @@ "result": { "item": "create:schematicannon", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "schematics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/slot_cover.json b/src/main/resources/data/create/recipes/crafting_shaped/slot_cover.json index 12c8045f1..94556c3af 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/slot_cover.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/slot_cover.json @@ -11,11 +11,5 @@ "result": { "item": "create:slot_cover", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json b/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json index e8a404612..e9abe18ed 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json @@ -21,11 +21,5 @@ "result": { "item": "create:stockswitch", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json b/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json index eb470244a..9de7d5a25 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json @@ -19,11 +19,5 @@ "result": { "item": "create:toggle_latch", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/transposer.json b/src/main/resources/data/create/recipes/crafting_shaped/transposer.json index 1d3261ee7..d265f7749 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/transposer.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/transposer.json @@ -14,11 +14,5 @@ "result": { "item": "create:transposer", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/whisk.json b/src/main/resources/data/create/recipes/crafting_shaped/whisk.json index eb7ae0279..493e51410 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/whisk.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/whisk.json @@ -16,11 +16,5 @@ "result": { "item": "create:whisk", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/blueprint_and_quill.json b/src/main/resources/data/create/recipes/crafting_shapeless/blueprint_and_quill.json index b73a2c69e..5235a5dbd 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/blueprint_and_quill.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/blueprint_and_quill.json @@ -11,11 +11,5 @@ "result": { "item": "create:blueprint_and_quill", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "schematics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json b/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json index 1ae4faed0..725753091 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/cocoa_log.json @@ -11,11 +11,5 @@ "result": { "item": "create:cocoa_log", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/dough.json b/src/main/resources/data/create/recipes/crafting_shapeless/dough.json index c442e003b..07650e7d9 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/dough.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/dough.json @@ -11,11 +11,5 @@ "result": { "item": "create:dough", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/empty_blueprint.json b/src/main/resources/data/create/recipes/crafting_shapeless/empty_blueprint.json index 7eda78565..ccfdcbdea 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/empty_blueprint.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/empty_blueprint.json @@ -11,11 +11,5 @@ "result": { "item": "create:empty_blueprint", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "schematics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json b/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json index c4b7df012..bfc99fe56 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json @@ -8,11 +8,5 @@ "result": { "item": "create:extractor", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/gearbox.json b/src/main/resources/data/create/recipes/crafting_shapeless/gearbox.json index 643879ae7..f8e94f151 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/gearbox.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/gearbox.json @@ -8,11 +8,5 @@ "result": { "item": "create:gearbox", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json b/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json index 2d24ea0aa..f87471657 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json @@ -11,11 +11,5 @@ "result": { "item": "create:linked_extractor", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json index 8e5a2f3db..6f652f61d 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json @@ -11,11 +11,5 @@ "result": { "item": "create:linked_transposer", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/red_sand_paper.json b/src/main/resources/data/create/recipes/crafting_shapeless/red_sand_paper.json index 17a61770f..db4c142a2 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/red_sand_paper.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/red_sand_paper.json @@ -11,11 +11,5 @@ "result": { "item": "create:red_sand_paper", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/rose_quartz.json b/src/main/resources/data/create/recipes/crafting_shapeless/rose_quartz.json index 7a7645554..ca8c4b2d7 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/rose_quartz.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/rose_quartz.json @@ -32,11 +32,5 @@ "result": { "item": "create:rose_quartz", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/sand_paper.json b/src/main/resources/data/create/recipes/crafting_shapeless/sand_paper.json index 29afa6913..b4ab613cb 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/sand_paper.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/sand_paper.json @@ -11,11 +11,5 @@ "result": { "item": "create:sand_paper", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/slime_ball.json b/src/main/resources/data/create/recipes/crafting_shapeless/slime_ball.json index 2e8885ce7..c1e999105 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/slime_ball.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/slime_ball.json @@ -11,11 +11,5 @@ "result": { "item": "minecraft:slime_ball", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json index d97e61b7c..bcd34872d 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json @@ -8,11 +8,5 @@ "result": { "item": "create:speed_gauge", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json index 43c0c6b34..b92f1a845 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json @@ -8,11 +8,5 @@ "result": { "item": "create:stress_gauge", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json index 7973191ec..5b761a373 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json @@ -8,11 +8,5 @@ "result": { "item": "create:translation_chassis", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json index 0169469a4..6746988b9 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json @@ -8,11 +8,5 @@ "result": { "item": "create:translation_chassis_secondary", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json index 79d9a5d30..a2ed2f45f 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json @@ -8,11 +8,5 @@ "result": { "item": "create:transposer", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "logistics" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/tree_fertilizer.json b/src/main/resources/data/create/recipes/crafting_shapeless/tree_fertilizer.json index 0b1319537..25bae8b68 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/tree_fertilizer.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/tree_fertilizer.json @@ -31,11 +31,5 @@ "result": { "item": "create:tree_fertilizer", "count": 2 - }, - "conditions": [ - { - "type": "create:module", - "module": "curiosities" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/vertical_gearbox.json b/src/main/resources/data/create/recipes/crafting_shapeless/vertical_gearbox.json index 78b60747b..6521360af 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/vertical_gearbox.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/vertical_gearbox.json @@ -8,11 +8,5 @@ "result": { "item": "create:vertical_gearbox", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/crushing_wheel.json b/src/main/resources/data/create/recipes/mechanical_crafting/crushing_wheel.json index aaaea0924..77eed4b59 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/crushing_wheel.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/crushing_wheel.json @@ -24,11 +24,5 @@ "result": { "item": "create:crushing_wheel", "count": 2 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/flywheel.json b/src/main/resources/data/create/recipes/mechanical_crafting/flywheel.json index f373fd095..982c55d8d 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/flywheel.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/flywheel.json @@ -24,11 +24,5 @@ "result": { "item": "create:flywheel", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/furnace_engine.json b/src/main/resources/data/create/recipes/mechanical_crafting/furnace_engine.json index c275772e3..cb5e2263b 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/furnace_engine.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/furnace_engine.json @@ -25,11 +25,5 @@ "result": { "item": "create:furnace_engine", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/integrated_circuit.json b/src/main/resources/data/create/recipes/mechanical_crafting/integrated_circuit.json index 65d515d72..753fbcfe6 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/integrated_circuit.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/integrated_circuit.json @@ -23,11 +23,5 @@ "result": { "item": "create:integrated_circuit", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json index bca503bbd..34fb3098c 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_axe.json @@ -23,11 +23,5 @@ "result": { "item": "create:rose_quartz_axe", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json index f1822388b..3d84a2bbb 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_pickaxe.json @@ -23,11 +23,5 @@ "result": { "item": "create:rose_quartz_pickaxe", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json index 7b7a00a8f..1ff8aadf3 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_shovel.json @@ -23,11 +23,5 @@ "result": { "item": "create:rose_quartz_shovel", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json index dbbc82bf8..c8403b1da 100644 --- a/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json +++ b/src/main/resources/data/create/recipes/mechanical_crafting/rose_quartz_sword.json @@ -23,11 +23,5 @@ "result": { "item": "create:rose_quartz_sword", "count": 1 - }, - "conditions": [ - { - "type": "create:module", - "module": "contraptions" - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/diorite.json b/src/main/resources/data/create/recipes/smelting/diorite.json index 9fd75e943..69293fd2d 100644 --- a/src/main/resources/data/create/recipes/smelting/diorite.json +++ b/src/main/resources/data/create/recipes/smelting/diorite.json @@ -5,11 +5,5 @@ }, "result": "create:dolomite", "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass.json b/src/main/resources/data/create/recipes/smelting/framed_glass.json index 409c71227..a503aa5f1 100644 --- a/src/main/resources/data/create/recipes/smelting/framed_glass.json +++ b/src/main/resources/data/create/recipes/smelting/framed_glass.json @@ -4,11 +4,5 @@ "item": "create:framed_glass" }, "result": "minecraft:glass", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json index f1fff7a63..6a2246ca2 100644 --- a/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "create:framed_glass_pane" }, "result": "minecraft:glass_pane", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/granite.json b/src/main/resources/data/create/recipes/smelting/granite.json index c77a51a2c..ce234c181 100644 --- a/src/main/resources/data/create/recipes/smelting/granite.json +++ b/src/main/resources/data/create/recipes/smelting/granite.json @@ -5,11 +5,5 @@ }, "result": "create:gabbro", "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json index 863c9fdc3..5df3e2235 100644 --- a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json @@ -4,11 +4,5 @@ "item": "create:horizontal_framed_glass" }, "result": "minecraft:glass", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json index 471c8fe8f..d69f7b19b 100644 --- a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "create:horizontal_framed_glass_pane" }, "result": "minecraft:glass_pane", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/limesand.json b/src/main/resources/data/create/recipes/smelting/limesand.json index fe20e0a03..eee8c9c3c 100644 --- a/src/main/resources/data/create/recipes/smelting/limesand.json +++ b/src/main/resources/data/create/recipes/smelting/limesand.json @@ -5,11 +5,5 @@ }, "result": "create:limestone", "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/soul_sand.json b/src/main/resources/data/create/recipes/smelting/soul_sand.json index b320f7c74..9ac77427b 100644 --- a/src/main/resources/data/create/recipes/smelting/soul_sand.json +++ b/src/main/resources/data/create/recipes/smelting/soul_sand.json @@ -5,11 +5,5 @@ }, "result": "create:scoria", "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass.json b/src/main/resources/data/create/recipes/smelting/tiled_glass.json index 0b08b9391..5fdc2abae 100644 --- a/src/main/resources/data/create/recipes/smelting/tiled_glass.json +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass.json @@ -4,11 +4,5 @@ "item": "create:tiled_glass" }, "result": "minecraft:glass", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json index 49af92059..3b4b8ced7 100644 --- a/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json @@ -4,11 +4,5 @@ "item": "create:tiled_glass_pane" }, "result": "minecraft:glass_pane", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json index 506467d55..488e4cb14 100644 --- a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json @@ -4,11 +4,5 @@ "item": "create:vertical_framed_glass" }, "result": "minecraft:glass", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json index 87ebc95ca..e159d3dcb 100644 --- a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "create:vertical_framed_glass_pane" }, "result": "minecraft:glass_pane", - "cookingtime": 100, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "cookingtime": 100 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/andesite_bricks.json b/src/main/resources/data/create/recipes/stonecutting/andesite_bricks.json index 80db9ff61..f379c7df2 100644 --- a/src/main/resources/data/create/recipes/stonecutting/andesite_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/andesite_bricks.json @@ -4,11 +4,5 @@ "item": "minecraft:andesite" }, "result": "create:andesite_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json b/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json index 72fb3fb64..675d0e4b2 100644 --- a/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/andesite_layers.json @@ -4,11 +4,5 @@ "item": "minecraft:andesite" }, "result": "create:andesite_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json index d0b078a92..19e0ca529 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json index 7cde357fb..d770d26bf 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json index 69926c8ee..1fbab0565 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria_bricks" }, "result": "create:dark_scoria_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json index 4862a420d..1836b5c0b 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json index 03b579d40..6539354e5 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria_bricks" }, "result": "create:dark_scoria_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json index 610c61775..866cd17bb 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json index 0a1126ff7..cfba28e9f 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria_bricks" }, "result": "create:dark_scoria_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json index 6a9b64194..2d5e071f7 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_tiles", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json index e1156f98d..d869aa06f 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_tiles_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json index 2eaa92862..3b68f5545 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria_tiles" }, "result": "create:dark_scoria_tiles_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json index 9848e6171..1fff12615 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria" }, "result": "create:dark_scoria_tiles_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json index 4e6f42405..a28c68dc9 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json @@ -4,11 +4,5 @@ "item": "create:dark_scoria_tiles" }, "result": "create:dark_scoria_tiles_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/diorite_bricks.json b/src/main/resources/data/create/recipes/stonecutting/diorite_bricks.json index 4b20ea157..d7d98e4bd 100644 --- a/src/main/resources/data/create/recipes/stonecutting/diorite_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/diorite_bricks.json @@ -4,11 +4,5 @@ "item": "minecraft:diorite" }, "result": "create:diorite_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json b/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json index 85f348298..a291f4868 100644 --- a/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/diorite_layers.json @@ -4,11 +4,5 @@ "item": "minecraft:diorite" }, "result": "create:diorite_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_bricks.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_bricks.json index 6e47e2efe..27293be51 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_bricks.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json index fd3dca791..34559646f 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_layers.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_pillar.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_pillar.json index 010a70762..9dd46828a 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_pillar.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_pillar.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_pillar", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_slab.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_slab.json index 859c2ec62..a7e7cffff 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_slab.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_stairs.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_stairs.json index af4fa9314..06a377fc5 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_stairs.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dolomite_wall.json b/src/main/resources/data/create/recipes/stonecutting/dolomite_wall.json index e9682fb2f..90e9e7d03 100644 --- a/src/main/resources/data/create/recipes/stonecutting/dolomite_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/dolomite_wall.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:dolomite_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json index e9e589b69..71a180a11 100644 --- a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json @@ -4,11 +4,5 @@ "item": "minecraft:glass" }, "result": "create:framed_glass", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json index 940f6d18c..fff6f66a5 100644 --- a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "minecraft:glass_pane" }, "result": "create:framed_glass_pane", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks.json index f39781127..db7afd4fd 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs.json index 8c4ad039b..b2d4d0fe7 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs2.json index 48ef4d277..c333f57d2 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs2.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_stairs2.json @@ -4,11 +4,5 @@ "item": "create:gabbro_bricks" }, "result": "create:gabbro_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall.json index 7fda8161a..d6ceb6742 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall2.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall2.json index 61541d0ea..faa20c23d 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall2.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_bricks_wall2.json @@ -4,11 +4,5 @@ "item": "create:gabbro_bricks" }, "result": "create:gabbro_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json index 0deb2d2e8..055513fb1 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_layers.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_slab.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_slab.json index 8ca870eac..d4c0906fa 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_slab.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_stairs.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_stairs.json index 7889077be..377c5c53a 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_stairs.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/gabbro_wall.json b/src/main/resources/data/create/recipes/stonecutting/gabbro_wall.json index 1be824d02..be9520329 100644 --- a/src/main/resources/data/create/recipes/stonecutting/gabbro_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/gabbro_wall.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:gabbro_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/granite_bricks.json b/src/main/resources/data/create/recipes/stonecutting/granite_bricks.json index 904852a85..737c1061e 100644 --- a/src/main/resources/data/create/recipes/stonecutting/granite_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/granite_bricks.json @@ -4,11 +4,5 @@ "item": "minecraft:granite" }, "result": "create:granite_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/granite_layers.json b/src/main/resources/data/create/recipes/stonecutting/granite_layers.json index ab8911072..df2f47e59 100644 --- a/src/main/resources/data/create/recipes/stonecutting/granite_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/granite_layers.json @@ -4,11 +4,5 @@ "item": "minecraft:granite" }, "result": "create:granite_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json index ca088b488..da0cf5757 100644 --- a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json @@ -4,11 +4,5 @@ "item": "minecraft:glass" }, "result": "create:horizontal_framed_glass", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json index bace23148..f0abd78de 100644 --- a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "minecraft:glass_pane" }, "result": "create:horizontal_framed_glass_pane", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab.json b/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab.json index a36e2d6a4..88c24028f 100644 --- a/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:indented_gabbro_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab2.json b/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab2.json index 0797c51bd..9349e2cf8 100644 --- a/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/indented_gabbro_slab2.json @@ -4,11 +4,5 @@ "item": "create:polished_gabbro" }, "result": "create:indented_gabbro_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks.json index 1913aa650..abb1d975c 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab.json index d76181836..cc8a36be9 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab2.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab2.json index a84ede1f5..52e335b87 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_slab2.json @@ -4,11 +4,5 @@ "item": "create:limestone_bricks" }, "result": "create:limestone_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs.json index ade4592a5..43ff891ec 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs2.json index 50f1248dc..2329b41d0 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs2.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_stairs2.json @@ -4,11 +4,5 @@ "item": "create:limestone_bricks" }, "result": "create:limestone_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall.json index dd3f33c45..580114710 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall2.json b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall2.json index 9b74119b4..20f0a3a74 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall2.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_bricks_wall2.json @@ -4,11 +4,5 @@ "item": "create:limestone_bricks" }, "result": "create:limestone_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json b/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json index 474cda5e5..c90328bda 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_layers.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_pillar.json b/src/main/resources/data/create/recipes/stonecutting/limestone_pillar.json index cffee967a..b1bb3e877 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_pillar.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_pillar.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_pillar", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_slab.json b/src/main/resources/data/create/recipes/stonecutting/limestone_slab.json index 82af126ab..0939dfe83 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_slab.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_stairs.json b/src/main/resources/data/create/recipes/stonecutting/limestone_stairs.json index 8ea3649bd..539b2ab0a 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_stairs.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/limestone_wall.json b/src/main/resources/data/create/recipes/stonecutting/limestone_wall.json index 671c46050..a8f315854 100644 --- a/src/main/resources/data/create/recipes/stonecutting/limestone_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/limestone_wall.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:limestone_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/mossy_gabbro_bricks.json b/src/main/resources/data/create/recipes/stonecutting/mossy_gabbro_bricks.json index b84391746..252b3561d 100644 --- a/src/main/resources/data/create/recipes/stonecutting/mossy_gabbro_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/mossy_gabbro_bricks.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:mossy_gabbro_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks.json b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks.json index 821efed4c..a08e43841 100644 --- a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:paved_gabbro_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab.json b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab.json index 6f1d828c7..0d3d2fbbb 100644 --- a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:paved_gabbro_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab2.json b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab2.json index ffe253c18..5e34b24d1 100644 --- a/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/paved_gabbro_bricks_slab2.json @@ -4,11 +4,5 @@ "item": "create:paved_gabbro_bricks" }, "result": "create:paved_gabbro_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_dolomite.json b/src/main/resources/data/create/recipes/stonecutting/polished_dolomite.json index 2bb0d6d76..833af3e91 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_dolomite.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_dolomite.json @@ -4,11 +4,5 @@ "item": "create:dolomite" }, "result": "create:polished_dolomite", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_gabbro.json b/src/main/resources/data/create/recipes/stonecutting/polished_gabbro.json index 0211c1875..54edb803f 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_gabbro.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_gabbro.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:polished_gabbro", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_limestone.json b/src/main/resources/data/create/recipes/stonecutting/polished_limestone.json index 450e18058..e5ac1e17a 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_limestone.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_limestone.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:polished_limestone", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab.json b/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab.json index cbd0fe2b8..1f7529ad7 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab.json @@ -4,11 +4,5 @@ "item": "create:limestone" }, "result": "create:polished_limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab2.json b/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab2.json index 5b750f5f7..d5b582806 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_limestone_slab2.json @@ -4,11 +4,5 @@ "item": "create:polished_limestone" }, "result": "create:polished_limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json index d585a93eb..b8e1989cd 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:polished_scoria", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json index 97ccb2548..cc58b0363 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:polished_scoria_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json index 9faa0616f..36f392063 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json @@ -4,11 +4,5 @@ "item": "create:polished_scoria" }, "result": "create:polished_scoria_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone.json b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone.json index 35531cd6e..ec13bc0d2 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:polished_weathered_limestone", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab.json b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab.json index 087f822cf..70fd6ad0c 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:polished_weathered_limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab2.json b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab2.json index 194f51144..07418cd84 100644 --- a/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/polished_weathered_limestone_slab2.json @@ -4,11 +4,5 @@ "item": "create:polished_weathered_limestone" }, "result": "create:polished_weathered_limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json b/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json index be134be29..358295d78 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json b/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json index 2cb68d07e..e53ca0e4b 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json b/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json index 6133b32b6..4e25cf1d8 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_pillar", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json b/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json index 56d131dd6..41ff901d9 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json b/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json index 654a2d06e..88fbc2311 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json b/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json index 89cc1f521..496120d7b 100644 --- a/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json @@ -4,11 +4,5 @@ "item": "create:scoria" }, "result": "create:scoria_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/slightly_mossy_gabbro_bricks.json b/src/main/resources/data/create/recipes/stonecutting/slightly_mossy_gabbro_bricks.json index aa830b64d..2a9b1dea7 100644 --- a/src/main/resources/data/create/recipes/stonecutting/slightly_mossy_gabbro_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/slightly_mossy_gabbro_bricks.json @@ -4,11 +4,5 @@ "item": "create:gabbro" }, "result": "create:slightly_mossy_gabbro_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json b/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json index 23494d70d..66d927acb 100644 --- a/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json +++ b/src/main/resources/data/create/recipes/stonecutting/tiled_glass.json @@ -4,11 +4,5 @@ "item": "minecraft:glass" }, "result": "create:tiled_glass", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json index 867a129fb..0afb55abf 100644 --- a/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json +++ b/src/main/resources/data/create/recipes/stonecutting/tiled_glass_pane.json @@ -4,11 +4,5 @@ "item": "minecraft:glass_pane" }, "result": "create:tiled_glass_pane", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json index d1c6ed910..0cfca3a5a 100644 --- a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json @@ -4,11 +4,5 @@ "item": "minecraft:glass" }, "result": "create:vertical_framed_glass", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json index c8ba1ca6e..ffbc1fdb2 100644 --- a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json @@ -4,11 +4,5 @@ "item": "minecraft:glass_pane" }, "result": "create:vertical_framed_glass_pane", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks.json index df67f15df..ab6c5c16e 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_bricks", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab.json index 54a1c4e88..1e25db8ce 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab2.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab2.json index eae5eb282..2019ce0bf 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab2.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_slab2.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone_bricks" }, "result": "create:weathered_limestone_bricks_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs.json index b6a780756..030f1de39 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs2.json index 6025a2f10..a3f51b00e 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs2.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_stairs2.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone_bricks" }, "result": "create:weathered_limestone_bricks_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall.json index 1fbe5083e..f04c6673c 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall2.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall2.json index 35922fbf7..b8d923438 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall2.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_bricks_wall2.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone_bricks" }, "result": "create:weathered_limestone_bricks_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json index 598fcdd3f..54b917f78 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_layers.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_layers", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_pillar.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_pillar.json index 87c3ca090..175624491 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_pillar.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_pillar.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_pillar", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_slab.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_slab.json index 549e00256..6c84af7eb 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_slab.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_slab.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_slab", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_stairs.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_stairs.json index 69fe7a0fb..ca8db51c6 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_stairs.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_stairs.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_stairs", - "count": 1, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 1 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_wall.json b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_wall.json index 9014d9ca1..4115bc9bd 100644 --- a/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_wall.json +++ b/src/main/resources/data/create/recipes/stonecutting/weathered_limestone_wall.json @@ -4,11 +4,5 @@ "item": "create:weathered_limestone" }, "result": "create:weathered_limestone_wall", - "count": 2, - "conditions": [ - { - "type": "create:module", - "module": "palettes" - } - ] + "count": 2 } \ No newline at end of file