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 1/5] 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 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 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 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 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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 // ///////////////////////////////////////////////////