tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Post-Calamity Datagen

Browse source 
- Forfeit deprecated display registry
- Added valve handle to recently updated ponders
- Fixed self-containing ingredient items probably also being affected by the basin dupe
This commit is contained in:
simibubi 2023-05-21 22:00:08 +02:00
parent 691786bbb9
commit c170738a56
6 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/generated/resources/.cache/cache
View file

@ -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

12
src/generated/resources/assets/create/lang/en_us.json
View file

@ -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",

4
src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
View file

@ -102,10 +102,6 @@ public class BasinRecipe extends ProcessingRecipe<SmartInventory> {
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]++;

18
src/main/java/com/simibubi/create/content/redstone/displayLink/AllDisplayBehaviours.java
View file

@ -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"));
});
}
}

1
src/main/java/com/simibubi/create/infrastructure/ponder/AllPonderTags.java
View file

@ -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)

2
src/main/java/com/simibubi/create/infrastructure/ponder/scenes/ArmScenes.java
View file

@ -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();