From 810e178228aff1553360f5b040329843c42b8571 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:40:45 -0500 Subject: [PATCH 01/14] Moar molds --- .../java/gregtech/common/items/MetaItem1.java | 46 +++++++++++++ .../java/gregtech/common/items/MetaItems.java | 17 ++++- .../recipe/handlers/PartsRecipeHandler.java | 63 ++++++++++++++++++ .../recipe/handlers/PipeRecipeHandler.java | 45 +++++++++++++ .../resources/assets/gregtech/lang/en_us.lang | 30 +++++++++ .../item/metaitems/shape.mold.bolt.json | 6 ++ .../item/metaitems/shape.mold.pipe.huge.json | 6 ++ .../item/metaitems/shape.mold.pipe.large.json | 6 ++ .../metaitems/shape.mold.pipe.normal.json | 6 ++ .../item/metaitems/shape.mold.pipe.small.json | 6 ++ .../item/metaitems/shape.mold.pipe.tiny.json | 6 ++ .../item/metaitems/shape.mold.ring.json | 6 ++ .../models/item/metaitems/shape.mold.rod.json | 6 ++ .../item/metaitems/shape.mold.rod_long.json | 6 ++ .../item/metaitems/shape.mold.round.json | 6 ++ .../item/metaitems/shape.mold.screw.json | 6 ++ .../metaitems/shape.mold.turbine_blade.json | 6 ++ .../items/metaitems/shape.mold.bolt.png | Bin 0 -> 3056 bytes .../items/metaitems/shape.mold.pipe.huge.png | Bin 0 -> 3089 bytes .../items/metaitems/shape.mold.pipe.large.png | Bin 0 -> 3073 bytes .../metaitems/shape.mold.pipe.normal.png | Bin 0 -> 3072 bytes .../items/metaitems/shape.mold.pipe.small.png | Bin 0 -> 3063 bytes .../items/metaitems/shape.mold.pipe.tiny.png | Bin 0 -> 3058 bytes .../items/metaitems/shape.mold.ring.png | Bin 0 -> 3127 bytes .../items/metaitems/shape.mold.rod.png | Bin 0 -> 3060 bytes .../items/metaitems/shape.mold.rod_long.png | Bin 0 -> 3033 bytes .../items/metaitems/shape.mold.round.png | Bin 0 -> 3097 bytes .../items/metaitems/shape.mold.screw.png | Bin 0 -> 3103 bytes .../metaitems/shape.mold.turbine_blade.png | Bin 0 -> 3140 bytes 29 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bolt.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.huge.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.large.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.normal.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.small.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.tiny.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.ring.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod_long.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.round.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bolt.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.huge.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.large.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.normal.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.small.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.ring.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.rod.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.rod_long.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.round.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.screw.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index cdf8d42deda..ff3b3241cdb 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -6,6 +6,7 @@ import gregtech.api.items.metaitem.ElectricStats; import gregtech.api.items.metaitem.FilteredFluidStats; import gregtech.api.items.metaitem.FoodStats; +import gregtech.api.items.metaitem.MetaItem; import gregtech.api.items.metaitem.MusicDiscStats; import gregtech.api.items.metaitem.StandardMetaItem; import gregtech.api.items.metaitem.stats.IItemComponent; @@ -61,13 +62,17 @@ import gregtech.core.sound.GTSoundEvents; import net.minecraft.client.resources.I18n; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import org.jetbrains.annotations.NotNull; + import static gregtech.api.GTValues.M; import static gregtech.api.util.DyeUtil.getOredictColorName; import static gregtech.common.items.MetaItems.*; @@ -78,6 +83,15 @@ public MetaItem1() { super(); } + @Override + public void getSubItems(@NotNull CreativeTabs tab, @NotNull NonNullList subItems) { + if (!isInCreativeTab(tab)) return; + for (MetaItem.MetaValueItem item : metaItems.values()) { + if (!item.isInCreativeTab(tab)) continue; + item.getSubItemHandler().getSubItems(item.getStackForm(), tab, subItems); + } + } + @Override public void registerSubItems() { // Credits: ID 0-10 @@ -131,6 +145,18 @@ public void registerSubItems() { .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); SHAPE_MOLDS[12] = SHAPE_MOLD_ROTOR = addItem(24, "shape.mold.rotor") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[13] = SHAPE_MOLD_RING = addItem(25, "shape.mold.ring") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[14] = SHAPE_MOLD_BOLT = addItem(26, "shape.mold.bolt") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[15] = SHAPE_MOLD_ROD = addItem(27, "shape.mold.rod") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[16] = SHAPE_MOLD_ROD_LONG = addItem(28, "shape.mold.rod_long") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[17] = SHAPE_MOLD_SCREW = addItem(29, "shape.mold.screw") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[18] = SHAPE_MOLD_ROUND = addItem(30, "shape.mold.round") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); // Extruder Shapes: ID 31-59 SHAPE_EXTRUDERS[0] = SHAPE_EXTRUDER_PLATE = addItem(31, "shape.extruder.plate") @@ -1143,5 +1169,25 @@ public void registerSubItems() { MULTIBLOCK_BUILDER = addItem(1004, "tool.multiblock_builder").addComponents(new MultiblockBuilderBehavior()) .setMaxStackSize(1); + + // Extra molds 1005-1013 + SHAPE_MOLDS[19] = SHAPE_MOLD_TURBINE_BLADE = addItem(1005, "shape.mold.turbine_blade") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[20] = SHAPE_MOLD_PIPE_TINY = addItem(1006, "shape.mold.pipe.tiny") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[21] = SHAPE_MOLD_PIPE_SMALL = addItem(1007, "shape.mold.pipe.small") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[22] = SHAPE_MOLD_PIPE_NORMAL = addItem(1008, "shape.mold.pipe.normal") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[23] = SHAPE_MOLD_PIPE_LARGE = addItem(1009, "shape.mold.pipe.large") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[24] = SHAPE_MOLD_PIPE_HUGE = addItem(1010, "shape.mold.pipe.huge") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[25] = SHAPE_MOLD_BUN = addItem(1011, "shape.mold.bun") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[26] = SHAPE_MOLD_BREAD = addItem(1012, "shape.mold.bread") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + SHAPE_MOLDS[27] = SHAPE_MOLD_BAGUETTE = addItem(1013, "shape.mold.baguette") + .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); } } diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 303588e6dc8..234c53377c4 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -57,7 +57,7 @@ private MetaItems() {} public static MetaItem.MetaValueItem SHAPE_EMPTY; - public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[13]; + public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[28]; public static MetaItem.MetaValueItem SHAPE_MOLD_PLATE; public static MetaItem.MetaValueItem SHAPE_MOLD_GEAR; public static MetaItem.MetaValueItem SHAPE_MOLD_CREDIT; @@ -71,6 +71,21 @@ private MetaItems() {} public static MetaItem.MetaValueItem SHAPE_MOLD_NAME; public static MetaItem.MetaValueItem SHAPE_MOLD_GEAR_SMALL; public static MetaItem.MetaValueItem SHAPE_MOLD_ROTOR; + public static MetaItem.MetaValueItem SHAPE_MOLD_RING; + public static MetaItem.MetaValueItem SHAPE_MOLD_BOLT; + public static MetaItem.MetaValueItem SHAPE_MOLD_ROD; + public static MetaItem.MetaValueItem SHAPE_MOLD_ROD_LONG; + public static MetaItem.MetaValueItem SHAPE_MOLD_SCREW; + public static MetaItem.MetaValueItem SHAPE_MOLD_ROUND; + public static MetaItem.MetaValueItem SHAPE_MOLD_TURBINE_BLADE; + public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_TINY; + public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_SMALL; + public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_NORMAL; + public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_LARGE; + public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_HUGE; + public static MetaItem.MetaValueItem SHAPE_MOLD_BUN; + public static MetaItem.MetaValueItem SHAPE_MOLD_BREAD; + public static MetaItem.MetaValueItem SHAPE_MOLD_BAGUETTE; public static final MetaItem.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[27]; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PLATE; diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index ddff63fd34a..7d6932a3b6b 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -86,6 +86,15 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp .buildAndRegister(); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_BOLT) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) + .output(boltPrefix, material) + .EUt(VA[ULV]).duration(4) + .buildAndRegister(); + } } public static void processScrew(OrePrefix screwPrefix, Material material, DustProperty property) { @@ -101,6 +110,15 @@ public static void processScrew(OrePrefix screwPrefix, Material material, DustPr ModHandler.addShapedRecipe(String.format("screw_%s", material), screwStack, "fX", "X ", 'X', new UnificationEntry(OrePrefix.bolt, material)); + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_SCREW) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) + .output(screwPrefix, material) + .EUt(VA[ULV]).duration(4) + .buildAndRegister(); + } } public static void processFoil(OrePrefix foilPrefix, Material material, IngotProperty property) { @@ -364,6 +382,15 @@ public static void processRing(OrePrefix ringPrefix, Material material, IngotPro .EUt(6 * getVoltageMultiplier(material)) .buildAndRegister(); } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_RING) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 4)) + .output(ringPrefix, material) + .EUt(VA[ULV]).duration(5) + .buildAndRegister(); + } } public static void processSpringSmall(OrePrefix springPrefix, Material material, IngotProperty property) { @@ -459,6 +486,15 @@ public static void processStick(OrePrefix stickPrefix, Material material, DustPr "s ", " X", 'X', new UnificationEntry(OrePrefix.stick, material)); } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_ROD) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) + .output(stickPrefix, material) + .EUt(VA[ULV]).duration(8) + .buildAndRegister(); + } } public static void processLongStick(OrePrefix longStickPrefix, Material material, DustProperty property) { @@ -519,6 +555,15 @@ public static void processLongStick(OrePrefix longStickPrefix, Material material .buildAndRegister(); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_ROD_LONG) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) + .output(longStickPrefix, material) + .EUt(VA[ULV]).duration(16) + .buildAndRegister(); + } } public static void processTurbine(OrePrefix toolPrefix, Material material, IngotProperty property) { @@ -549,6 +594,15 @@ public static void processTurbine(OrePrefix toolPrefix, Material material, Ingot 'P', new UnificationEntry(OrePrefix.plateDouble, material), 'S', new UnificationEntry(OrePrefix.screw, material)); } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_TURBINE_BLADE) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 10 + L / 4)) + .output(toolPrefix, material) + .EUt(VA[ULV]).duration(25) + .buildAndRegister(); + } } public static void processRound(OrePrefix roundPrefix, Material material, IngotProperty property) { @@ -567,6 +621,15 @@ public static void processRound(OrePrefix roundPrefix, Material material, IngotP .input(nugget, material) .output(round, material) .buildAndRegister(); + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_ROUND) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 9)) + .output(roundPrefix, material) + .EUt(VA[ULV]).duration(2) + .buildAndRegister(); + } } private static int getVoltageMultiplier(Material material) { diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java index bd58e4263e8..89d44904db0 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java @@ -118,6 +118,15 @@ private static void processPipeTiny(OrePrefix pipePrefix, Material material, IMa 'X', new UnificationEntry(OrePrefix.plate, material)); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_PIPE_TINY) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) + .output(pipePrefix, material) + .EUt(VA[ULV]).duration(4) + .buildAndRegister(); + } } private static void processPipeSmall(OrePrefix pipePrefix, Material material, IMaterialProperty property) { @@ -160,6 +169,15 @@ private static void processPipeSmall(OrePrefix pipePrefix, Material material, IM 'X', new UnificationEntry(OrePrefix.plate, material)); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_PIPE_SMALL) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) + .output(pipePrefix, material) + .EUt(VA[ULV]).duration(8) + .buildAndRegister(); + } } private static void processPipeNormal(OrePrefix pipePrefix, Material material, IMaterialProperty property) { @@ -202,6 +220,15 @@ private static void processPipeNormal(OrePrefix pipePrefix, Material material, I 'X', new UnificationEntry(OrePrefix.plate, material)); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_PIPE_NORMAL) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 3)) + .output(pipePrefix, material) + .EUt(VA[ULV]).duration(24) + .buildAndRegister(); + } } private static void processPipeLarge(OrePrefix pipePrefix, Material material, IMaterialProperty property) { @@ -243,6 +270,15 @@ private static void processPipeLarge(OrePrefix pipePrefix, Material material, IM 'X', new UnificationEntry(OrePrefix.plate, material)); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_PIPE_LARGE) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 6)) + .output(pipePrefix, material) + .EUt(VA[ULV]).duration(48) + .buildAndRegister(); + } } private static void processPipeHuge(OrePrefix pipePrefix, Material material, IMaterialProperty property) { @@ -284,6 +320,15 @@ private static void processPipeHuge(OrePrefix pipePrefix, Material material, IMa 'X', new UnificationEntry(OrePrefix.plateDouble, material)); } } + + if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { + RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .notConsumable(MetaItems.SHAPE_MOLD_PIPE_HUGE) + .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 12)) + .output(pipePrefix, material) + .EUt(VA[ULV]).duration(96) + .buildAndRegister(); + } } private static void processPipeQuadruple(OrePrefix pipePrefix, Material material, FluidPipeProperties property) { diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 389d68cd3ce..b1cc87b3e39 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -248,6 +248,36 @@ metaitem.shape.mold.gear.small.name=Mold (Small Gear) metaitem.shape.mold.gear.small.tooltip=Mold for making small Gears metaitem.shape.mold.rotor.name=Mold (Rotor) metaitem.shape.mold.rotor.tooltip=Mold for making Rotors +metaitem.shape.mold.bolt.name=Mold (Bolt) +metaitem.shape.mold.bolt.tooltip=Mold for making bolts +metaitem.shape.mold.pipe.tiny.name=Mold (Tiny Pipe) +metaitem.shape.mold.pipe.tiny.tooltip=Mold for making tiny pipes +metaitem.shape.mold.pipe.small.name=Mold (Small Pipe) +metaitem.shape.mold.pipe.small.tooltip=Mold for making small pipes +metaitem.shape.mold.pipe.normal.name=Mold (Normal Pipe) +metaitem.shape.mold.pipe.normal.tooltip=Mold for making normal pipes +metaitem.shape.mold.pipe.large.name=Mold (Large Pipe) +metaitem.shape.mold.pipe.large.tooltip=Mold for making large pipes +metaitem.shape.mold.pipe.huge.name=Mold (Huge Pipe) +metaitem.shape.mold.pipe.huge.tooltip=Mold for making huge pipes +metaitem.shape.mold.ring.name=Mold (Ring) +metaitem.shape.mold.ring.tooltip=Mold for making rings +metaitem.shape.mold.rod.name=Mold (Rod) +metaitem.shape.mold.rod.tooltip=Mold for making rods +metaitem.shape.mold.rod_long.name=Mold (Long Rod) +metaitem.shape.mold.rod_long.tooltip=Mold for making long rods +metaitem.shape.mold.round.name=Mold (Round) +metaitem.shape.mold.round.tooltip=Mold for making rounds +metaitem.shape.mold.screw.name=Mold (Screw) +metaitem.shape.mold.screw.tooltip=Mold for making screws +metaitem.shape.mold.turbine_blade.name=Mold (Turbine Blade) +metaitem.shape.mold.turbine_blade.tooltip=Mold for making turbine blades +metaitem.shape.mold.bun.name=Mold (Bun) +metaitem.shape.mold.bun.tooltip=Mold for making buns +metaitem.shape.mold.bread.name=Mold (Bread) +metaitem.shape.mold.bread.tooltip=Mold for making bread +metaitem.shape.mold.baguette.name=Mold (Baguette) +metaitem.shape.mold.baguette.tooltip=Mold for making baguettes metaitem.shape.extruder.plate.name=Extruder Shape (Plate) metaitem.shape.extruder.plate.tooltip=Extruder Shape for making Plates diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bolt.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bolt.json new file mode 100644 index 00000000000..78850436b46 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bolt.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.bolt" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.huge.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.huge.json new file mode 100644 index 00000000000..3bbcda2c1c9 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.huge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.pipe.huge" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.large.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.large.json new file mode 100644 index 00000000000..d39a2bc6d51 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.large.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.pipe.large" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.normal.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.normal.json new file mode 100644 index 00000000000..0341f7bdce3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.normal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.pipe.normal" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.small.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.small.json new file mode 100644 index 00000000000..aabf5ec72dc --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.small.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.pipe.small" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.tiny.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.tiny.json new file mode 100644 index 00000000000..952bf449066 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.pipe.tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.pipe.tiny" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.ring.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.ring.json new file mode 100644 index 00000000000..0887944b5e3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.ring.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.ring" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod.json new file mode 100644 index 00000000000..fb86e3f5195 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.rod" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod_long.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod_long.json new file mode 100644 index 00000000000..a7f8cfb6764 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.rod_long.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.rod_long" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.round.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.round.json new file mode 100644 index 00000000000..885f5da5918 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.round.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.round" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json new file mode 100644 index 00000000000..807ba95ce7e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.screw" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json new file mode 100644 index 00000000000..cd4fea169c2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/shape.mold.turbine_blade" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bolt.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bolt.png new file mode 100644 index 0000000000000000000000000000000000000000..0a1180020850469dafb6466be87c07870b973912 GIT binary patch literal 3056 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 P00000NkvXXu0mjfU8%Zu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.normal.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.normal.png new file mode 100644 index 0000000000000000000000000000000000000000..9141b7c1c9070400b039c10a9a3d2a177557643e GIT binary patch literal 3072 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 FV1k*BvW@@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5d77351b8d2c3696d1e63f9102cb2ed1e4e746 GIT binary patch literal 3058 zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0003UNklBf+W06 zQvr}p0MIuN8^_K4O#W>KNnzm#wissIlBx|=vLI+f66Awb)o4TU?(+kI4;cH_^W{8- zjrlPgNI8DUhrOC$Dj|R%ZxVSUFhuO&&?yK5s!b4Lwmc&B zHg~9TS(Y@tPetA5SXZPzTG+NNbprpT6aH}h0AX+;M1& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.ring.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.ring.png new file mode 100644 index 0000000000000000000000000000000000000000..9d8a94e24a3850243278509595ec2f35782d8dec GIT binary patch literal 3127 zcmV-749N3|P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0004ENkliVu)nV!cQ5LH)EQ$yp2o33f~LKJ@%;jGxlb zGz?RvDydXjYy9LmKq-ae@z^qg$Ruj*Z^U$y%%Dakqkli0PNlVm0UeyNf-;Hh;GDp* zfRoJR_u>D3rTyUoIEq-A+U-7B&hhGEvMP zk8JA2YxU$U?gKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0003WNkl?IERvch&#^&N+DRlSohk&GJr`N011kK~!bkG)-B+d!HmWNCK5%6__2oEDHc6 z0B!()&AD^zo$EQqh;baNK#OpObA$#HF-BZJuee-3P?;uBVF@Ckvey_D{<_@|!cTrj z_5y+=(71EeAFz%UNR~yqCLZCfvE|+-AlcS9l`)>2Maa}ljuC3fFEjU*F^_gHprR}x zbZ`uzbIh?sfhBH>K*C7G5Snw$&Q>Z@fvv_=Ux5)0*u%S6$0?m65Rc~ra6pWqlvz98 zx}GDv7~?$8?*4sGNH|?;pY=Y%x~^^$D8IDBKh`hp_w(HGhUJX_0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00035Nkl&H=e!rFvA?M6D z*9#zoz&MWC60%WB=2+bHRz>VIHg9oVT1=}NrY zZt%&0osQyM*LYL5aB>s5M%XPsX6~KU)$Rk1E!ajjO9#g}c8VpIWmMy~2ogzRU6!UC zi*l;YT;a6GbRQv!b-lo+Sl2CGN?bZP##n9cjjQWG&uaw2dl+(@kK3Ur200000NkvXXu0mjfe37UV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.round.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.round.png new file mode 100644 index 0000000000000000000000000000000000000000..9cce46e543847ab22273bac45c1b02fcd2f4d3e0 GIT binary patch literal 3097 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..655fab63c697e47cde48d0ecccfddd587108f34f GIT binary patch literal 3140 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 Date: Thu, 21 Nov 2024 20:15:00 -0500 Subject: [PATCH 02/14] Keep the molds together in a group in JEI/creative tabs --- src/main/java/gregtech/common/items/MetaItem1.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index ff3b3241cdb..d047e431c63 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -88,7 +88,18 @@ public void getSubItems(@NotNull CreativeTabs tab, @NotNull NonNullList.MetaValueItem item : metaItems.values()) { if (!item.isInCreativeTab(tab)) continue; + + int itemMetaData = item.getMetaValue(); + if (itemMetaData >= 1004 && itemMetaData <= 1013) continue; + item.getSubItemHandler().getSubItems(item.getStackForm(), tab, subItems); + + if (itemMetaData == 30) { + for (MetaItem.MetaValueItem moldItem : SHAPE_MOLDS) { + if (moldItem.getMetaValue() < 1005) continue; + moldItem.getSubItemHandler().getSubItems(moldItem.getStackForm(), tab, subItems); + } + } } } From c91dec5a18df1bba26dfaa55303bd6ac90ef1457 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:28:18 -0500 Subject: [PATCH 03/14] Recipes for molds --- .../loaders/recipe/CraftingRecipeLoader.java | 165 +++++++++++++++--- 1 file changed, 140 insertions(+), 25 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index 8b18ba7a811..d8d6921e184 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -223,32 +223,147 @@ private static void loadCraftingRecipes() { ModHandler.addShapedRecipe("shape_extruder_rotor", SHAPE_EXTRUDER_ROTOR.getStackForm(), " ", " S ", "x ", 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_rotor", SHAPE_MOLD_ROTOR.getStackForm(), " h", " S ", " ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_gear_small", SHAPE_MOLD_GEAR_SMALL.getStackForm(), " ", " ", "h S", + ModHandler.addShapedRecipe("shape_mold_rotor", SHAPE_MOLD_ROTOR.getStackForm(), + " h", + " S ", + " ", 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_name", SHAPE_MOLD_NAME.getStackForm(), " S", " ", "h ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_anvil", SHAPE_MOLD_ANVIL.getStackForm(), " S", " ", " h ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_cylinder", SHAPE_MOLD_CYLINDER.getStackForm(), " S", " ", " h", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_nugget", SHAPE_MOLD_NUGGET.getStackForm(), "S h", " ", " ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_block", SHAPE_MOLD_BLOCK.getStackForm(), " ", "hS ", " ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_ball", SHAPE_MOLD_BALL.getStackForm(), " ", " S ", "h ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_ingot", SHAPE_MOLD_INGOT.getStackForm(), " ", " S ", " h ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_bottle", SHAPE_MOLD_BOTTLE.getStackForm(), " ", " S ", " h", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_credit", SHAPE_MOLD_CREDIT.getStackForm(), "h ", " S ", " ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_gear", SHAPE_MOLD_GEAR.getStackForm(), " ", " Sh", " ", 'S', - SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_plate", SHAPE_MOLD_PLATE.getStackForm(), " h ", " S ", " ", 'S', - SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_gear_small", SHAPE_MOLD_GEAR_SMALL.getStackForm(), + " ", + " ", + "h S", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_name", SHAPE_MOLD_NAME.getStackForm(), + " S", + " ", + "h ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_anvil", SHAPE_MOLD_ANVIL.getStackForm(), + " S", + " ", + " h ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_cylinder", SHAPE_MOLD_CYLINDER.getStackForm(), + " S", + " ", + " h", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_nugget", SHAPE_MOLD_NUGGET.getStackForm(), + "S h", + " ", + " ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_block", SHAPE_MOLD_BLOCK.getStackForm(), + " ", + "hS ", + " ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_ball", SHAPE_MOLD_BALL.getStackForm(), + " ", + " S ", + "h ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_ingot", SHAPE_MOLD_INGOT.getStackForm(), + " ", + " S ", + " h ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_bottle", SHAPE_MOLD_BOTTLE.getStackForm(), + " ", + " S ", + " h", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_credit", SHAPE_MOLD_CREDIT.getStackForm(), + "h ", + " S ", + " ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_gear", SHAPE_MOLD_GEAR.getStackForm(), + " ", + " Sh", + " ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_plate", SHAPE_MOLD_PLATE.getStackForm(), + " h ", + " S ", + " ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_ring", SHAPE_MOLD_RING.getStackForm(), + " ", + " h ", + " S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_bolt", SHAPE_MOLD_BOLT.getStackForm(), + "h ", + " ", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_rod", SHAPE_MOLD_ROD.getStackForm(), + " h ", + " ", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_rod_long", SHAPE_MOLD_ROD_LONG.getStackForm(), + " h", + " ", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_screw", SHAPE_MOLD_SCREW.getStackForm(), + " ", + "h ", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_round", SHAPE_MOLD_ROUND.getStackForm(), + " ", + " h ", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_turbine_blade", SHAPE_MOLD_TURBINE_BLADE.getStackForm(), + " ", + " h", + "S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_pipe_tiny", SHAPE_MOLD_PIPE_TINY.getStackForm(), + " ", + " ", + "Sh ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_pipe_small", SHAPE_MOLD_PIPE_SMALL.getStackForm(), + " ", + " ", + "S h", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_pipe_normal", SHAPE_MOLD_PIPE_NORMAL.getStackForm(), + " ", + " ", + " Sh", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_pipe_large", SHAPE_MOLD_PIPE_LARGE.getStackForm(), + " ", + " ", + "hS ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_pipe_huge", SHAPE_MOLD_PIPE_HUGE.getStackForm(), + " ", + " h", + " S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_bun", SHAPE_MOLD_BUN.getStackForm(), + " ", + "h ", + " S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_bread", SHAPE_MOLD_BREAD.getStackForm(), + "h ", + " ", + " S ", + 'S', SHAPE_EMPTY.getStackForm()); + ModHandler.addShapedRecipe("shape_mold_baguette", SHAPE_MOLD_BAGUETTE.getStackForm(), + " ", + " h", + " S ", + 'S', SHAPE_EMPTY.getStackForm()); + /////////////////////////////////////////////////// // Credits // From 936e677e839920546ae9bed35c573a1b0607dc9b Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:33:28 -0500 Subject: [PATCH 04/14] A "little" bit of balancing --- .../recipe/handlers/PartsRecipeHandler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index 7d6932a3b6b..cbe9bf3b88b 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -92,7 +92,7 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp .notConsumable(MetaItems.SHAPE_MOLD_BOLT) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) .output(boltPrefix, material) - .EUt(VA[ULV]).duration(4) + .EUt(VA[ULV]).duration(6) .buildAndRegister(); } } @@ -116,7 +116,7 @@ public static void processScrew(OrePrefix screwPrefix, Material material, DustPr .notConsumable(MetaItems.SHAPE_MOLD_SCREW) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) .output(screwPrefix, material) - .EUt(VA[ULV]).duration(4) + .EUt(VA[ULV]).duration(7) .buildAndRegister(); } } @@ -388,7 +388,7 @@ public static void processRing(OrePrefix ringPrefix, Material material, IngotPro .notConsumable(MetaItems.SHAPE_MOLD_RING) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 4)) .output(ringPrefix, material) - .EUt(VA[ULV]).duration(5) + .EUt(VA[ULV]).duration(3) .buildAndRegister(); } } @@ -492,7 +492,7 @@ public static void processStick(OrePrefix stickPrefix, Material material, DustPr .notConsumable(MetaItems.SHAPE_MOLD_ROD) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) .output(stickPrefix, material) - .EUt(VA[ULV]).duration(8) + .EUt(VA[ULV]).duration(10) .buildAndRegister(); } } @@ -561,7 +561,7 @@ public static void processLongStick(OrePrefix longStickPrefix, Material material .notConsumable(MetaItems.SHAPE_MOLD_ROD_LONG) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) .output(longStickPrefix, material) - .EUt(VA[ULV]).duration(16) + .EUt(VA[ULV]).duration(20) .buildAndRegister(); } } @@ -600,7 +600,7 @@ public static void processTurbine(OrePrefix toolPrefix, Material material, Ingot .notConsumable(MetaItems.SHAPE_MOLD_TURBINE_BLADE) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 10 + L / 4)) .output(toolPrefix, material) - .EUt(VA[ULV]).duration(25) + .EUt(VA[ULV]).duration(50) .buildAndRegister(); } } @@ -627,7 +627,7 @@ public static void processRound(OrePrefix roundPrefix, Material material, IngotP .notConsumable(MetaItems.SHAPE_MOLD_ROUND) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 9)) .output(roundPrefix, material) - .EUt(VA[ULV]).duration(2) + .EUt(VA[ULV]).duration(5) .buildAndRegister(); } } From 22d031de0cdbbdd7409f2783927cc20de518b51c Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:40:59 -0500 Subject: [PATCH 05/14] spotless --- src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index d8d6921e184..d313d590f44 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -364,7 +364,6 @@ private static void loadCraftingRecipes() { " S ", 'S', SHAPE_EMPTY.getStackForm()); - /////////////////////////////////////////////////// // Credits // /////////////////////////////////////////////////// From 13cc3583e11fc7816b2a3a8eb6793e3ee039d8c6 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 26 Apr 2025 23:20:38 -0400 Subject: [PATCH 06/14] Address review pt1: Remove food molds Remove turbine solidifying Pipe EUt and duration scale properly --- .../java/gregtech/common/items/MetaItem1.java | 24 ++++++------------ .../java/gregtech/common/items/MetaItems.java | 7 +----- .../loaders/recipe/CraftingRecipeLoader.java | 25 ------------------- .../recipe/handlers/PartsRecipeHandler.java | 18 ------------- .../recipe/handlers/PipeRecipeHandler.java | 10 ++++---- 5 files changed, 13 insertions(+), 71 deletions(-) diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index d047e431c63..c9e9509a9ac 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -164,9 +164,7 @@ public void registerSubItems() { .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); SHAPE_MOLDS[16] = SHAPE_MOLD_ROD_LONG = addItem(28, "shape.mold.rod_long") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[17] = SHAPE_MOLD_SCREW = addItem(29, "shape.mold.screw") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[18] = SHAPE_MOLD_ROUND = addItem(30, "shape.mold.round") + SHAPE_MOLDS[17] = SHAPE_MOLD_ROUND = addItem(30, "shape.mold.round") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); // Extruder Shapes: ID 31-59 @@ -1181,24 +1179,16 @@ public void registerSubItems() { MULTIBLOCK_BUILDER = addItem(1004, "tool.multiblock_builder").addComponents(new MultiblockBuilderBehavior()) .setMaxStackSize(1); - // Extra molds 1005-1013 - SHAPE_MOLDS[19] = SHAPE_MOLD_TURBINE_BLADE = addItem(1005, "shape.mold.turbine_blade") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[20] = SHAPE_MOLD_PIPE_TINY = addItem(1006, "shape.mold.pipe.tiny") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[21] = SHAPE_MOLD_PIPE_SMALL = addItem(1007, "shape.mold.pipe.small") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[22] = SHAPE_MOLD_PIPE_NORMAL = addItem(1008, "shape.mold.pipe.normal") - .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[23] = SHAPE_MOLD_PIPE_LARGE = addItem(1009, "shape.mold.pipe.large") + // Extra molds 1006-1010 + SHAPE_MOLDS[17] = SHAPE_MOLD_PIPE_TINY = addItem(1006, "shape.mold.pipe.tiny") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[24] = SHAPE_MOLD_PIPE_HUGE = addItem(1010, "shape.mold.pipe.huge") + SHAPE_MOLDS[18] = SHAPE_MOLD_PIPE_SMALL = addItem(1007, "shape.mold.pipe.small") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[25] = SHAPE_MOLD_BUN = addItem(1011, "shape.mold.bun") + SHAPE_MOLDS[19] = SHAPE_MOLD_PIPE_NORMAL = addItem(1008, "shape.mold.pipe.normal") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[26] = SHAPE_MOLD_BREAD = addItem(1012, "shape.mold.bread") + SHAPE_MOLDS[20] = SHAPE_MOLD_PIPE_LARGE = addItem(1009, "shape.mold.pipe.large") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[27] = SHAPE_MOLD_BAGUETTE = addItem(1013, "shape.mold.baguette") + SHAPE_MOLDS[21] = SHAPE_MOLD_PIPE_HUGE = addItem(1010, "shape.mold.pipe.huge") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); } } diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 234c53377c4..e6527fefd53 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -57,7 +57,7 @@ private MetaItems() {} public static MetaItem.MetaValueItem SHAPE_EMPTY; - public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[28]; + public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[22]; public static MetaItem.MetaValueItem SHAPE_MOLD_PLATE; public static MetaItem.MetaValueItem SHAPE_MOLD_GEAR; public static MetaItem.MetaValueItem SHAPE_MOLD_CREDIT; @@ -75,17 +75,12 @@ private MetaItems() {} public static MetaItem.MetaValueItem SHAPE_MOLD_BOLT; public static MetaItem.MetaValueItem SHAPE_MOLD_ROD; public static MetaItem.MetaValueItem SHAPE_MOLD_ROD_LONG; - public static MetaItem.MetaValueItem SHAPE_MOLD_SCREW; public static MetaItem.MetaValueItem SHAPE_MOLD_ROUND; - public static MetaItem.MetaValueItem SHAPE_MOLD_TURBINE_BLADE; public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_TINY; public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_SMALL; public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_NORMAL; public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_LARGE; public static MetaItem.MetaValueItem SHAPE_MOLD_PIPE_HUGE; - public static MetaItem.MetaValueItem SHAPE_MOLD_BUN; - public static MetaItem.MetaValueItem SHAPE_MOLD_BREAD; - public static MetaItem.MetaValueItem SHAPE_MOLD_BAGUETTE; public static final MetaItem.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[27]; public static MetaItem.MetaValueItem SHAPE_EXTRUDER_PLATE; diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index d313d590f44..145daa36381 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -308,21 +308,11 @@ private static void loadCraftingRecipes() { " ", "S ", 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_screw", SHAPE_MOLD_SCREW.getStackForm(), - " ", - "h ", - "S ", - 'S', SHAPE_EMPTY.getStackForm()); ModHandler.addShapedRecipe("shape_mold_round", SHAPE_MOLD_ROUND.getStackForm(), " ", " h ", "S ", 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_turbine_blade", SHAPE_MOLD_TURBINE_BLADE.getStackForm(), - " ", - " h", - "S ", - 'S', SHAPE_EMPTY.getStackForm()); ModHandler.addShapedRecipe("shape_mold_pipe_tiny", SHAPE_MOLD_PIPE_TINY.getStackForm(), " ", " ", @@ -348,21 +338,6 @@ private static void loadCraftingRecipes() { " h", " S ", 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_bun", SHAPE_MOLD_BUN.getStackForm(), - " ", - "h ", - " S ", - 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_bread", SHAPE_MOLD_BREAD.getStackForm(), - "h ", - " ", - " S ", - 'S', SHAPE_EMPTY.getStackForm()); - ModHandler.addShapedRecipe("shape_mold_baguette", SHAPE_MOLD_BAGUETTE.getStackForm(), - " ", - " h", - " S ", - 'S', SHAPE_EMPTY.getStackForm()); /////////////////////////////////////////////////// // Credits // diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index cbe9bf3b88b..ca3a5e80a8e 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -110,15 +110,6 @@ public static void processScrew(OrePrefix screwPrefix, Material material, DustPr ModHandler.addShapedRecipe(String.format("screw_%s", material), screwStack, "fX", "X ", 'X', new UnificationEntry(OrePrefix.bolt, material)); - - if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(MetaItems.SHAPE_MOLD_SCREW) - .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) - .output(screwPrefix, material) - .EUt(VA[ULV]).duration(7) - .buildAndRegister(); - } } public static void processFoil(OrePrefix foilPrefix, Material material, IngotProperty property) { @@ -594,15 +585,6 @@ public static void processTurbine(OrePrefix toolPrefix, Material material, Ingot 'P', new UnificationEntry(OrePrefix.plateDouble, material), 'S', new UnificationEntry(OrePrefix.screw, material)); } - - if (material.hasFluid() && material.getProperty(PropertyKey.FLUID).solidifiesFrom() != null) { - RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .notConsumable(MetaItems.SHAPE_MOLD_TURBINE_BLADE) - .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 10 + L / 4)) - .output(toolPrefix, material) - .EUt(VA[ULV]).duration(50) - .buildAndRegister(); - } } public static void processRound(OrePrefix roundPrefix, Material material, IngotProperty property) { diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java index 89d44904db0..e6f8333b6ff 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java @@ -124,7 +124,7 @@ private static void processPipeTiny(OrePrefix pipePrefix, Material material, IMa .notConsumable(MetaItems.SHAPE_MOLD_PIPE_TINY) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) .output(pipePrefix, material) - .EUt(VA[ULV]).duration(4) + .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) .buildAndRegister(); } } @@ -175,7 +175,7 @@ private static void processPipeSmall(OrePrefix pipePrefix, Material material, IM .notConsumable(MetaItems.SHAPE_MOLD_PIPE_SMALL) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) .output(pipePrefix, material) - .EUt(VA[ULV]).duration(8) + .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) .buildAndRegister(); } } @@ -226,7 +226,7 @@ private static void processPipeNormal(OrePrefix pipePrefix, Material material, I .notConsumable(MetaItems.SHAPE_MOLD_PIPE_NORMAL) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 3)) .output(pipePrefix, material) - .EUt(VA[ULV]).duration(24) + .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) .buildAndRegister(); } } @@ -276,7 +276,7 @@ private static void processPipeLarge(OrePrefix pipePrefix, Material material, IM .notConsumable(MetaItems.SHAPE_MOLD_PIPE_LARGE) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 6)) .output(pipePrefix, material) - .EUt(VA[ULV]).duration(48) + .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) .buildAndRegister(); } } @@ -326,7 +326,7 @@ private static void processPipeHuge(OrePrefix pipePrefix, Material material, IMa .notConsumable(MetaItems.SHAPE_MOLD_PIPE_HUGE) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 12)) .output(pipePrefix, material) - .EUt(VA[ULV]).duration(96) + .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) .buildAndRegister(); } } From 773f7973aee2cf609b160865aca432442bcf61c5 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 26 Apr 2025 23:23:08 -0400 Subject: [PATCH 07/14] Remove unused textures --- .../item/metaitems/shape.mold.baguette.json | 6 ------ .../models/item/metaitems/shape.mold.bread.json | 6 ------ .../models/item/metaitems/shape.mold.bun.json | 6 ------ .../models/item/metaitems/shape.mold.screw.json | 6 ------ .../item/metaitems/shape.mold.turbine_blade.json | 6 ------ .../items/metaitems/shape.mold.baguette.png | Bin 497 -> 0 bytes .../items/metaitems/shape.mold.bread.png | Bin 441 -> 0 bytes .../textures/items/metaitems/shape.mold.bun.png | Bin 466 -> 0 bytes .../items/metaitems/shape.mold.screw.png | Bin 3103 -> 0 bytes .../items/metaitems/shape.mold.turbine_blade.png | Bin 3140 -> 0 bytes 10 files changed, 30 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.baguette.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bread.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bun.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json delete mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.baguette.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bread.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bun.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.screw.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.baguette.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.baguette.json deleted file mode 100644 index 7e6aeb385a8..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.baguette.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/shape.mold.baguette" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bread.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bread.json deleted file mode 100644 index 8cda2182559..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bread.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/shape.mold.bread" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bun.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bun.json deleted file mode 100644 index f27d908d13d..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.bun.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/shape.mold.bun" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json deleted file mode 100644 index 807ba95ce7e..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.screw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/shape.mold.screw" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json deleted file mode 100644 index cd4fea169c2..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/shape.mold.turbine_blade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/shape.mold.turbine_blade" - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.baguette.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.baguette.png deleted file mode 100644 index 93effe7ba88bf6873282b2afa01e54a9abed387c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmVq_2Yv(ANdJ#DVwZUZE)tWG&W+_?NCoMI$dN}GH@ zkRX7>BWFJFk7qM|v~7F01ldq2`Ig4Vu!W)mEB~KPr_F58w(Z>(-n(}M36gj_zClGP zupkvkUYH5rKRz~30ALAS_btVd20wqCQ{V@MoMM#%O8|f;0FVtb5J9janx+967=8_l z7=o2CTh-}fMiip2Hz6_(+#6U(rYVqst$k6#fCT>1;h07*myg0YB^ z6q4Y-38aGkem{2*ktRt;Y`0rzEN`07Y+z3f3%k#|>|zwxb&X(vRfXNB-5h0QFo~yZ zbzOsGz9W)qBzk_{&%3aig2!fM&p9IkQ6&w@?5D~dS#^-(c@&j7h3oYS1`#Cs{(?jE zGLy(lf|B^2+O}rQVHm&&G|kIA9gWL diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bread.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.bread.png deleted file mode 100644 index 50ba75fca57c5a66cce4ed571da118b97c735661..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggKE><2RUgpquM;I6w-8@|!Lo80OogA2V*nr3Rrq{go zt=A*VmdI^+-cjB0FUO$sopax$lHa#^SonHuI+ut(=zqOoPmJF5c8>t2>i)Sh{R)C} zWs~N_ufNXBAR{am?!hFwf$dBSt7pahW$X+V3@OijkEiaxD|JWq8Jl_g?&iJDLO}=p zEp)cTCzQ)`EpA|rNaR#fT$+J-fQ$OW zw1Ukio<%l_?7Ma6f$D?LKY1nw4;H>e>R{&vvPoC48#p`I*yi(eS^xylnH%Hv zdL=?gfg~gm3dV7&#Y(|8UBOpy1qLB;JRS)J3gN6as>0_2D|o&VipDMuA0MQRLhPE7 z_vyVVE`@Gk^|dms(rv>)vmg|KB5H4%0<8+{f+Y6)J&Ni%GXdDYy%9SxFc1;l^43Hb zGEGFVu#ip`mX~=i&>Om1ezB05?4<5r5|76NfN>nRX@vS)*a~>mn3(_0RdFj`$5;|)wilP3@%Z~#Ekz*hxXyFSF)&l+4G*q*q7<_=d`%^zhc`$)x9WL{on8RfuA`40E^01bkfNCg#Z8m07*qo IM6N<$g3K__`v3p{ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.screw.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.screw.png deleted file mode 100644 index 6d8cf2fa5a74e94fdb223897c51f4435cd0f21e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3103 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 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.turbine_blade.png deleted file mode 100644 index 655fab63c697e47cde48d0ecccfddd587108f34f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3140 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 Date: Sat, 26 Apr 2025 23:43:01 -0400 Subject: [PATCH 08/14] Improve pipe mold textures --- .../items/metaitems/shape.mold.pipe.huge.png | Bin 3089 -> 514 bytes .../items/metaitems/shape.mold.pipe.large.png | Bin 3073 -> 507 bytes .../items/metaitems/shape.mold.pipe.normal.png | Bin 3072 -> 498 bytes .../items/metaitems/shape.mold.pipe.small.png | Bin 3063 -> 476 bytes .../items/metaitems/shape.mold.pipe.tiny.png | Bin 3058 -> 456 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.huge.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.huge.png index 10fdb6f91683892ef31019d81e8c5dff8efbaecf..e4cf0d0f2984be367af64cf9eea86b331c5644bf 100644 GIT binary patch delta 468 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 DzxBWK delta 3067 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 JPDHLkV1lrh!yy0w diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.normal.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.normal.png index 9141b7c1c9070400b039c10a9a3d2a177557643e..430958e7dd5cad97bbfbc64e21668df399d3d699 100644 GIT binary patch delta 452 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 IM6N<$f|{njdjJ3c diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.small.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.small.png index c309afb6118348726eed9c85c05c7ff46f9c0059..50d82b31a8200e0833f599f8611709d999d7cc33 100644 GIT binary patch delta 430 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 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png index 8b5d77351b8d2c3696d1e63f9102cb2ed1e4e746..55ba46a2920170f63845cfe35720c83125c66e72 100644 GIT binary patch delta 410 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 Date: Sun, 27 Apr 2025 00:21:48 -0400 Subject: [PATCH 09/14] Make the tiny pipe texture more distinct --- .../items/metaitems/shape.mold.pipe.tiny.png | Bin 456 -> 473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png b/src/main/resources/assets/gregtech/textures/items/metaitems/shape.mold.pipe.tiny.png index 55ba46a2920170f63845cfe35720c83125c66e72..4f5dfa9fb9d69236d33ba8792fcdd856d72406f2 100644 GIT binary patch delta 325 zcmV-L0lNOk1K9(Roqq%r8N$m!{Qv*~9Z5t%R5;76lhJL%FbqU5RR6tz*Qh&E2F(yz zBY=VY@E+0+$&wO(wgLpp0*}1oQPLmRz4BCXuH5fv|Cs{R6P&?0f;~1+Wq(kUjRZ#!h!$8`%`zD0 z7C$9u0qI`#e!nXsR7z1qXjzt)V6b^(0NJY;6cJk2RkrnbJlg#L9}Gg0AbaCzHkMMl zw1^N`a1 zso*?hGD~RP?>@dWXwnC2c8QN3;K2eK&7&Wl+&SCWAJg`;y+}^U-X_sw68C+-=s(sk XAn+BKpTTbmVX4j2t*V%Rr46+bJR}+ zQD8p0p697jifXN@wWf+m%`mZjw3G}grD$E(R{~r%`85c@hH*rUbJtRfz=h=~ml59O zb%OPFQzO-X<+MPGAju8)5Mg?I8bv+ zmk~TwK*;QVcr6;oHOBEXZ9m%+<3jdw58>10000%O From 8c4c7034d19ad7875db03696f2d87967fcf86cf1 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 3 May 2025 20:45:37 -0400 Subject: [PATCH 10/14] Remove unused lang --- .../resources/assets/gregtech/lang/en_us.lang | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index a140390036e..9e86c2e951a 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -250,35 +250,25 @@ metaitem.shape.mold.gear.small.tooltip=Mold for making small Gears metaitem.shape.mold.rotor.name=Mold (Rotor) metaitem.shape.mold.rotor.tooltip=Mold for making Rotors metaitem.shape.mold.bolt.name=Mold (Bolt) -metaitem.shape.mold.bolt.tooltip=Mold for making bolts +metaitem.shape.mold.bolt.tooltip=Mold for making Bolts metaitem.shape.mold.pipe.tiny.name=Mold (Tiny Pipe) -metaitem.shape.mold.pipe.tiny.tooltip=Mold for making tiny pipes +metaitem.shape.mold.pipe.tiny.tooltip=Mold for making Tiny Pipes metaitem.shape.mold.pipe.small.name=Mold (Small Pipe) -metaitem.shape.mold.pipe.small.tooltip=Mold for making small pipes +metaitem.shape.mold.pipe.small.tooltip=Mold for making Small Pipes metaitem.shape.mold.pipe.normal.name=Mold (Normal Pipe) -metaitem.shape.mold.pipe.normal.tooltip=Mold for making normal pipes +metaitem.shape.mold.pipe.normal.tooltip=Mold for making Normal Pipes metaitem.shape.mold.pipe.large.name=Mold (Large Pipe) -metaitem.shape.mold.pipe.large.tooltip=Mold for making large pipes +metaitem.shape.mold.pipe.large.tooltip=Mold for making Large Pipes metaitem.shape.mold.pipe.huge.name=Mold (Huge Pipe) -metaitem.shape.mold.pipe.huge.tooltip=Mold for making huge pipes +metaitem.shape.mold.pipe.huge.tooltip=Mold for making Huge Pipes metaitem.shape.mold.ring.name=Mold (Ring) -metaitem.shape.mold.ring.tooltip=Mold for making rings +metaitem.shape.mold.ring.tooltip=Mold for making Rings metaitem.shape.mold.rod.name=Mold (Rod) -metaitem.shape.mold.rod.tooltip=Mold for making rods +metaitem.shape.mold.rod.tooltip=Mold for making Rods metaitem.shape.mold.rod_long.name=Mold (Long Rod) -metaitem.shape.mold.rod_long.tooltip=Mold for making long rods +metaitem.shape.mold.rod_long.tooltip=Mold for making Long Rods metaitem.shape.mold.round.name=Mold (Round) -metaitem.shape.mold.round.tooltip=Mold for making rounds -metaitem.shape.mold.screw.name=Mold (Screw) -metaitem.shape.mold.screw.tooltip=Mold for making screws -metaitem.shape.mold.turbine_blade.name=Mold (Turbine Blade) -metaitem.shape.mold.turbine_blade.tooltip=Mold for making turbine blades -metaitem.shape.mold.bun.name=Mold (Bun) -metaitem.shape.mold.bun.tooltip=Mold for making buns -metaitem.shape.mold.bread.name=Mold (Bread) -metaitem.shape.mold.bread.tooltip=Mold for making bread -metaitem.shape.mold.baguette.name=Mold (Baguette) -metaitem.shape.mold.baguette.tooltip=Mold for making baguettes +metaitem.shape.mold.round.tooltip=Mold for making Rounds metaitem.shape.extruder.plate.name=Extruder Shape (Plate) metaitem.shape.extruder.plate.tooltip=Extruder Shape for making Plates From 0d0a1bb4be248c29d129e6420b18db0216eb0e90 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 3 May 2025 20:46:12 -0400 Subject: [PATCH 11/14] Fix missing mold duplication recipe --- .../java/gregtech/common/items/MetaItem1.java | 20 ++++++++++--------- .../java/gregtech/common/items/MetaItems.java | 2 +- .../loaders/recipe/MachineRecipeLoader.java | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 140817d342d..5d3950b6a11 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -90,13 +90,13 @@ public void getSubItems(@NotNull CreativeTabs tab, @NotNull NonNullList= 1004 && itemMetaData <= 1013) continue; + if (itemMetaData >= 1006 && itemMetaData <= 1010) continue; item.getSubItemHandler().getSubItems(item.getStackForm(), tab, subItems); - if (itemMetaData == 30) { + if (itemMetaData == 29) { for (MetaItem.MetaValueItem moldItem : SHAPE_MOLDS) { - if (moldItem.getMetaValue() < 1005) continue; + if (moldItem.getMetaValue() < 1006) continue; moldItem.getSubItemHandler().getSubItems(moldItem.getStackForm(), tab, subItems); } } @@ -164,9 +164,11 @@ public void registerSubItems() { .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); SHAPE_MOLDS[16] = SHAPE_MOLD_ROD_LONG = addItem(28, "shape.mold.rod_long") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[17] = SHAPE_MOLD_ROUND = addItem(30, "shape.mold.round") + SHAPE_MOLDS[17] = SHAPE_MOLD_ROUND = addItem(29, "shape.mold.round") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); + // Free ID: 30 + // Extruder Shapes: ID 31-59 SHAPE_EXTRUDERS[0] = SHAPE_EXTRUDER_PLATE = addItem(31, "shape.extruder.plate") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); @@ -1185,15 +1187,15 @@ public void registerSubItems() { .setMaxStackSize(1); // Extra molds 1006-1010 - SHAPE_MOLDS[17] = SHAPE_MOLD_PIPE_TINY = addItem(1006, "shape.mold.pipe.tiny") + SHAPE_MOLDS[18] = SHAPE_MOLD_PIPE_TINY = addItem(1006, "shape.mold.pipe.tiny") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[18] = SHAPE_MOLD_PIPE_SMALL = addItem(1007, "shape.mold.pipe.small") + SHAPE_MOLDS[19] = SHAPE_MOLD_PIPE_SMALL = addItem(1007, "shape.mold.pipe.small") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[19] = SHAPE_MOLD_PIPE_NORMAL = addItem(1008, "shape.mold.pipe.normal") + SHAPE_MOLDS[20] = SHAPE_MOLD_PIPE_NORMAL = addItem(1008, "shape.mold.pipe.normal") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[20] = SHAPE_MOLD_PIPE_LARGE = addItem(1009, "shape.mold.pipe.large") + SHAPE_MOLDS[21] = SHAPE_MOLD_PIPE_LARGE = addItem(1009, "shape.mold.pipe.large") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); - SHAPE_MOLDS[21] = SHAPE_MOLD_PIPE_HUGE = addItem(1010, "shape.mold.pipe.huge") + SHAPE_MOLDS[22] = SHAPE_MOLD_PIPE_HUGE = addItem(1010, "shape.mold.pipe.huge") .setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, M * 4))); } } diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index f514f743986..23c49bb279f 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -56,7 +56,7 @@ private MetaItems() {} public static MetaItem.MetaValueItem SHAPE_EMPTY; - public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[22]; + public static final MetaItem.MetaValueItem[] SHAPE_MOLDS = new MetaValueItem[23]; public static MetaItem.MetaValueItem SHAPE_MOLD_PLATE; public static MetaItem.MetaValueItem SHAPE_MOLD_GEAR; public static MetaItem.MetaValueItem SHAPE_MOLD_CREDIT; diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 13606711c42..b656ca292f8 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -111,7 +111,7 @@ private static void registerBendingCompressingRecipes() { FORMING_PRESS_RECIPES.recipeBuilder() .duration(120).EUt(22) .notConsumable(shapeMold.getStackForm()) - .inputs(MetaItems.SHAPE_EMPTY.getStackForm()) + .input(MetaItems.SHAPE_EMPTY) .outputs(shapeMold.getStackForm()) .buildAndRegister(); } From f506c0a8349a6c2b3aa438babd97372a7b6fd265 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 3 May 2025 21:03:18 -0400 Subject: [PATCH 12/14] Fix voltages --- .../loaders/recipe/handlers/PartsRecipeHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index 7de98a787ce..76f9a20aa5b 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -93,7 +93,7 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp .notConsumable(MetaItems.SHAPE_MOLD_BOLT) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) .output(boltPrefix, material) - .EUt(VA[ULV]).duration(6) + .EUt(GTUtility.scaleVoltage(VA[MV], workingTier)).duration(6) .buildAndRegister(); } } @@ -409,7 +409,7 @@ public static void processRing(OrePrefix ringPrefix, Material material, IngotPro .notConsumable(MetaItems.SHAPE_MOLD_RING) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 4)) .output(ringPrefix, material) - .EUt(VA[ULV]).duration(3) + .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)).duration(3) .buildAndRegister(); } } @@ -531,7 +531,7 @@ public static void processStick(OrePrefix stickPrefix, Material material, DustPr .notConsumable(MetaItems.SHAPE_MOLD_ROD) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) .output(stickPrefix, material) - .EUt(VA[ULV]).duration(10) + .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)).duration(10) .buildAndRegister(); } } @@ -604,7 +604,7 @@ public static void processLongStick(OrePrefix longStickPrefix, Material material .notConsumable(MetaItems.SHAPE_MOLD_ROD_LONG) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) .output(longStickPrefix, material) - .EUt(VA[ULV]).duration(20) + .EUt(GTUtility.scaleVoltage(64, workingTier)).duration(20) .buildAndRegister(); } } @@ -666,7 +666,7 @@ public static void processRound(OrePrefix roundPrefix, Material material, IngotP .notConsumable(MetaItems.SHAPE_MOLD_ROUND) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 9)) .output(roundPrefix, material) - .EUt(VA[ULV]).duration(5) + .EUt(GTUtility.scaleVoltage(VA[ULV], workingTier)).duration(90) .buildAndRegister(); } } From 0c6caf5a0fe6aeb0c41de9ecc142d1045136974d Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 3 May 2025 21:16:06 -0400 Subject: [PATCH 13/14] Attempt to fix durations + spotless --- .../recipe/handlers/PartsRecipeHandler.java | 14 +++++++++----- .../recipe/handlers/PipeRecipeHandler.java | 15 ++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index 76f9a20aa5b..1631e1965ed 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -93,7 +93,7 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp .notConsumable(MetaItems.SHAPE_MOLD_BOLT) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) .output(boltPrefix, material) - .EUt(GTUtility.scaleVoltage(VA[MV], workingTier)).duration(6) + .EUt(GTUtility.scaleVoltage(VA[MV], workingTier)).duration(12) .buildAndRegister(); } } @@ -409,7 +409,8 @@ public static void processRing(OrePrefix ringPrefix, Material material, IngotPro .notConsumable(MetaItems.SHAPE_MOLD_RING) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 4)) .output(ringPrefix, material) - .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)).duration(3) + .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)) + .duration((int) Math.max((material.getMass() / 2f) * 0.95f, 1f)) .buildAndRegister(); } } @@ -531,7 +532,8 @@ public static void processStick(OrePrefix stickPrefix, Material material, DustPr .notConsumable(MetaItems.SHAPE_MOLD_ROD) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) .output(stickPrefix, material) - .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)).duration(10) + .EUt(GTUtility.scaleVoltage(6 * getVoltageMultiplier(material), workingTier)) + .duration((int) Math.max(material.getMass() * 0.95f, 1f)) .buildAndRegister(); } } @@ -604,7 +606,8 @@ public static void processLongStick(OrePrefix longStickPrefix, Material material .notConsumable(MetaItems.SHAPE_MOLD_ROD_LONG) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) .output(longStickPrefix, material) - .EUt(GTUtility.scaleVoltage(64, workingTier)).duration(20) + .EUt(GTUtility.scaleVoltage(64, workingTier)) + .duration((int) Math.max(material.getMass() * 0.95f, 1f)) .buildAndRegister(); } } @@ -666,7 +669,8 @@ public static void processRound(OrePrefix roundPrefix, Material material, IngotP .notConsumable(MetaItems.SHAPE_MOLD_ROUND) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 9)) .output(roundPrefix, material) - .EUt(GTUtility.scaleVoltage(VA[ULV], workingTier)).duration(90) + .EUt(GTUtility.scaleVoltage(VA[ULV], workingTier)) + .duration(90) .buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java index a9942981fd9..c2494a3917f 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PipeRecipeHandler.java @@ -129,7 +129,8 @@ private static void processPipeTiny(OrePrefix pipePrefix, Material material, IMa .notConsumable(MetaItems.SHAPE_MOLD_PIPE_TINY) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 2)) .output(pipePrefix, material) - .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) + .EUt(6 * getVoltageMultiplier(material)) + .duration((int) Math.max(((int) material.getMass() / 2f) * 0.95f, 1f)) .buildAndRegister(); } } @@ -185,7 +186,8 @@ private static void processPipeSmall(OrePrefix pipePrefix, Material material, IM .notConsumable(MetaItems.SHAPE_MOLD_PIPE_SMALL) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L)) .output(pipePrefix, material) - .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) + .EUt(6 * getVoltageMultiplier(material)) + .duration((int) Math.max(material.getMass() * 0.95f, 1f)) .buildAndRegister(); } } @@ -241,7 +243,8 @@ private static void processPipeNormal(OrePrefix pipePrefix, Material material, I .notConsumable(MetaItems.SHAPE_MOLD_PIPE_NORMAL) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 3)) .output(pipePrefix, material) - .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) + .EUt(6 * getVoltageMultiplier(material)) + .duration((int) Math.max((material.getMass() * 3) * 0.95f, 1f)) .buildAndRegister(); } } @@ -296,7 +299,8 @@ private static void processPipeLarge(OrePrefix pipePrefix, Material material, IM .notConsumable(MetaItems.SHAPE_MOLD_PIPE_LARGE) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 6)) .output(pipePrefix, material) - .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) + .EUt(6 * getVoltageMultiplier(material)) + .duration((int) Math.max((material.getMass() * 6) * 0.95f, 1f)) .buildAndRegister(); } } @@ -351,7 +355,8 @@ private static void processPipeHuge(OrePrefix pipePrefix, Material material, IMa .notConsumable(MetaItems.SHAPE_MOLD_PIPE_HUGE) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L * 12)) .output(pipePrefix, material) - .EUt(6 * getVoltageMultiplier(material)).duration((int) material.getMass() / 2) + .EUt(6 * getVoltageMultiplier(material)) + .duration((int) Math.max((material.getMass() * 24) * 0.95f, 1f)) .buildAndRegister(); } } From b332ad030f35f1507e3cceb6c733414111553f29 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 3 May 2025 21:19:55 -0400 Subject: [PATCH 14/14] Attempt to fix durations pt2 --- .../gregtech/loaders/recipe/handlers/PartsRecipeHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java index 1631e1965ed..4fa5d8326a1 100644 --- a/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java +++ b/src/main/java/gregtech/loaders/recipe/handlers/PartsRecipeHandler.java @@ -93,7 +93,7 @@ public static void processBolt(OrePrefix boltPrefix, Material material, DustProp .notConsumable(MetaItems.SHAPE_MOLD_BOLT) .fluidInputs(material.getProperty(PropertyKey.FLUID).solidifiesFrom(L / 8)) .output(boltPrefix, material) - .EUt(GTUtility.scaleVoltage(VA[MV], workingTier)).duration(12) + .EUt(GTUtility.scaleVoltage(VA[MV], workingTier)).duration(2) .buildAndRegister(); } }