From 71c4e6d4809b1a8d6ee96fcc41692a96e705e3e8 Mon Sep 17 00:00:00 2001 From: Carter <69820300+Cart3r1234@users.noreply.github.com> Date: Mon, 2 Oct 2023 20:40:52 -0400 Subject: [PATCH] Recipe changes - Removed duplicate recipes for aged 1x1 panels. - Changed the cost and/or output of most gel recipes. The output of base gel blobs is halved, but the specific gel recipes give double. - Changed the Morality Core recipe slightly to better match the other core recipes - Old Aperture recipes that used logs now use planks instead to make them less expensive compared to similar recipes for other visual styles. - Changed the Light Bridge Emitter recipe to use iron ingots instead of gray panels due to match the model change it had --- .../item/old_aperture_door_sprite.png | Bin 5276 -> 5572 bytes .../recipes/adhesion_gel_blob_crafting.json | 2 +- .../aged_padded_gray_panel_crafting.json | 17 ----------------- .../aged_smooth_gray_panel_crafting.json | 17 ----------------- .../recipes/aged_white_panel_crafting.json | 17 ----------------- .../recipes/base_gel_blob_crafting.json | 2 +- .../recipes/conversion_gel_blob_crafting.json | 2 +- .../light_bridge_emitter_crafting.json | 2 +- .../recipes/morality_core_crafting.json | 3 +++ .../recipes/old_aperture_cube_crafting.json | 2 +- ...old_aperture_pedestal_button_crafting.json | 2 +- .../old_aperture_white_panel_crafting.json | 2 +- .../recipes/propulsion_gel_blob_crafting.json | 4 ++-- .../recipes/reflection_gel_blob_crafting.json | 2 +- .../recipes/repulsion_gel_blob_crafting.json | 2 +- 15 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 src/main/resources/data/portalcubed/recipes/aged_padded_gray_panel_crafting.json delete mode 100644 src/main/resources/data/portalcubed/recipes/aged_smooth_gray_panel_crafting.json delete mode 100644 src/main/resources/data/portalcubed/recipes/aged_white_panel_crafting.json diff --git a/src/main/resources/assets/portalcubed/textures/item/old_aperture_door_sprite.png b/src/main/resources/assets/portalcubed/textures/item/old_aperture_door_sprite.png index 81bf75c4c3e2fe8c5632bb70e387c355a0ac5dbe..a9e5953896bfbcf6afdbb60f655a563aaf06a56f 100644 GIT binary patch delta 1857 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 diff --git a/src/main/resources/data/portalcubed/recipes/adhesion_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/adhesion_gel_blob_crafting.json index 3761cc64..fee4a4c6 100644 --- a/src/main/resources/data/portalcubed/recipes/adhesion_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/adhesion_gel_blob_crafting.json @@ -13,7 +13,7 @@ ], "result": { "item": "portalcubed:adhesion_gel", - "count": 2 + "count": 4 }, "group": "gels" } \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/aged_padded_gray_panel_crafting.json b/src/main/resources/data/portalcubed/recipes/aged_padded_gray_panel_crafting.json deleted file mode 100644 index ee4e2df1..00000000 --- a/src/main/resources/data/portalcubed/recipes/aged_padded_gray_panel_crafting.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "ingredients": [ - { - "item": "portalcubed:padded_gray_panel" - }, - { - "tag": "portalcubed:plantcraft" - } - ], - "result": { - "item": "portalcubed:aged_padded_gray_panel", - "count": 1 - }, - "group": "aged_padded_gray_panel" -} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/aged_smooth_gray_panel_crafting.json b/src/main/resources/data/portalcubed/recipes/aged_smooth_gray_panel_crafting.json deleted file mode 100644 index 80e08548..00000000 --- a/src/main/resources/data/portalcubed/recipes/aged_smooth_gray_panel_crafting.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "ingredients": [ - { - "item": "portalcubed:smooth_gray_panel" - }, - { - "tag": "portalcubed:plantcraft" - } - ], - "result": { - "item": "portalcubed:aged_smooth_gray_panel", - "count": 1 - }, - "group": "aged_smooth_gray_panel" -} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/aged_white_panel_crafting.json b/src/main/resources/data/portalcubed/recipes/aged_white_panel_crafting.json deleted file mode 100644 index b319a555..00000000 --- a/src/main/resources/data/portalcubed/recipes/aged_white_panel_crafting.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "ingredients": [ - { - "item": "portalcubed:white_panel" - }, - { - "tag": "portalcubed:plantcraft" - } - ], - "result": { - "item": "portalcubed:aged_white_panel", - "count": 1 - }, - "group": "aged_white_panel" -} \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/base_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/base_gel_blob_crafting.json index 7be9cb10..662d2637 100644 --- a/src/main/resources/data/portalcubed/recipes/base_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/base_gel_blob_crafting.json @@ -10,6 +10,6 @@ ], "result": { "item": "portalcubed:base_gel", - "count": 16 + "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/conversion_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/conversion_gel_blob_crafting.json index a7b62951..829fbba7 100644 --- a/src/main/resources/data/portalcubed/recipes/conversion_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/conversion_gel_blob_crafting.json @@ -13,7 +13,7 @@ ], "result": { "item": "portalcubed:conversion_gel", - "count": 2 + "count": 4 }, "group": "gels" } diff --git a/src/main/resources/data/portalcubed/recipes/light_bridge_emitter_crafting.json b/src/main/resources/data/portalcubed/recipes/light_bridge_emitter_crafting.json index 1f7e31f0..787f51c4 100644 --- a/src/main/resources/data/portalcubed/recipes/light_bridge_emitter_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/light_bridge_emitter_crafting.json @@ -8,7 +8,7 @@ ], "key": { "X": { - "tag": "portalcubed:portal_2_clean_gray_panels" + "item": "minecraft:iron_ingot" }, "Y": { "item": "minecraft:redstone" diff --git a/src/main/resources/data/portalcubed/recipes/morality_core_crafting.json b/src/main/resources/data/portalcubed/recipes/morality_core_crafting.json index 0159224c..a5430027 100644 --- a/src/main/resources/data/portalcubed/recipes/morality_core_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/morality_core_crafting.json @@ -4,6 +4,9 @@ { "item": "portalcubed:core_frame" }, + { + "item": "minecraft:compass" + }, { "tag": "c:purple_dyes" } diff --git a/src/main/resources/data/portalcubed/recipes/old_aperture_cube_crafting.json b/src/main/resources/data/portalcubed/recipes/old_aperture_cube_crafting.json index 88668e10..18a4d239 100644 --- a/src/main/resources/data/portalcubed/recipes/old_aperture_cube_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/old_aperture_cube_crafting.json @@ -10,7 +10,7 @@ "item": "minecraft:dried_kelp" }, "X": { - "tag": "minecraft:logs" + "tag": "minecraft:planks" } }, "result": { diff --git a/src/main/resources/data/portalcubed/recipes/old_aperture_pedestal_button_crafting.json b/src/main/resources/data/portalcubed/recipes/old_aperture_pedestal_button_crafting.json index 2ea2582f..24e1f849 100644 --- a/src/main/resources/data/portalcubed/recipes/old_aperture_pedestal_button_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/old_aperture_pedestal_button_crafting.json @@ -8,7 +8,7 @@ ], "key": { "X": { - "tag": "minecraft:logs" + "tag": "minecraft:planks" }, "Y": { "tag": "minecraft:wooden_buttons" diff --git a/src/main/resources/data/portalcubed/recipes/old_aperture_white_panel_crafting.json b/src/main/resources/data/portalcubed/recipes/old_aperture_white_panel_crafting.json index 367b1269..79f445a8 100644 --- a/src/main/resources/data/portalcubed/recipes/old_aperture_white_panel_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/old_aperture_white_panel_crafting.json @@ -7,7 +7,7 @@ ], "key": { "X": { - "tag": "minecraft:logs" + "tag": "minecraft:planks" }, "Y": { "item": "minecraft:white_dye" diff --git a/src/main/resources/data/portalcubed/recipes/propulsion_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/propulsion_gel_blob_crafting.json index 024f6d91..10c130f8 100644 --- a/src/main/resources/data/portalcubed/recipes/propulsion_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/propulsion_gel_blob_crafting.json @@ -8,12 +8,12 @@ "tag": "c:orange_dyes" }, { - "item": "minecraft:packed_ice" + "item": "minecraft:ice" } ], "result": { "item": "portalcubed:propulsion_gel", - "count": 2 + "count": 4 }, "group": "gels" } \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/reflection_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/reflection_gel_blob_crafting.json index 55814e0b..c9f3b1db 100644 --- a/src/main/resources/data/portalcubed/recipes/reflection_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/reflection_gel_blob_crafting.json @@ -13,7 +13,7 @@ ], "result": { "item": "portalcubed:reflection_gel", - "count": 2 + "count": 4 }, "group": "gels" } \ No newline at end of file diff --git a/src/main/resources/data/portalcubed/recipes/repulsion_gel_blob_crafting.json b/src/main/resources/data/portalcubed/recipes/repulsion_gel_blob_crafting.json index ab272a4d..37e919ac 100644 --- a/src/main/resources/data/portalcubed/recipes/repulsion_gel_blob_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/repulsion_gel_blob_crafting.json @@ -13,7 +13,7 @@ ], "result": { "item": "portalcubed:repulsion_gel", - "count": 2 + "count": 4 }, "group": "gels" } \ No newline at end of file