From 088da50702191bc1babf4677f37658a417281433 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Sun, 29 Oct 2023 09:15:45 +0100 Subject: [PATCH] recipes 2 --- .../9047e4e94996e73e9dfde3738763637fb609e07e | 4 +- .../data/create/tags/blocks/casing.json | 6 - .../create/tags/blocks/fan_transparent.json | 6 - .../data/create/tags/blocks/safe_nbt.json | 10 - .../create/tags/blocks/wrench_pickup.json | 6 - .../data/create/tags/items/casing.json | 6 - .../tags/items/contraption_controlled.json | 6 - .../data/create/tags/items/create_ingots.json | 7 - .../data/forge/tags/blocks/concrete.json | 5 - .../data/forge/tags/blocks/factory_floor.json | 5 - .../forge/tags/blocks/rebar_concrete.json | 5 - .../forge/tags/blocks/storage_blocks.json | 8 - .../tags/blocks/storage_blocks/aluminum.json | 5 - .../tags/blocks/storage_blocks/cast_iron.json | 5 - .../tags/blocks/storage_blocks/steel.json | 5 - .../data/forge/tags/items/buckets/diesel.json | 5 - .../forge/tags/items/buckets/gasoline.json | 6 - .../forge/tags/items/buckets/kerosene.json | 5 - .../data/forge/tags/items/buckets/napalm.json | 5 - .../forge/tags/items/buckets/naphtha.json | 5 - .../forge/tags/items/buckets/plastic.json | 5 - .../data/forge/tags/items/concrete.json | 5 - .../forge/tags/items/dusts/coal_coke.json | 5 - .../data/forge/tags/items/factory_floor.json | 5 - .../forge/tags/items/ingots/aluminum.json | 5 - .../forge/tags/items/ingots/cast_iron.json | 5 - .../data/forge/tags/items/ingots/steel.json | 5 - .../data/forge/tags/items/rebar_concrete.json | 5 - .../data/forge/tags/items/storage_blocks.json | 8 - .../tags/items/storage_blocks/aluminum.json | 5 - .../tags/items/storage_blocks/cast_iron.json | 5 - .../tags/items/storage_blocks/steel.json | 5 - .../tags/blocks/azalea_root_replaceable.json | 5 - .../tags/blocks/beacon_base_blocks.json | 7 - .../data/minecraft/tags/blocks/climbable.json | 8 - .../data/minecraft/tags/blocks/doors.json | 6 - .../blocks/dripstone_replaceable_blocks.json | 5 - .../tags/blocks/lush_ground_replaceable.json | 5 - .../minecraft/tags/blocks/mineable/axe.json | 20 -- .../tags/blocks/mineable/pickaxe.json | 174 ------------------ .../tags/blocks/moss_replaceable.json | 5 - .../tags/blocks/needs_diamond_tool.json | 7 - .../tags/blocks/needs_iron_tool.json | 9 - .../tags/blocks/needs_stone_tool.json | 77 -------- .../data/minecraft/tags/blocks/slabs.json | 8 - .../data/minecraft/tags/blocks/stairs.json | 27 --- .../data/minecraft/tags/blocks/walls.json | 46 ----- .../minecraft/tags/blocks/wooden_doors.json | 6 - .../data/minecraft/tags/items/doors.json | 6 - .../data/minecraft/tags/items/slabs.json | 8 - .../data/minecraft/tags/items/stairs.json | 8 - .../data/minecraft/tags/items/walls.json | 8 - .../quark/tags/blocks/non_double_door.json | 6 - .../mixins/FluidPropagatorMixin.java | 5 +- 54 files changed, 3 insertions(+), 631 deletions(-) delete mode 100644 src/generated/resources/data/create/tags/blocks/casing.json delete mode 100644 src/generated/resources/data/create/tags/blocks/fan_transparent.json delete mode 100644 src/generated/resources/data/create/tags/blocks/safe_nbt.json delete mode 100644 src/generated/resources/data/create/tags/blocks/wrench_pickup.json delete mode 100644 src/generated/resources/data/create/tags/items/casing.json delete mode 100644 src/generated/resources/data/create/tags/items/contraption_controlled.json delete mode 100644 src/generated/resources/data/create/tags/items/create_ingots.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/concrete.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/factory_floor.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/rebar_concrete.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/diesel.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/gasoline.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/kerosene.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/napalm.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/naphtha.json delete mode 100644 src/generated/resources/data/forge/tags/items/buckets/plastic.json delete mode 100644 src/generated/resources/data/forge/tags/items/concrete.json delete mode 100644 src/generated/resources/data/forge/tags/items/dusts/coal_coke.json delete mode 100644 src/generated/resources/data/forge/tags/items/factory_floor.json delete mode 100644 src/generated/resources/data/forge/tags/items/ingots/aluminum.json delete mode 100644 src/generated/resources/data/forge/tags/items/ingots/cast_iron.json delete mode 100644 src/generated/resources/data/forge/tags/items/ingots/steel.json delete mode 100644 src/generated/resources/data/forge/tags/items/rebar_concrete.json delete mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks.json delete mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json delete mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json delete mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/steel.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/climbable.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/doors.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/slabs.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/stairs.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/walls.json delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json delete mode 100644 src/generated/resources/data/minecraft/tags/items/doors.json delete mode 100644 src/generated/resources/data/minecraft/tags/items/slabs.json delete mode 100644 src/generated/resources/data/minecraft/tags/items/stairs.json delete mode 100644 src/generated/resources/data/minecraft/tags/items/walls.json delete mode 100644 src/generated/resources/data/quark/tags/blocks/non_double_door.json diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index df9d021c..7506fd14 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-10-28T22:55:49.0556149 Create: The Factory Must Grow's lang merger -d84c3b546cddf6b8cc0371b842a15cf198420d07 assets/createindustry/lang/en_us.json +// 1.19.2 2023-10-28T23:43:34.6950741 Create: The Factory Must Grow's lang merger +43b115bf54cb42493e329667e1ba2f20f7a4a23b assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/data/create/tags/blocks/casing.json b/src/generated/resources/data/create/tags/blocks/casing.json deleted file mode 100644 index 7b59573a..00000000 --- a/src/generated/resources/data/create/tags/blocks/casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:steel_casing", - "createindustry:heavy_machinery_casing" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/fan_transparent.json b/src/generated/resources/data/create/tags/blocks/fan_transparent.json deleted file mode 100644 index 044fe203..00000000 --- a/src/generated/resources/data/create/tags/blocks/fan_transparent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:steel_bars", - "createindustry:aluminum_bars" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/safe_nbt.json b/src/generated/resources/data/create/tags/blocks/safe_nbt.json deleted file mode 100644 index 4cdadd18..00000000 --- a/src/generated/resources/data/create/tags/blocks/safe_nbt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "values": [ - "createindustry:gasoline_engine", - "createindustry:gasoline_engine_back", - "createindustry:lpg_engine", - "createindustry:lpg_engine_back", - "createindustry:turbine_engine", - "createindustry:turbine_engine_back" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/wrench_pickup.json b/src/generated/resources/data/create/tags/blocks/wrench_pickup.json deleted file mode 100644 index 044fe203..00000000 --- a/src/generated/resources/data/create/tags/blocks/wrench_pickup.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:steel_bars", - "createindustry:aluminum_bars" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/casing.json b/src/generated/resources/data/create/tags/items/casing.json deleted file mode 100644 index 7b59573a..00000000 --- a/src/generated/resources/data/create/tags/items/casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:steel_casing", - "createindustry:heavy_machinery_casing" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/contraption_controlled.json b/src/generated/resources/data/create/tags/items/contraption_controlled.json deleted file mode 100644 index 1b8a22a4..00000000 --- a/src/generated/resources/data/create/tags/items/contraption_controlled.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:heavy_casing_door", - "createindustry:steel_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/create_ingots.json b/src/generated/resources/data/create/tags/items/create_ingots.json deleted file mode 100644 index cbb84a07..00000000 --- a/src/generated/resources/data/create/tags/items/create_ingots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "createindustry:steel_ingot", - "createindustry:cast_iron_ingot", - "createindustry:aluminum_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/concrete.json b/src/generated/resources/data/forge/tags/blocks/concrete.json deleted file mode 100644 index e10ed7fa..00000000 --- a/src/generated/resources/data/forge/tags/blocks/concrete.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/factory_floor.json b/src/generated/resources/data/forge/tags/blocks/factory_floor.json deleted file mode 100644 index 58ad315a..00000000 --- a/src/generated/resources/data/forge/tags/blocks/factory_floor.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:factory_floor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json b/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json deleted file mode 100644 index f167e31a..00000000 --- a/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:rebar_concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index 381b1a40..00000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:steel_block", - "createindustry:cast_iron_block", - "createindustry:aluminum_block", - "createindustry:coal_coke_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json deleted file mode 100644 index f3213e55..00000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:aluminum_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json deleted file mode 100644 index d078fcf0..00000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:cast_iron_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json deleted file mode 100644 index 7e4c7d8c..00000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:steel_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/diesel.json b/src/generated/resources/data/forge/tags/items/buckets/diesel.json deleted file mode 100644 index b2c606d8..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/diesel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:diesel_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/gasoline.json b/src/generated/resources/data/forge/tags/items/buckets/gasoline.json deleted file mode 100644 index 12c33b57..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/gasoline.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:crude_oil_fluid_bucket", - "createindustry:gasoline_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/kerosene.json b/src/generated/resources/data/forge/tags/items/buckets/kerosene.json deleted file mode 100644 index 17d4784d..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/kerosene.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:kerosene_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/napalm.json b/src/generated/resources/data/forge/tags/items/buckets/napalm.json deleted file mode 100644 index f71d64b7..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/napalm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:napalm_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/naphtha.json b/src/generated/resources/data/forge/tags/items/buckets/naphtha.json deleted file mode 100644 index 7e9a0c75..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/naphtha.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:naphtha_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/buckets/plastic.json b/src/generated/resources/data/forge/tags/items/buckets/plastic.json deleted file mode 100644 index 10c495b7..00000000 --- a/src/generated/resources/data/forge/tags/items/buckets/plastic.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:liquid_plastic_bucket" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/concrete.json b/src/generated/resources/data/forge/tags/items/concrete.json deleted file mode 100644 index e10ed7fa..00000000 --- a/src/generated/resources/data/forge/tags/items/concrete.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json b/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json deleted file mode 100644 index 936cd252..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:coal_coke_dust" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/factory_floor.json b/src/generated/resources/data/forge/tags/items/factory_floor.json deleted file mode 100644 index 58ad315a..00000000 --- a/src/generated/resources/data/forge/tags/items/factory_floor.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:factory_floor" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/aluminum.json b/src/generated/resources/data/forge/tags/items/ingots/aluminum.json deleted file mode 100644 index fb473e6e..00000000 --- a/src/generated/resources/data/forge/tags/items/ingots/aluminum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:aluminum_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/cast_iron.json b/src/generated/resources/data/forge/tags/items/ingots/cast_iron.json deleted file mode 100644 index b408b6b7..00000000 --- a/src/generated/resources/data/forge/tags/items/ingots/cast_iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:cast_iron_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/steel.json b/src/generated/resources/data/forge/tags/items/ingots/steel.json deleted file mode 100644 index c32d8829..00000000 --- a/src/generated/resources/data/forge/tags/items/ingots/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:steel_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/rebar_concrete.json b/src/generated/resources/data/forge/tags/items/rebar_concrete.json deleted file mode 100644 index f167e31a..00000000 --- a/src/generated/resources/data/forge/tags/items/rebar_concrete.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:rebar_concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index 381b1a40..00000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:steel_block", - "createindustry:cast_iron_block", - "createindustry:aluminum_block", - "createindustry:coal_coke_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json b/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json deleted file mode 100644 index f3213e55..00000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:aluminum_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json b/src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json deleted file mode 100644 index d078fcf0..00000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:cast_iron_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json deleted file mode 100644 index 7e4c7d8c..00000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:steel_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json deleted file mode 100644 index da465a7a..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:bauxite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json deleted file mode 100644 index 13498519..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "createindustry:steel_block", - "createindustry:cast_iron_block", - "createindustry:aluminum_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/climbable.json b/src/generated/resources/data/minecraft/tags/blocks/climbable.json deleted file mode 100644 index 5ea52493..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/climbable.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:steel_scaffolding", - "createindustry:aluminum_scaffolding", - "createindustry:steel_ladder", - "createindustry:aluminum_ladder" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json deleted file mode 100644 index 1b8a22a4..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/doors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:heavy_casing_door", - "createindustry:steel_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json deleted file mode 100644 index da465a7a..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:bauxite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json deleted file mode 100644 index da465a7a..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:bauxite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index efb49529..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "createindustry:steel_casing", - "createindustry:heavy_machinery_casing", - "createindustry:steel_flywheel", - "createindustry:aluminum_flywheel", - "createindustry:cast_iron_flywheel", - "createindustry:formwork_block", - "createindustry:rebar_formwork_block", - "createindustry:cast_iron_distillation_output", - "createindustry:steel_distillation_output", - "createindustry:machine_input", - "createindustry:pumpjack_crank", - "createindustry:copper_encased_steel_pipe", - "createindustry:copper_encased_cast_iron_pipe", - "createindustry:copper_encased_brass_pipe", - "createindustry:copper_encased_plastic_pipe", - "createindustry:copper_encased_aluminum_pipe" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index eb6b7357..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "values": [ - "createindustry:napalm_bomb", - "createindustry:fossilstone", - "createindustry:oil_deposit", - "createindustry:steel_casing", - "createindustry:heavy_machinery_casing", - "createindustry:steel_truss", - "createindustry:aluminum_truss", - "createindustry:caution_block", - "createindustry:red_caution_block", - "createindustry:steel_scaffolding", - "createindustry:aluminum_scaffolding", - "createindustry:steel_bars", - "createindustry:aluminum_bars", - "createindustry:steel_ladder", - "createindustry:aluminum_ladder", - "createindustry:steel_flywheel", - "createindustry:aluminum_flywheel", - "createindustry:cast_iron_flywheel", - "createindustry:factory_floor_stairs", - "createindustry:factory_floor", - "createindustry:factory_floor_slab", - "createindustry:steel_fluid_tank", - "createindustry:cast_iron_distillation_output", - "createindustry:steel_distillation_output", - "createindustry:industrial_pipe", - "createindustry:machine_input", - "createindustry:pumpjack_crank", - "createindustry:fireproof_bricks", - "createindustry:fireproof_brick_reinforcement", - "createindustry:blast_furnace_output", - "createindustry:casting_basin", - "createindustry:casting_spout", - "createindustry:coke_oven", - "createindustry:air_intake", - "createindustry:steel_block", - "createindustry:cast_iron_block", - "createindustry:aluminum_block", - "createindustry:coal_coke_block", - "createindustry:steel_sheetmetal", - "createindustry:heavy_casing_door", - "createindustry:steel_door", - "createindustry:gasoline_engine", - "createindustry:gasoline_engine_back", - "createindustry:lpg_engine", - "createindustry:lpg_engine_back", - "createindustry:turbine_engine", - "createindustry:turbine_engine_back", - "createindustry:diesel_engine", - "createindustry:diesel_engine_expansion", - "createindustry:steel_pipe", - "createindustry:copper_encased_steel_pipe", - "createindustry:glass_steel_pipe", - "createindustry:steel_mechanical_pump", - "createindustry:steel_smart_fluid_pipe", - "createindustry:steel_fluid_valve", - "createindustry:cast_iron_pipe", - "createindustry:copper_encased_cast_iron_pipe", - "createindustry:glass_cast_iron_pipe", - "createindustry:cast_iron_mechanical_pump", - "createindustry:cast_iron_smart_fluid_pipe", - "createindustry:cast_iron_fluid_valve", - "createindustry:brass_pipe", - "createindustry:copper_encased_brass_pipe", - "createindustry:glass_brass_pipe", - "createindustry:brass_mechanical_pump", - "createindustry:brass_smart_fluid_pipe", - "createindustry:brass_fluid_valve", - "createindustry:plastic_pipe", - "createindustry:copper_encased_plastic_pipe", - "createindustry:glass_plastic_pipe", - "createindustry:plastic_mechanical_pump", - "createindustry:plastic_smart_fluid_pipe", - "createindustry:plastic_fluid_valve", - "createindustry:aluminum_pipe", - "createindustry:copper_encased_aluminum_pipe", - "createindustry:glass_aluminum_pipe", - "createindustry:aluminum_mechanical_pump", - "createindustry:aluminum_smart_fluid_pipe", - "createindustry:aluminum_fluid_valve", - "createindustry:black_concrete", - "createindustry:black_concrete_wall", - "createindustry:black_concrete_stairs", - "createindustry:black_concrete_slab", - "createindustry:white_concrete", - "createindustry:white_concrete_wall", - "createindustry:white_concrete_stairs", - "createindustry:white_concrete_slab", - "createindustry:blue_concrete", - "createindustry:blue_concrete_wall", - "createindustry:blue_concrete_stairs", - "createindustry:blue_concrete_slab", - "createindustry:light_blue_concrete", - "createindustry:light_blue_concrete_wall", - "createindustry:light_blue_concrete_stairs", - "createindustry:light_blue_concrete_slab", - "createindustry:red_concrete", - "createindustry:red_concrete_wall", - "createindustry:red_concrete_stairs", - "createindustry:red_concrete_slab", - "createindustry:green_concrete", - "createindustry:green_concrete_wall", - "createindustry:green_concrete_stairs", - "createindustry:green_concrete_slab", - "createindustry:lime_concrete", - "createindustry:lime_concrete_wall", - "createindustry:lime_concrete_stairs", - "createindustry:lime_concrete_slab", - "createindustry:pink_concrete", - "createindustry:pink_concrete_wall", - "createindustry:pink_concrete_stairs", - "createindustry:pink_concrete_slab", - "createindustry:magenta_concrete", - "createindustry:magenta_concrete_wall", - "createindustry:magenta_concrete_stairs", - "createindustry:magenta_concrete_slab", - "createindustry:yellow_concrete", - "createindustry:yellow_concrete_wall", - "createindustry:yellow_concrete_stairs", - "createindustry:yellow_concrete_slab", - "createindustry:gray_concrete", - "createindustry:gray_concrete_wall", - "createindustry:gray_concrete_stairs", - "createindustry:gray_concrete_slab", - "createindustry:light_gray_concrete", - "createindustry:light_gray_concrete_wall", - "createindustry:light_gray_concrete_stairs", - "createindustry:light_gray_concrete_slab", - "createindustry:brown_concrete", - "createindustry:brown_concrete_wall", - "createindustry:brown_concrete_stairs", - "createindustry:brown_concrete_slab", - "createindustry:cyan_concrete", - "createindustry:cyan_concrete_wall", - "createindustry:cyan_concrete_stairs", - "createindustry:cyan_concrete_slab", - "createindustry:purple_concrete", - "createindustry:purple_concrete_wall", - "createindustry:purple_concrete_stairs", - "createindustry:purple_concrete_slab", - "createindustry:orange_concrete", - "createindustry:orange_concrete_wall", - "createindustry:orange_concrete_stairs", - "createindustry:orange_concrete_slab", - "createindustry:concrete_wall", - "createindustry:concrete_stairs", - "createindustry:concrete", - "createindustry:concrete_slab", - "createindustry:rebar_concrete_wall", - "createindustry:rebar_concrete_stairs", - "createindustry:rebar_concrete", - "createindustry:rebar_concrete_slab", - "createindustry:bauxite", - "createindustry:cut_bauxite", - "createindustry:cut_bauxite_stairs", - "createindustry:cut_bauxite_slab", - "createindustry:cut_bauxite_wall", - "createindustry:polished_cut_bauxite", - "createindustry:polished_cut_bauxite_stairs", - "createindustry:polished_cut_bauxite_slab", - "createindustry:polished_cut_bauxite_wall", - "createindustry:cut_bauxite_bricks", - "createindustry:cut_bauxite_brick_stairs", - "createindustry:cut_bauxite_brick_slab", - "createindustry:cut_bauxite_brick_wall", - "createindustry:small_bauxite_bricks", - "createindustry:small_bauxite_brick_stairs", - "createindustry:small_bauxite_brick_slab", - "createindustry:small_bauxite_brick_wall", - "createindustry:layered_bauxite", - "createindustry:bauxite_pillar" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json deleted file mode 100644 index da465a7a..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "createindustry:bauxite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json deleted file mode 100644 index 4265bdc0..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "createindustry:rebar_concrete_wall", - "createindustry:rebar_concrete_stairs", - "createindustry:rebar_concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json deleted file mode 100644 index 99362b0b..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "createindustry:steel_block", - "createindustry:cast_iron_block", - "createindustry:aluminum_block", - "createindustry:steel_sheetmetal", - "createindustry:diesel_engine_expansion" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json deleted file mode 100644 index 021afb45..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "values": [ - "createindustry:factory_floor_stairs", - "createindustry:factory_floor", - "createindustry:factory_floor_slab", - "createindustry:coal_coke_block", - "createindustry:black_concrete", - "createindustry:black_concrete_wall", - "createindustry:black_concrete_stairs", - "createindustry:black_concrete_slab", - "createindustry:white_concrete", - "createindustry:white_concrete_wall", - "createindustry:white_concrete_stairs", - "createindustry:white_concrete_slab", - "createindustry:blue_concrete", - "createindustry:blue_concrete_wall", - "createindustry:blue_concrete_stairs", - "createindustry:blue_concrete_slab", - "createindustry:light_blue_concrete", - "createindustry:light_blue_concrete_wall", - "createindustry:light_blue_concrete_stairs", - "createindustry:light_blue_concrete_slab", - "createindustry:red_concrete", - "createindustry:red_concrete_wall", - "createindustry:red_concrete_stairs", - "createindustry:red_concrete_slab", - "createindustry:green_concrete", - "createindustry:green_concrete_wall", - "createindustry:green_concrete_stairs", - "createindustry:green_concrete_slab", - "createindustry:lime_concrete", - "createindustry:lime_concrete_wall", - "createindustry:lime_concrete_stairs", - "createindustry:lime_concrete_slab", - "createindustry:pink_concrete", - "createindustry:pink_concrete_wall", - "createindustry:pink_concrete_stairs", - "createindustry:pink_concrete_slab", - "createindustry:magenta_concrete", - "createindustry:magenta_concrete_wall", - "createindustry:magenta_concrete_stairs", - "createindustry:magenta_concrete_slab", - "createindustry:yellow_concrete", - "createindustry:yellow_concrete_wall", - "createindustry:yellow_concrete_stairs", - "createindustry:yellow_concrete_slab", - "createindustry:gray_concrete", - "createindustry:gray_concrete_wall", - "createindustry:gray_concrete_stairs", - "createindustry:gray_concrete_slab", - "createindustry:light_gray_concrete", - "createindustry:light_gray_concrete_wall", - "createindustry:light_gray_concrete_stairs", - "createindustry:light_gray_concrete_slab", - "createindustry:brown_concrete", - "createindustry:brown_concrete_wall", - "createindustry:brown_concrete_stairs", - "createindustry:brown_concrete_slab", - "createindustry:cyan_concrete", - "createindustry:cyan_concrete_wall", - "createindustry:cyan_concrete_stairs", - "createindustry:cyan_concrete_slab", - "createindustry:purple_concrete", - "createindustry:purple_concrete_wall", - "createindustry:purple_concrete_stairs", - "createindustry:purple_concrete_slab", - "createindustry:orange_concrete", - "createindustry:orange_concrete_wall", - "createindustry:orange_concrete_stairs", - "createindustry:orange_concrete_slab", - "createindustry:concrete_wall", - "createindustry:concrete_stairs", - "createindustry:concrete", - "createindustry:concrete_slab", - "createindustry:rebar_concrete_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json deleted file mode 100644 index e130b027..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:cut_bauxite_slab", - "createindustry:polished_cut_bauxite_slab", - "createindustry:cut_bauxite_brick_slab", - "createindustry:small_bauxite_brick_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json deleted file mode 100644 index 5fbca465..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "values": [ - "createindustry:factory_floor_stairs", - "createindustry:black_concrete_stairs", - "createindustry:white_concrete_stairs", - "createindustry:blue_concrete_stairs", - "createindustry:light_blue_concrete_stairs", - "createindustry:red_concrete_stairs", - "createindustry:green_concrete_stairs", - "createindustry:lime_concrete_stairs", - "createindustry:pink_concrete_stairs", - "createindustry:magenta_concrete_stairs", - "createindustry:yellow_concrete_stairs", - "createindustry:gray_concrete_stairs", - "createindustry:light_gray_concrete_stairs", - "createindustry:brown_concrete_stairs", - "createindustry:cyan_concrete_stairs", - "createindustry:purple_concrete_stairs", - "createindustry:orange_concrete_stairs", - "createindustry:concrete_stairs", - "createindustry:rebar_concrete_stairs", - "createindustry:cut_bauxite_stairs", - "createindustry:polished_cut_bauxite_stairs", - "createindustry:cut_bauxite_brick_stairs", - "createindustry:small_bauxite_brick_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json deleted file mode 100644 index 35b464d0..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "values": [ - "createindustry:factory_floor_slab", - "createindustry:fireproof_brick_reinforcement", - "createindustry:black_concrete_wall", - "createindustry:black_concrete_slab", - "createindustry:white_concrete_wall", - "createindustry:white_concrete_slab", - "createindustry:blue_concrete_wall", - "createindustry:blue_concrete_slab", - "createindustry:light_blue_concrete_wall", - "createindustry:light_blue_concrete_slab", - "createindustry:red_concrete_wall", - "createindustry:red_concrete_slab", - "createindustry:green_concrete_wall", - "createindustry:green_concrete_slab", - "createindustry:lime_concrete_wall", - "createindustry:lime_concrete_slab", - "createindustry:pink_concrete_wall", - "createindustry:pink_concrete_slab", - "createindustry:magenta_concrete_wall", - "createindustry:magenta_concrete_slab", - "createindustry:yellow_concrete_wall", - "createindustry:yellow_concrete_slab", - "createindustry:gray_concrete_wall", - "createindustry:gray_concrete_slab", - "createindustry:light_gray_concrete_wall", - "createindustry:light_gray_concrete_slab", - "createindustry:brown_concrete_wall", - "createindustry:brown_concrete_slab", - "createindustry:cyan_concrete_wall", - "createindustry:cyan_concrete_slab", - "createindustry:purple_concrete_wall", - "createindustry:purple_concrete_slab", - "createindustry:orange_concrete_wall", - "createindustry:orange_concrete_slab", - "createindustry:concrete_wall", - "createindustry:concrete_slab", - "createindustry:rebar_concrete_wall", - "createindustry:rebar_concrete_slab", - "createindustry:cut_bauxite_wall", - "createindustry:polished_cut_bauxite_wall", - "createindustry:cut_bauxite_brick_wall", - "createindustry:small_bauxite_brick_wall" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json deleted file mode 100644 index 1b8a22a4..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:heavy_casing_door", - "createindustry:steel_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json deleted file mode 100644 index 1b8a22a4..00000000 --- a/src/generated/resources/data/minecraft/tags/items/doors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:heavy_casing_door", - "createindustry:steel_door" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json deleted file mode 100644 index e130b027..00000000 --- a/src/generated/resources/data/minecraft/tags/items/slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:cut_bauxite_slab", - "createindustry:polished_cut_bauxite_slab", - "createindustry:cut_bauxite_brick_slab", - "createindustry:small_bauxite_brick_slab" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json deleted file mode 100644 index dfad8adb..00000000 --- a/src/generated/resources/data/minecraft/tags/items/stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:cut_bauxite_stairs", - "createindustry:polished_cut_bauxite_stairs", - "createindustry:cut_bauxite_brick_stairs", - "createindustry:small_bauxite_brick_stairs" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json deleted file mode 100644 index 1f230a14..00000000 --- a/src/generated/resources/data/minecraft/tags/items/walls.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "createindustry:cut_bauxite_wall", - "createindustry:polished_cut_bauxite_wall", - "createindustry:cut_bauxite_brick_wall", - "createindustry:small_bauxite_brick_wall" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/quark/tags/blocks/non_double_door.json b/src/generated/resources/data/quark/tags/blocks/non_double_door.json deleted file mode 100644 index 1b8a22a4..00000000 --- a/src/generated/resources/data/quark/tags/blocks/non_double_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "createindustry:heavy_casing_door", - "createindustry:steel_door" - ] -} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java b/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java index d9fe832e..5d68b16d 100644 --- a/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java +++ b/src/main/java/com/drmangotea/createindustry/mixins/FluidPropagatorMixin.java @@ -47,10 +47,7 @@ public class FluidPropagatorMixin { AllAdvancements.HONEY_DRAIN }; } - /** - * @author DrMangoTea - * @reason Custom Pipes - */ + @Overwrite( remap = false) public static void propagateChangedPipe(LevelAccessor world, BlockPos pipePos, BlockState pipeState) { List> frontier = new ArrayList<>();