From c170738a56535c317dabc924633e4a8702ec9bdc Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 21 May 2023 22:00:08 +0200 Subject: [PATCH] Post-Calamity Datagen - Forfeit deprecated display registry - Added valve handle to recently updated ponders - Fixed self-containing ingredient items probably also being affected by the basin dupe --- src/generated/resources/.cache/cache | 2 +- .../resources/assets/create/lang/en_us.json | 12 ++++++------ .../content/processing/basin/BasinRecipe.java | 4 ---- .../displayLink/AllDisplayBehaviours.java | 18 ++++-------------- .../infrastructure/ponder/AllPonderTags.java | 1 + .../ponder/scenes/ArmScenes.java | 2 +- 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c2a0be701..d60ea43e9 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -583,7 +583,7 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json 4fd8347dfb20e6e5752b8b905850762a88c88c02 assets/create/lang/en_ud.json -7064415e6a6c7fc4707318b7cb88adbb2a2a7dc3 assets/create/lang/en_us.json +a442038c7d4f264e50016cff333616b310d717bf assets/create/lang/en_us.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 216f0a147..288cb112a 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1206,7 +1206,7 @@ "create.schematic.mirror.leftRight": "Left-Right", "create.schematic.tool.deploy": "Position", "create.schematic.tool.move": "Move XZ", - "create.schematic.tool.movey": "Move Y", + "create.schematic.tool.move_y": "Move Y", "create.schematic.tool.rotate": "Rotate", "create.schematic.tool.print": "Print", "create.schematic.tool.flip": "Mirror", @@ -1218,10 +1218,10 @@ "create.schematic.tool.move.description.1": "Point at the Schematic and [CTRL]-Scroll to push it.", "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "Shifts the Schematic Vertically.", - "create.schematic.tool.movey.description.1": "[CTRL]-Scroll to move it up/down.", - "create.schematic.tool.movey.description.2": "", - "create.schematic.tool.movey.description.3": "", + "create.schematic.tool.move_y.description.0": "Shifts the Schematic Vertically.", + "create.schematic.tool.move_y.description.1": "[CTRL]-Scroll to move it up/down.", + "create.schematic.tool.move_y.description.2": "", + "create.schematic.tool.move_y.description.3": "", "create.schematic.tool.rotate.description.0": "Rotates the Schematic around its center.", "create.schematic.tool.rotate.description.1": "[CTRL]-Scroll to rotate by 90 Degrees.", "create.schematic.tool.rotate.description.2": "", @@ -2699,7 +2699,7 @@ "create.ponder.mechanical_arm.header": "Setting up Mechanical Arms", "create.ponder.mechanical_arm.text_1": "Mechanical Arms have to be assigned their in- and outputs before they are placed", "create.ponder.mechanical_arm.text_2": "Right-Click inventories while holding the Arm to assign them as Targets", - "create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Orange)", + "create.ponder.mechanical_arm.text_3": "Right-Click again to toggle between Input (Blue) and Output (Yellow)", "create.ponder.mechanical_arm.text_4": "Left-Click components to remove their Selection", "create.ponder.mechanical_arm.text_5": "Once placed, the Mechanical Arm will target the blocks selected previously", "create.ponder.mechanical_arm.text_6": "They can have any amount of in- and outputs within their range", diff --git a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java index 8a6fa7ffe..ddcf9ecaa 100644 --- a/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java +++ b/src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java @@ -102,10 +102,6 @@ public class BasinRecipe extends ProcessingRecipe { ItemStack extracted = availableItems.extractItem(slot, 1, true); if (!ingredient.test(extracted)) continue; - // Catalyst items are never consumed - if (extracted.hasContainerItem() && extracted.getContainerItem() - .sameItem(extracted)) - continue Ingredients; if (!simulate) availableItems.extractItem(slot, 1, false); extractedItemsFromSlot[slot]++; diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java index 4c09736b9..31b58f671 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java @@ -62,11 +62,6 @@ public class AllDisplayBehaviours { TARGETS_BY_BLOCK.register(block, target); } } - - @Deprecated - public static void assignTile(DisplayBehaviour behaviour, ResourceLocation beType) { - assignBlockEntity(behaviour, beType); - } public static void assignBlockEntity(DisplayBehaviour behaviour, ResourceLocation beType) { if (behaviour instanceof DisplaySource source) { @@ -95,11 +90,6 @@ public class AllDisplayBehaviours { TARGETS_BY_BLOCK.register(block, target); } } - - @Deprecated - public static void assignTile(DisplayBehaviour behaviour, BlockEntityType beType) { - assignBlockEntity(behaviour, beType); - } public static void assignBlockEntity(DisplayBehaviour behaviour, BlockEntityType beType) { if (behaviour instanceof DisplaySource source) { @@ -247,10 +237,10 @@ public class AllDisplayBehaviours { Mods.COMPUTERCRAFT.executeIfInstalled(() -> () -> { DisplayBehaviour computerDisplaySource = register(Create.asResource("computer_display_source"), new ComputerDisplaySource()); - assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "wired_modem_full")); - assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_normal")); - assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced")); - assignTile(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_command")); + assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "wired_modem_full")); + assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_normal")); + assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_advanced")); + assignBlockEntity(computerDisplaySource, new ResourceLocation(Mods.COMPUTERCRAFT.asId(), "computer_command")); }); } } diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java b/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java index 600dcfcf4..ed99bdc0c 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java @@ -99,6 +99,7 @@ public class AllPonderTags { PonderRegistry.TAGS.forTag(RECENTLY_UPDATED) .add(AllBlocks.WATER_WHEEL) .add(AllBlocks.LARGE_WATER_WHEEL) + .add(AllBlocks.COPPER_VALVE_HANDLE) .add(AllBlocks.ELEVATOR_PULLEY) .add(AllBlocks.CONTRAPTION_CONTROLS) .add(AllBlocks.MECHANICAL_ROLLER) diff --git a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java index ec9cdc8a8..6ce2092e0 100644 --- a/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java +++ b/src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java @@ -82,7 +82,7 @@ public class ArmScenes { scene.overlay.chaseBoundingBoxOutline(PonderPalette.OUTPUT, second, depotBounds.move(0, 2, 1), 280); scene.overlay.showText(70) .colored(PonderPalette.OUTPUT) - .text("Right-Click again to toggle between Input (Blue) and Output (Orange)") + .text("Right-Click again to toggle between Input (Blue) and Output (Yellow)") .pointAt(util.vector.blockSurface(outputDepot, Direction.WEST)) .placeNearTarget();