diff --git a/gradle.properties b/gradle.properties index 995613f53b..69e716b7d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,9 +25,9 @@ registrate_version = MC1.21-1.3.0+62 # Dependency Versions flywheel_minecraft_version = 1.21.1 -flywheel_version = 1.0.0-beta-1 +flywheel_version = 1.0.0-beta-4 flywheel_version_range = [1.0.0-alpha,2.0) -ponder_version = 1.0.31 +ponder_version = 1.0.32 jei_minecraft_version = 1.21.1 jei_version = 19.21.0.247 curios_minecraft_version = 1.21.1 diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index c9f79e60bd..fdb7ea4cb7 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -2344,7 +2344,7 @@ "create.ponder.shaft.text_1": "˙ǝuıן ʇɥbıɐɹʇs ɐ uı uoıʇɐʇoɹ ʎɐןǝɹ ןןıʍ sʇɟɐɥS", "create.ponder.shaft_casing.header": "sʇɟɐɥS buısɐɔuƎ", "create.ponder.shaft_casing.text_1": "sʇɟɐɥS ǝʇɐɹoɔǝp oʇ pǝsn ǝq uɐɔ buısɐƆ ǝʇısǝpuⱯ ɹo ssɐɹᗺ", - "create.ponder.shared.behaviour_modify_wrench": "ɥɔuǝɹM ɐ buısn pǝıɟıpoɯ ǝq uɐɔ ɹnoıʌɐɥǝq sıɥ⟘", + "create.ponder.shared.behaviour_modify_value_panel": "ןǝuɐd ǝnןɐʌ ǝɥʇ buısn pǝıɟıpoɯ ǝq uɐɔ ɹnoıʌɐɥǝq sıɥ⟘", "create.ponder.shared.movement_anchors": "˙pǝʌoɯ ǝq uɐɔ sǝɹnʇɔnɹʇs ɹǝbɹɐן 'ǝnן⅁ ɹǝdnS ɟo dןǝɥ ǝɥʇ ɥʇıM", "create.ponder.shared.rpm16": "WԀᴚ 9Ɩ", "create.ponder.shared.rpm16_source": "WԀᴚ 9Ɩ :ǝɔɹnoS", @@ -3090,7 +3090,7 @@ "create.train_assembly.no_controls": ")¿ǝnן⅁ ɹǝdnS buıssıɯ noʎ ǝɹⱯ( ʞɔoןq sןoɹʇuoƆ uıɐɹ⟘ buıɔɐɟ-pɹɐʍɹoɟ ǝuo ʇsɐǝן ʇɐ ɥɔɐʇʇⱯ", "create.train_assembly.not_connected_in_order": "ɹǝpɹo uı pǝʇɔǝuuoɔ ʇou ǝɹɐ sʎǝboᗺ", "create.train_assembly.nothing_attached": "%1$s ʎǝboᗺ oʇ pǝɥɔɐʇʇɐ ǝɹnʇɔnɹʇs oN", - "create.train_assembly.requires_casing": "sʞɔɐɹʇ uo sʎǝboq ǝʇɐǝɹɔ oʇ buısɐƆ ʎɐʍןıɐᴚ ǝs∩", + "create.train_assembly.requires_casing": "sʞɔɐɹʇ uo sʎǝboq ǝʇɐǝɹɔ oʇ buısɐƆ uıɐɹ⟘ ǝs∩", "create.train_assembly.sideways_controls": "sʎɐʍǝpıs ǝɔɐɟ ʇouuɐɔ sןoɹʇuoƆ uıɐɹ⟘", "create.train_assembly.single_bogey_carriage": "uʍo sʇı uo ǝbɐıɹɹɐɔ ɐ ʇɹoddns ʇouuɐɔ ǝdʎʇ ʎǝboᗺ sıɥ⟘", "create.train_assembly.too_many_bogeys": "%1$s :pǝɥɔɐʇʇɐ sʎǝboᗺ ʎuɐɯ oo⟘", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index cc2dcc7c89..96db58c185 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -2344,7 +2344,7 @@ "create.ponder.shaft.text_1": "Shafts will relay rotation in a straight line.", "create.ponder.shaft_casing.header": "Encasing Shafts", "create.ponder.shaft_casing.text_1": "Brass or Andesite Casing can be used to decorate Shafts", - "create.ponder.shared.behaviour_modify_wrench": "This behaviour can be modified using a Wrench", + "create.ponder.shared.behaviour_modify_value_panel": "This behaviour can be modified using the value panel", "create.ponder.shared.movement_anchors": "With the help of Super Glue, larger structures can be moved.", "create.ponder.shared.rpm16": "16 RPM", "create.ponder.shared.rpm16_source": "Source: 16 RPM", @@ -3090,7 +3090,7 @@ "create.train_assembly.no_controls": "Attach at least one forward-facing Train Controls block (Are you missing Super Glue?)", "create.train_assembly.not_connected_in_order": "Bogeys are not connected in order", "create.train_assembly.nothing_attached": "No structure attached to Bogey %1$s", - "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", + "create.train_assembly.requires_casing": "Use Train Casing to create bogeys on tracks", "create.train_assembly.sideways_controls": "Train Controls cannot face sideways", "create.train_assembly.single_bogey_carriage": "This Bogey type cannot support a carriage on its own", "create.train_assembly.too_many_bogeys": "Too many Bogeys attached: %1$s", diff --git a/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json new file mode 100644 index 0000000000..b98c2df616 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_block_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json new file mode 100644 index 0000000000..d7acf9128e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_block_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_copper_block" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:copper_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..a78a939684 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..d60b47feb9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..671245227b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..06cafdc1a6 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..f945478c7c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..ee276f8771 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..eb01726735 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..24260a76b8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..2b7164a368 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..640cc6d18d --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..b98e016345 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:exposed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..a19edbd111 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..30d6a00b11 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..55d3b26076 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..6ee7a38231 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..5de927285f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..10a16d0afd --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..ba1393e4b8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json new file mode 100644 index 0000000000..310fac2ff2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json new file mode 100644 index 0000000000..5f9f6e0090 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..4b5c26fc4d --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..1aefcef554 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..ffb2f84ef7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..578666b0c9 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..787f694610 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..c9b9d0fa80 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..aa09f58dc7 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..fafb438bc4 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..73e1ea72c5 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..6e3efe241b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..d393fad7f1 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:weathered_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..54effad934 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_exposed_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:exposed_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..623604a53f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..6a07ad1f62 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..918a15fbc3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..cbe8c6a27e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..90302f445f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..5b3fca39c0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_exposed_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:exposed_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json new file mode 100644 index 0000000000..8c227c104b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..b26fc86a0e --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..57e210ed0b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..b2beffc051 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..94f14510e0 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..921f7c7a4f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..9faa5ac27c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_oxidized_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:oxidized_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..53159d4731 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..dbe01a3623 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..578c8eba0b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_oxidized_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:oxidized_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json new file mode 100644 index 0000000000..d43be8aa7b --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json new file mode 100644 index 0000000000..8b6614f98c --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json new file mode 100644 index 0000000000..4789309de2 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json new file mode 100644 index 0000000000..d9c74b8822 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingle_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json new file mode 100644 index 0000000000..403a03f899 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json new file mode 100644 index 0000000000..0473633323 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingle_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingle_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingle_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json new file mode 100644 index 0000000000..aeeb95322a --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json new file mode 100644 index 0000000000..1f8d8ddebe --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_shingles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_shingles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json new file mode 100644 index 0000000000..0b1c722735 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json new file mode 100644 index 0000000000..7cdc9e39ff --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tile_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json new file mode 100644 index 0000000000..0cc6b887c3 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json new file mode 100644 index 0000000000..4a30a19137 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tile_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tile_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json new file mode 100644 index 0000000000..1d6d8992a6 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:oxidized_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json new file mode 100644 index 0000000000..059590fb82 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_copper_tiles_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:waxed_weathered_copper_tiles" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "create:weathered_copper_tiles" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json new file mode 100644 index 0000000000..386e68cbec --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json new file mode 100644 index 0000000000..c4523d63ec --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json new file mode 100644 index 0000000000..1cadb4594f --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json new file mode 100644 index 0000000000..9d7ade1662 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_slab_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper_slab" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_slab" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json new file mode 100644 index 0000000000..fbb33f17c1 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_deoxidising.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:oxidized_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json new file mode 100644 index 0000000000..09a7a29ff8 --- /dev/null +++ b/src/generated/resources/data/create/recipe/deploying/weathered_cut_copper_stairs_from_removing_wax.json @@ -0,0 +1,17 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "minecraft:waxed_weathered_cut_copper_stairs" + }, + { + "tag": "minecraft:axes" + } + ], + "keepHeldItem": true, + "results": [ + { + "item": "minecraft:weathered_cut_copper_stairs" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_aluminum.json b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_aluminum.json new file mode 100644 index 0000000000..c3971d308b --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_aluminum.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:plates/aluminum" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_aluminum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_copper.json b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_copper.json new file mode 100644 index 0000000000..711b023d5a --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_copper.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:plates/copper" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_electrum.json b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_electrum.json new file mode 100644 index 0000000000..95264ddf61 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_electrum.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:plates/electrum" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_electrum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_lead.json b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_lead.json new file mode 100644 index 0000000000..f9bb3d81f2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_lead.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:plates/lead" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_lead" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_steel.json b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_steel.json new file mode 100644 index 0000000000..85667c47f7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/immersiveengineering/wire_steel.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:plates/steel" + } + ], + "processingTime": 50, + "results": [ + { + "count": 2, + "item": "immersiveengineering:wire_steel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/filling/compat/immersiveengineering/treated_wood_in_spout.json b/src/generated/resources/data/create/recipes/filling/compat/immersiveengineering/treated_wood_in_spout.json new file mode 100644 index 0000000000..f8497dcb5d --- /dev/null +++ b/src/generated/resources/data/create/recipes/filling/compat/immersiveengineering/treated_wood_in_spout.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "minecraft:planks" + }, + { + "amount": 125, + "fluidTag": "forge:creosote" + } + ], + "results": [ + { + "item": "immersiveengineering:treated_wood_horizontal" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_aluminum.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_aluminum.json new file mode 100644 index 0000000000..00c4a3a5c2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_aluminum.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/aluminum" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_aluminum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_constantan.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_constantan.json new file mode 100644 index 0000000000..bb6ba9c6ea --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_constantan.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/constantan" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_constantan" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_electrum.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_electrum.json new file mode 100644 index 0000000000..c0fdc28800 --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_electrum.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/electrum" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_electrum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_lead.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_lead.json new file mode 100644 index 0000000000..a5fcad040a --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_lead.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/lead" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_lead" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_nickel.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_nickel.json new file mode 100644 index 0000000000..2a42008cca --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_nickel.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/nickel" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_nickel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_silver.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_silver.json new file mode 100644 index 0000000000..fff08ca945 --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_silver.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/silver" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_silver" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_steel.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_steel.json new file mode 100644 index 0000000000..2dd8cdf1ad --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_steel.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/steel" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_steel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_uranium.json b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_uranium.json new file mode 100644 index 0000000000..2172141edc --- /dev/null +++ b/src/generated/resources/data/create/recipes/pressing/compat/immersiveengineering/plate_uranium.json @@ -0,0 +1,19 @@ +{ + "type": "create:pressing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "immersiveengineering" + } + ], + "ingredients": [ + { + "tag": "forge:ingots/uranium" + } + ], + "results": [ + { + "item": "immersiveengineering:plate_uranium" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 0d8973469a..a9b7cfd1e6 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -109,7 +109,7 @@ public class AllItems { public static final ItemEntry - INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"), + INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"), INCOMPLETE_REINFORCED_SHEET = sequencedIngredient("unprocessed_obsidian_sheet"), INCOMPLETE_TRACK = sequencedIngredient("incomplete_track"); @@ -219,7 +219,7 @@ public class AllItems { IRON_SHEET = taggedIngredient("iron_sheet", commonItemTag("plates/iron"), PLATES.tag), GOLDEN_SHEET = taggedIngredient("golden_sheet", commonItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED), - CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag), + CRUSHED_IRON = taggedIngredient("crushed_raw_iron", CRUSHED_RAW_MATERIALS.tag), CRUSHED_GOLD = taggedIngredient("crushed_raw_gold", CRUSHED_RAW_MATERIALS.tag, ItemTags.PIGLIN_LOVED), CRUSHED_COPPER = taggedIngredient("crushed_raw_copper", CRUSHED_RAW_MATERIALS.tag), CRUSHED_ZINC = taggedIngredient("crushed_raw_zinc", CRUSHED_RAW_MATERIALS.tag); @@ -284,7 +284,7 @@ public class AllItems { public static final ItemEntry - COPPER_BACKTANK = + COPPER_BACKTANK = REGISTRATE .item("copper_backtank", p -> new BacktankItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"), @@ -306,7 +306,7 @@ public class AllItems { public static final ItemEntry - COPPER_DIVING_HELMET = + COPPER_DIVING_HELMET = REGISTRATE .item("copper_diving_helmet", p -> new DivingHelmetItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) @@ -323,7 +323,7 @@ public class AllItems { public static final ItemEntry - COPPER_DIVING_BOOTS = + COPPER_DIVING_BOOTS = REGISTRATE .item("copper_diving_boots", p -> new DivingBootsItem(AllArmorMaterials.COPPER, p, Create.asResource("copper_diving"))) @@ -340,13 +340,13 @@ public class AllItems { public static final ItemEntry - CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardArmorItem(ArmorItem.Type.HELMET, p)) - .properties(p -> p.durability(Type.HELMET.getDurability(4))) - .tag(ItemTags.HEAD_ARMOR, ItemTags.TRIMMABLE_ARMOR) - .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor")) - .model(TrimmableArmorModelGenerator::generate) - .clientExtension(() -> () -> new CardboardArmorStealthOverlay()) - .register(), + CARDBOARD_HELMET = REGISTRATE.item("cardboard_helmet", p -> new CardboardArmorItem(ArmorItem.Type.HELMET, p)) + .properties(p -> p.durability(Type.HELMET.getDurability(4))) + .tag(ItemTags.HEAD_ARMOR, ItemTags.TRIMMABLE_ARMOR) + .onRegisterAfter(Registries.ITEM, v -> ItemDescription.useKey(v, "item.create.cardboard_armor")) + .model(TrimmableArmorModelGenerator::generate) + .clientExtension(() -> () -> new CardboardArmorStealthOverlay()) + .register(), CARDBOARD_CHESTPLATE = REGISTRATE.item("cardboard_chestplate", p -> new CardboardArmorItem(ArmorItem.Type.CHESTPLATE, p)) @@ -456,11 +456,11 @@ public class AllItems { .lang("List Filter") .register(), - ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute) - .register(), + ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute) + .register(), - PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address) - .register(); + PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address) + .register(); public static final ItemEntry SCHEDULE = REGISTRATE.item("schedule", ScheduleItem::new) .lang("Train Schedule") @@ -521,6 +521,7 @@ public class AllItems { // Load this class - public static void register() {} + public static void register() { + } } diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java index 0c060abd0e..ac4b66cdda 100644 --- a/src/main/java/com/simibubi/create/AllPartialModels.java +++ b/src/main/java/com/simibubi/create/AllPartialModels.java @@ -238,6 +238,7 @@ public class AllPartialModels { public static final Map METAL_GIRDER_BRACKETS = new EnumMap<>(Direction.class); public static final Map TOOLBOX_LIDS = new EnumMap<>(DyeColor.class); + public static final Map DYED_VALVE_HANDLES = new EnumMap<>(DyeColor.class); public static final Map> FOLDING_DOORS = new HashMap<>(); public static final List CONTRAPTION_CONTROLS_INDICATOR = new ArrayList<>(); @@ -257,8 +258,10 @@ public class AllPartialModels { } PIPE_ATTACHMENTS.put(type, map); } - for (DyeColor color : DyeColor.values()) + for (DyeColor color : DyeColor.values()) { TOOLBOX_LIDS.put(color, block("toolbox/lid/" + Lang.asId(color.name()))); + DYED_VALVE_HANDLES.put(color, block(Lang.asId(color.name()) + "_valve_handle")); + } for (Direction d : Iterate.horizontalDirections) { METAL_GIRDER_BRACKETS.put(d, block("metal_girder/bracket_" + Lang.asId(d.name()))); FACTORY_PANEL_ARROWS.put(d, block("factory_gauge/connections/arrow_" + Lang.asId(d.name()))); diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java index 29a5ba7f6e..231b4c58c1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionCollider.java @@ -139,6 +139,10 @@ public class ContraptionCollider { float yawOffset = rotation.getYawOffset(); Vec3 position = getWorldToLocalTranslation(entity, anchorVec, rotationMatrix, yawOffset); + // Make player 'shorter' to make it less likely to become stuck + if (playerType == PlayerType.CLIENT && entityBounds.getYsize() > 1) + entityBounds = entityBounds.contract(0, 2 / 16f, 0); + motion = motion.subtract(contraptionMotion); motion = rotationMatrix.transform(motion); diff --git a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java index 25fc0a7171..6c787a15ae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java +++ b/src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java @@ -90,6 +90,10 @@ public class ContraptionHandlerClient { Collection> contraptions = ContraptionHandler.loadedContraptions.get(mc.level) .values(); + + double bestDistance = Double.MAX_VALUE; + BlockHitResult bestResult = null; + AbstractContraptionEntity bestEntity = null; for (WeakReference ref : contraptions) { AbstractContraptionEntity contraptionEntity = ref.get(); @@ -102,20 +106,30 @@ public class ContraptionHandlerClient { BlockHitResult rayTraceResult = rayTraceContraption(origin, target, contraptionEntity); if (rayTraceResult == null) continue; - - InteractionHand hand = event.getHand(); - Direction face = rayTraceResult.getDirection(); - BlockPos pos = rayTraceResult.getBlockPos(); - - if (contraptionEntity.handlePlayerInteraction(player, pos, face, hand)) { - CatnipServices.NETWORK.sendToServer(new ContraptionInteractionPacket(contraptionEntity, hand, pos, face)); - } else if (handleSpecialInteractions(contraptionEntity, player, pos, face, hand)) { - } else + + double distance = contraptionEntity.toGlobalVector(rayTraceResult.getLocation(), 1).distanceTo(origin); + if (distance > bestDistance) continue; - - event.setCanceled(true); - event.setSwingHand(false); + + bestResult = rayTraceResult; + bestDistance = distance; + bestEntity = contraptionEntity; } + + if (bestResult == null) + return; + + InteractionHand hand = event.getHand(); + Direction face = bestResult.getDirection(); + BlockPos pos = bestResult.getBlockPos(); + + if (bestEntity.handlePlayerInteraction(player, pos, face, hand)) { + CatnipServices.NETWORK.sendToServer(new ContraptionInteractionPacket(bestEntity, hand, pos, face)); + } else + handleSpecialInteractions(bestEntity, player, pos, face, hand); + + event.setCanceled(true); + event.setSwingHand(false); } private static boolean handleSpecialInteractions(AbstractContraptionEntity contraptionEntity, Player player, diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java index 9be4ec1ea7..163033e4ed 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java @@ -15,6 +15,7 @@ import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.foundation.utility.worldWrappers.WrappedBlockAndTintGetter; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; +import dev.engine_room.flywheel.api.material.CardinalLightingMode; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.task.Plan; import dev.engine_room.flywheel.api.visual.BlockEntityVisual; @@ -28,6 +29,8 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.api.visualization.VisualizerRegistry; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.model.ModelUtil; import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder; import dev.engine_room.flywheel.lib.task.ForEachPlan; import dev.engine_room.flywheel.lib.task.NestedPlan; @@ -99,6 +102,8 @@ public class ContraptionVisual extends Abst }; model = new MultiBlockModelBuilder(modelWorld, blocks.positions()) + .materialFunc((renderType, aBoolean) -> SimpleMaterial.builderOf(ModelUtil.getMaterial(renderType, aBoolean)) + .cardinalLightingMode(CardinalLightingMode.CHUNK)) .build(); var instancer = embedding.instancerProvider() diff --git a/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java b/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java index 5c218b8b45..c870a4754f 100644 --- a/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java +++ b/src/main/java/com/simibubi/create/content/equipment/tool/AllToolMaterials.java @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block; public enum AllToolMaterials implements Tier { CARDBOARD(Create.asResource("cardboard") - .toString(), 200, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem())) + .toString(), 0, 1, 2, 1, () -> Ingredient.of(AllItems.CARDBOARD.asItem())) ; public final String name; @@ -26,7 +26,7 @@ public enum AllToolMaterials implements Tier { private final int enchantValue; private final Supplier repairMaterial; - AllToolMaterials(String name, int uses, float speed, float damageBonus, int enchantValue, + private AllToolMaterials(String name, int uses, float speed, float damageBonus, int enchantValue, Supplier repairMaterial) { this.name = name; this.uses = uses; diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java index 4d509c1168..0231d90f14 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlock.java @@ -32,8 +32,8 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; @EventBusSubscriber public class ValveHandleBlock extends HandCrankBlock { - private final DyeColor color; - + public final DyeColor color; + public static ValveHandleBlock copper(Properties properties) { return new ValveHandleBlock(properties, null); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java index 37f2e315f1..5b46b98b9c 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleVisual.java @@ -6,17 +6,16 @@ import org.joml.Quaternionf; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; -import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; -import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import net.minecraft.core.Direction; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; public class ValveHandleVisual extends KineticBlockEntityVisual implements SimpleDynamicVisual { @@ -25,8 +24,16 @@ public class ValveHandleVisual extends KineticBlockEntityVisual { - if (t.equals(prevValue)) + if (!t.equals(prevValue)) destinationSuggestions.updateCommandInfo(); prevValue = t; }; diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java index fd890f816f..8a5a12ae4b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java @@ -841,6 +841,8 @@ public class FactoryPanelBehaviour extends FilteringBehaviour { blockEntity.setChanged(); blockEntity.sendData(); playFeedbackSound(this); + if (!getWorld().isClientSide) + notifyRedstoneOutputs(); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java index 5bb06a28ed..317603e0d4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java @@ -83,6 +83,8 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE { if (be.heldBox.isEmpty()) { @@ -101,10 +103,10 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE 0) - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return ItemInteractionResult.SUCCESS; if (!level.isClientSide()) { player.getInventory() .placeItemBackInInventory(be.heldBox.copy()); @@ -116,7 +118,7 @@ public class PackagerBlock extends WrenchableDirectionalBlock implements IBE 0 && lmb && pMouseX > barX && pMouseX <= barX + 8 && pMouseY > getGuiTop() + 15 @@ -1046,15 +1055,6 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen hoveredSlot = getHoveredSlot((int) mouseX, (int) mouseY); boolean noHover = hoveredSlot == noneHovered; diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java index ca555c5ba0..80f2ce24d5 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java @@ -24,8 +24,8 @@ public class StandardBogeyVisual implements BogeyVisual { var shaftInstancer = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SHAFT)); - shaft1 = shaftInstancer.createInstance().rotateToFace(Direction.SOUTH); - shaft2 = shaftInstancer.createInstance().rotateToFace(Direction.SOUTH); + shaft1 = shaftInstancer.createInstance(); + shaft2 = shaftInstancer.createInstance(); } @Override @@ -33,13 +33,15 @@ public class StandardBogeyVisual implements BogeyVisual { shaft1.setTransform(poseStack) .translate(-.5f, .25f, 0) .center() - .rotateZDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.SOUTH) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); shaft2.setTransform(poseStack) .translate(-.5f, .25f, -1) .center() - .rotateZDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.SOUTH) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); } @@ -145,8 +147,8 @@ public class StandardBogeyVisual implements BogeyVisual { super(ctx, partialTick, inContraption); var secondaryShaftInstancer = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SHAFT)); - secondaryShaft1 = secondaryShaftInstancer.createInstance().rotateToFace(Direction.EAST); - secondaryShaft2 = secondaryShaftInstancer.createInstance().rotateToFace(Direction.EAST); + secondaryShaft1 = secondaryShaftInstancer.createInstance(); + secondaryShaft2 = secondaryShaftInstancer.createInstance(); drive = ctx.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.BOGEY_DRIVE)) .createInstance(); @@ -167,13 +169,15 @@ public class StandardBogeyVisual implements BogeyVisual { secondaryShaft1.setTransform(poseStack) .translate(-.5f, .25f, .5f) .center() - .rotateXDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.EAST) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); secondaryShaft2.setTransform(poseStack) .translate(-.5f, .25f, -1.5f) .center() - .rotateXDegrees(wheelAngle) + .rotateTo(Direction.UP, Direction.EAST) + .rotateYDegrees(wheelAngle) .uncenter() .setChanged(); drive.setTransform(poseStack) diff --git a/src/main/java/com/simibubi/create/content/trains/entity/Train.java b/src/main/java/com/simibubi/create/content/trains/entity/Train.java index 94fe080f40..851489aaca 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/Train.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/Train.java @@ -457,7 +457,7 @@ public class Train { } else if (speed != 0) status.trackOK(); - updateNavigationTarget(distance); + updateNavigationTarget(level, distance); } public IEdgePointListener frontSignalListener() { @@ -544,7 +544,7 @@ public class Train { }; } - private void updateNavigationTarget(double distance) { + private void updateNavigationTarget(Level level, double distance) { if (navigation.destination == null) return; @@ -578,7 +578,7 @@ public class Train { return; if (!navigatingManually && fullRefresh) { - DiscoveredPath preferredPath = runtime.startCurrentInstruction(); + DiscoveredPath preferredPath = runtime.startCurrentInstruction(level); if (preferredPath != null){ navigation.startNavigation(preferredPath); } @@ -798,8 +798,10 @@ public class Train { if (currentStation != null) { currentStation.cancelReservation(this); BlockPos blockEntityPos = currentStation.getBlockEntityPos(); - if (level.getBlockEntity(blockEntityPos) instanceof StationBlockEntity sbe) + if (level.getBlockEntity(blockEntityPos) instanceof StationBlockEntity sbe) { sbe.lastDisassembledTrainName = name.copy(); + sbe.lastDisassembledMapColorIndex = mapColorIndex; + } } Create.RAILWAYS.removeTrain(id); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java index a4170b4d2b..1e461dc03a 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java @@ -130,7 +130,7 @@ public class ScheduleRuntime { return; } - DiscoveredPath nextPath = startCurrentInstruction(); + DiscoveredPath nextPath = startCurrentInstruction(level); if (nextPath == null) return; @@ -183,10 +183,10 @@ public class ScheduleRuntime { carriage.storage.tickIdleCargoTracker(); } - public DiscoveredPath startCurrentInstruction() { + public DiscoveredPath startCurrentInstruction(Level level) { ScheduleEntry entry = schedule.entries.get(currentEntry); ScheduleInstruction instruction = entry.instruction; - return instruction.start(this); + return instruction.start(this, level); } public void setSchedule(Schedule schedule, boolean auto) { diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java index 7f56549f0f..c7dc62ae94 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeThrottleInstruction.java @@ -19,6 +19,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -89,7 +90,7 @@ public class ChangeThrottleInstruction extends ScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { runtime.train.throttle = getThrottle(); runtime.state = State.PRE_TRANSIT; runtime.currentEntry++; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java index 369db3419e..a281648ca2 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ChangeTitleInstruction.java @@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; public class ChangeTitleInstruction extends TextScheduleInstruction { @@ -59,7 +60,7 @@ public class ChangeTitleInstruction extends TextScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { runtime.currentTitle = getScheduleTitle(); runtime.state = State.PRE_TRANSIT; runtime.currentEntry++; diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java index 0dfea2dda5..0fd404c276 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DeliverPackagesInstruction.java @@ -27,7 +27,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; - +import net.minecraft.world.level.Level; import net.neoforged.neoforge.items.IItemHandlerModifiable; public class DeliverPackagesInstruction extends ScheduleInstruction { @@ -66,7 +66,7 @@ public class DeliverPackagesInstruction extends ScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { boolean anyMatch = false; String firstPackage = null; ArrayList validStations = new ArrayList<>(); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java index 8053478540..7e6db5229d 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/DestinationInstruction.java @@ -6,8 +6,6 @@ import java.util.regex.PatternSyntaxException; import javax.annotation.Nullable; -import net.createmod.catnip.data.Glob; - import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; @@ -20,12 +18,14 @@ import com.simibubi.create.content.trains.schedule.ScheduleRuntime; import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.data.Glob; import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; @@ -78,7 +78,7 @@ public class DestinationInstruction extends TextScheduleInstruction { @Override @Nullable - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { String regex = getFilterForRegex(); boolean anyMatch = false; ArrayList validStations = new ArrayList<>(); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java index b3c4e5f698..005488a3c0 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/FetchPackagesInstruction.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.regex.PatternSyntaxException; -import net.createmod.catnip.data.Glob; - import org.apache.commons.lang3.StringUtils; import com.google.common.collect.ImmutableList; @@ -14,8 +12,6 @@ import com.simibubi.create.Create; import com.simibubi.create.content.logistics.box.PackageItem; import com.simibubi.create.content.logistics.box.PackageStyles; import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlockEntity; -import com.simibubi.create.content.trains.entity.Carriage; -import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.Train; import com.simibubi.create.content.trains.graph.DiscoveredPath; import com.simibubi.create.content.trains.graph.EdgePointType; @@ -25,12 +21,14 @@ import com.simibubi.create.content.trains.station.GlobalStation; import com.simibubi.create.content.trains.station.GlobalStation.GlobalPackagePort; import com.simibubi.create.foundation.utility.CreateLang; +import net.createmod.catnip.data.Glob; import net.createmod.catnip.data.Pair; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.EditBox; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -67,6 +65,8 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { } public String getFilterForRegex() { + if (getFilter().isBlank()) + return Glob.toRegexPattern("*", ""); return Glob.toRegexPattern(getFilter(), ""); } @@ -98,7 +98,11 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { } @Override - public DiscoveredPath start(ScheduleRuntime runtime) { + public DiscoveredPath start(ScheduleRuntime runtime, Level level) { + MinecraftServer server = level.getServer(); + if (server == null) + return null; + String regex = getFilterForRegex(); boolean anyMatch = false; ArrayList validStations = new ArrayList<>(); @@ -110,25 +114,18 @@ public class FetchPackagesInstruction extends TextScheduleInstruction { return null; } - Level level = null; - for (Carriage carriage : train.carriages) { - if (level == null) { - CarriageContraptionEntity entity = carriage.anyAvailableEntity(); - if (entity != null && entity.level() instanceof ServerLevel sl) - level = sl; - } - } - for (GlobalStation globalStation : train.graph.getPoints(EdgePointType.STATION)) { + ServerLevel dimLevel = server.getLevel(globalStation.blockEntityDimension); + if (dimLevel == null) + continue; + for (Entry entry : globalStation.connectedPorts.entrySet()) { GlobalPackagePort port = entry.getValue(); BlockPos pos = entry.getKey(); IItemHandlerModifiable postboxInventory = port.offlineBuffer; - if (level != null && level.isLoaded(pos) - && level.getBlockEntity(pos) instanceof PostboxBlockEntity ppbe) { + if (dimLevel.isLoaded(pos) && dimLevel.getBlockEntity(pos) instanceof PostboxBlockEntity ppbe) postboxInventory = ppbe.inventory; - } for (int slot = 0; slot < postboxInventory.getSlots(); slot++) { ItemStack stack = postboxInventory.getStackInSlot(slot); diff --git a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java index 0a6f1675f6..d827721a15 100644 --- a/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java +++ b/src/main/java/com/simibubi/create/content/trains/schedule/destination/ScheduleInstruction.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; import javax.annotation.Nullable; @@ -27,7 +28,7 @@ public abstract class ScheduleInstruction extends ScheduleDataEntry { public abstract boolean supportsConditions(); @Nullable - public abstract DiscoveredPath start(ScheduleRuntime runtime); + public abstract DiscoveredPath start(ScheduleRuntime runtime, Level level); public final CompoundTag write(HolderLookup.Provider registries) { CompoundTag tag = new CompoundTag(); diff --git a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java index a2f61fa731..31473cefc1 100644 --- a/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java @@ -120,6 +120,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab boolean flagFlipped; public Component lastDisassembledTrainName; + public int lastDisassembledMapColorIndex; public StationBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); @@ -169,6 +170,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab trainPresent = tag.getBoolean("ForceFlag"); if (tag.contains("PrevTrainName")) lastDisassembledTrainName = Component.Serializer.fromJson(tag.getString("PrevTrainName"), registries); + lastDisassembledMapColorIndex = tag.getInt("PrevTrainColor"); if (!clientPacket) return; @@ -195,6 +197,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (lastDisassembledTrainName != null) tag.putString("PrevTrainName", Component.Serializer.toJson(lastDisassembledTrainName, registries)); + tag.putInt("PrevTrainColor", lastDisassembledMapColorIndex); super.write(tag, registries, clientPacket); @@ -405,7 +408,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (train.navigation.destination != station) continue; - DiscoveredPath preferredPath = train.runtime.startCurrentInstruction(); + DiscoveredPath preferredPath = train.runtime.startCurrentInstruction(level); train.navigation.startNavigation( preferredPath != null ? preferredPath : train.navigation.findPathTo(station, Double.MAX_VALUE)); } @@ -850,7 +853,9 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab if (lastDisassembledTrainName != null) { train.name = lastDisassembledTrainName; + train.mapColorIndex = lastDisassembledMapColorIndex; lastDisassembledTrainName = null; + lastDisassembledMapColorIndex = 0; } for (int i = 0; i < contraptions.size(); i++) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index df50f66dd0..0929c0ac58 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -5,6 +5,8 @@ import java.util.concurrent.CompletableFuture; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; +import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider.GeneratedRecipe; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -31,7 +33,10 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { // Regions Unexplored RU_14 = stripOnlyDiffModId(Mods.RU, "silver_birch_log", Mods.MC, "stripped_birch_log"), - RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood") + RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood"), + + // IE + IE_WIRES = ieWires("copper", "electrum", "aluminum", "steel", "lead") ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { @@ -104,6 +109,15 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { public CuttingRecipeGen(PackOutput output, CompletableFuture registries) { super(output, registries); } + + GeneratedRecipe ieWires(String... metals) { + for (String metal : metals) + create(Mods.IE.recipeId("wire_" + metal), b -> b.duration(50) + .require(AllTags.commonItemTag("plates/" + metal)) + .output(1, Mods.IE, "wire_" + metal, 2) + .whenModLoaded(Mods.IE.getId())); + return null; + } @Override protected AllRecipeTypes getRecipeType() { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java index 2e15d24b02..a5098f9ffc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.data.recipe; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; @@ -10,6 +12,7 @@ import com.simibubi.create.foundation.block.CopperBlockSet.Variant; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Blocks; @@ -52,19 +55,50 @@ public class DeployingRecipeGen extends ProcessingRecipeGen { CCS3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB), CCS4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB); + GeneratedRecipe + + CB_OX = oxidizationChain(List.of(() -> Blocks.COPPER_BLOCK, () -> Blocks.EXPOSED_COPPER, () -> Blocks.WEATHERED_COPPER, () -> Blocks.OXIDIZED_COPPER)), + CCB_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER)), + CCST_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS)), + CCS_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB)); + public GeneratedRecipe copperChain(CopperBlockSet set) { - for (Variant variant : set.getVariants()) - for (WeatherState state : WeatherState.values()) + for (Variant variant : set.getVariants()) { + List> chain = new ArrayList<>(4); + + for (WeatherState state : WeatherState.values()) { addWax(set.get(variant, state, true)::get, set.get(variant, state, false)::get); + chain.add(set.get(variant, state, false)::get); + } + + oxidizationChain(chain); + } return null; } public GeneratedRecipe addWax(Supplier waxed, Supplier nonWaxed) { + createWithDeferredId(idWithSuffix(nonWaxed, "_from_removing_wax"), b -> b.require(waxed.get()) + .require(ItemTags.AXES) + .toolNotConsumed() + .output(nonWaxed.get())); + return createWithDeferredId(idWithSuffix(waxed, "_from_adding_wax"), b -> b.require(nonWaxed.get()) .require(Items.HONEYCOMB_BLOCK) .toolNotConsumed() .output(waxed.get())); } + + public GeneratedRecipe oxidizationChain(List> chain) { + for (int i = 0; i < chain.size() - 1; i++) { + Supplier to = chain.get(i); + Supplier from = chain.get(i + 1); + createWithDeferredId(idWithSuffix(to, "_from_deoxidising"), b -> b.require(from.get()) + .require(ItemTags.AXES) + .toolNotConsumed() + .output(to.get())); + } + return null; + } public DeployingRecipeGen(PackOutput output, CompletableFuture registries) { super(output, registries); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java index f393bf072e..2d26efa72c 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java @@ -5,6 +5,7 @@ import java.util.concurrent.CompletableFuture; import com.simibubi.create.AllFluids; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; import com.simibubi.create.content.fluids.potion.PotionFluidHandler; import net.minecraft.core.HolderLookup; @@ -90,7 +91,15 @@ public class FillingRecipeGen extends ProcessingRecipeGen { VMP_CURSED_GRASS = create(Mods.VMP.recipeId("cursed_grass"), b -> b.require(Fluids.WATER, 500) .require(Mods.VMP, "cursed_earth") .output(Mods.VMP, "cursed_grass") - .whenModLoaded(Mods.VMP.getId())); + .whenModLoaded(Mods.VMP.getId())), + + // IE + + IE_TREATED_WOOD = create(Mods.IE.recipeId("treated_wood_in_spout"), + b -> b.require(AllTags.commonFluidTag("creosote"), 125) + .require(I.planks()) + .output(Mods.IE, "treated_wood_horizontal") + .whenModLoaded(Mods.IE.getId())); ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java index ce702126d2..aa5ebe6dbc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.data.recipe; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.AllTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -92,6 +93,10 @@ public class PressingRecipeGen extends ProcessingRecipeGen { .output(Mods.RU, "silt_dirt_path") .whenModLoaded(Mods.RU.getId())), + // IE + + IE_PLATES = iePlates("aluminum", "lead", "silver", "nickel", "uranium", "constantan", "electrum", "steel"), + // Vampirism VMP_CURSED_PATH = moddedPaths(Mods.VMP, "cursed_earth"), @@ -110,6 +115,14 @@ public class PressingRecipeGen extends ProcessingRecipeGen { return null; } + GeneratedRecipe iePlates(String... metals) { + for (String metal : metals) + create(Mods.IE.recipeId("plate_" + metal), b -> b.require(AllTags.forgeItemTag("ingots/" + metal)) + .output(Mods.IE, "plate_" + metal) + .whenModLoaded(Mods.IE.getId())); + return null; + } + GeneratedRecipe moddedCompacting(Mods mod, String input, String output) { return create("compat/" + mod.getId() + "/" + output, b -> b.require(mod, input) .output(mod, output) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java b/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java index 684c8b4b72..ea95b85406 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/CreatePonderPlugin.java @@ -42,7 +42,7 @@ public class CreatePonderPlugin implements PonderPlugin { helper.registerSharedText("rpm32", "32 RPM"); helper.registerSharedText("movement_anchors", "With the help of Super Glue, larger structures can be moved."); - helper.registerSharedText("behaviour_modify_wrench", "This behaviour can be modified using a Wrench"); + helper.registerSharedText("behaviour_modify_value_panel", "This behaviour can be modified using the value panel"); helper.registerSharedText("storage_on_contraption", "Inventories attached to the Contraption will pick up their drops automatically"); } diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java index a7e7bc1324..23e150d5de 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java @@ -388,8 +388,7 @@ public class BearingScenes { Vec3 blockSurface = util.vector().blockSurface(bearingPos, Direction.NORTH) .add(0, 2 / 16f, 0); scene.overlay().showFilterSlotInput(blockSurface, Direction.NORTH, 60); - scene.overlay().showControls(blockSurface, Pointing.DOWN, 60).scroll() - .withItem(AllItems.WRENCH.asStack()); + scene.overlay().showControls(blockSurface, Pointing.DOWN, 60).rightClick(); scene.idle(10); scene.overlay().showText(60) .pointAt(blockSurface) diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index f5f339ed42..c569ce5ac0 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -955,7 +955,7 @@ "create.train_assembly.no_controls": "Attach at least one forward-facing Train Controls block (Are you missing Super Glue?)", "create.train_assembly.sideways_controls": "Train Controls cannot face sideways", "create.train_assembly.bogey_created": "Bogey created. Click again to cycle type", - "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", + "create.train_assembly.requires_casing": "Use Train Casing to create bogeys on tracks", "create.track_target.set": "Targeted track selected", "create.track_target.success": "Successfully bound to targeted track", diff --git a/src/main/resources/assets/create/models/block/package_frogport/block.json b/src/main/resources/assets/create/models/block/package_frogport/block.json index 2193c26069..b478b4ebab 100644 --- a/src/main/resources/assets/create/models/block/package_frogport/block.json +++ b/src/main/resources/assets/create/models/block/package_frogport/block.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/port2", - "particle": "create:block/port2" + "particle": "create:block/vault/vault_top_small" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/package_frogport/item.json b/src/main/resources/assets/create/models/block/package_frogport/item.json index a702e87c80..90a855b1e9 100644 --- a/src/main/resources/assets/create/models/block/package_frogport/item.json +++ b/src/main/resources/assets/create/models/block/package_frogport/item.json @@ -4,7 +4,7 @@ "textures": { "0": "create:block/port2", "1": "create:block/port", - "particle": "create:block/port2" + "particle": "create:block/vault/vault_top_small" }, "elements": [ {