From 4f9a95b430bb59c99de87b74b4e1f7e3d6c3c19c Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 18:22:02 -0500 Subject: [PATCH 1/8] add chemical dyes and recipes --- .../unification/material/MarkerMaterials.java | 4 +- .../api/unification/material/Materials.java | 17 ++- .../UnknownCompositionMaterials.java | 48 ++++++++ .../java/gregtech/api/util/GTUtility.java | 15 ++- .../java/gregtech/common/ConfigHolder.java | 3 + .../java/gregtech/common/items/MetaItem1.java | 5 +- .../java/gregtech/common/items/MetaItems.java | 1 - .../loaders/recipe/CircuitRecipes.java | 8 +- .../loaders/recipe/MachineRecipeLoader.java | 103 +++++++++++++++- .../recipe/VanillaOverrideRecipes.java | 16 ++- .../recipe/VanillaStandardRecipes.java | 33 ++++- .../recipe/chemistry/ReactorRecipes.java | 115 ++++++++++++++++++ .../resources/assets/gregtech/lang/en_us.lang | 52 +++++--- 13 files changed, 384 insertions(+), 36 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java index 628c124db18..cb2a303f551 100644 --- a/src/main/java/gregtech/api/unification/material/MarkerMaterials.java +++ b/src/main/java/gregtech/api/unification/material/MarkerMaterials.java @@ -37,7 +37,7 @@ public static class Color { public static final MarkerMaterial Lime = new MarkerMaterial("lime"); public static final MarkerMaterial Pink = new MarkerMaterial("pink"); public static final MarkerMaterial Gray = new MarkerMaterial("gray"); - public static final MarkerMaterial Silver = new MarkerMaterial("silver"); + public static final MarkerMaterial LightGray = new MarkerMaterial("light_gray"); public static final MarkerMaterial Cyan = new MarkerMaterial("cyan"); public static final MarkerMaterial Purple = new MarkerMaterial("purple"); public static final MarkerMaterial Blue = new MarkerMaterial("blue"); @@ -50,7 +50,7 @@ public static class Color { * Arrays containing all possible color values (without Colorless!) */ public static final MarkerMaterial[] VALUES = new MarkerMaterial[]{ - White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, Silver, Cyan, Purple, Blue, Brown, Green, Red, Black + White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, LightGray, Cyan, Purple, Blue, Brown, Green, Red, Black }; /** diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 6d74629738a..a332a8b87b2 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -1,6 +1,5 @@ package gregtech.api.unification.material; -import gregtech.api.GregTechAPI; import gregtech.api.unification.material.info.MaterialFlag; import gregtech.api.unification.material.materials.*; @@ -618,6 +617,22 @@ public static void register() { public static Material RubySlurry; public static Material SapphireSlurry; public static Material GreenSapphireSlurry; + public static Material DyeBlack; + public static Material DyeRed; + public static Material DyeGreen; + public static Material DyeBrown; + public static Material DyeBlue; + public static Material DyePurple; + public static Material DyeCyan; + public static Material DyeLightGray; + public static Material DyeGray; + public static Material DyePink; + public static Material DyeLime; + public static Material DyeYellow; + public static Material DyeLightBlue; + public static Material DyeMagenta; + public static Material DyeOrange; + public static Material DyeWhite; /** * Second Degree Compounds diff --git a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java index ac1c16b9631..98538ae0f91 100644 --- a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java @@ -361,5 +361,53 @@ public static void register() { GreenSapphireSlurry = new Material.Builder(1622, "green_sapphire_slurry") .fluid().color(0x64c882).build(); + + DyeBlack = new Material.Builder(1623, "dye_black") + .fluid().color(0x202020).build(); + + DyeRed = new Material.Builder(1624, "dye_red") + .fluid().color(0xFF0000).build(); + + DyeGreen = new Material.Builder(1625, "dye_green") + .fluid().color(0x00FF00).build(); + + DyeBrown = new Material.Builder(1626, "dye_brown") + .fluid().color(0x604000).build(); + + DyeBlue = new Material.Builder(1627, "dye_blue") + .fluid().color(0x0020FF).build(); + + DyePurple = new Material.Builder(1628, "dye_purple") + .fluid().color(0x800080).build(); + + DyeCyan = new Material.Builder(1629, "dye_cyan") + .fluid().color(0x00FFFF).build(); + + DyeLightGray = new Material.Builder(1630, "dye_light_gray") + .fluid().color(0xC0C0C0).build(); + + DyeGray = new Material.Builder(1631, "dye_gray") + .fluid().color(0x808080).build(); + + DyePink = new Material.Builder(1632, "dye_pink") + .fluid().color(0xFFC0C0).build(); + + DyeLime = new Material.Builder(1633, "dye_lime") + .fluid().color(0x80FF80).build(); + + DyeYellow = new Material.Builder(1634, "dye_yellow") + .fluid().color(0xFFFF00).build(); + + DyeLightBlue = new Material.Builder(1635, "dye_light_blue") + .fluid().color(0x6080FF).build(); + + DyeMagenta = new Material.Builder(1636, "dye_magenta") + .fluid().color(0xFF00FF).build(); + + DyeOrange = new Material.Builder(1637, "dye_orange") + .fluid().color(0xFF8000).build(); + + DyeWhite = new Material.Builder(1638, "dye_white") + .fluid().color(0xFFFFFF).build(); } } diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index f5638fdd140..a5255b42d1e 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -15,6 +15,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.common.ConfigHolder; import gregtech.common.items.behaviors.CoverPlaceBehavior; @@ -75,7 +76,18 @@ public class GTUtility { private static final XSTR random = new XSTR(); - private static TreeMap romanNumeralConversions = new TreeMap<>(); + private static final TreeMap romanNumeralConversions = new TreeMap<>(); + + public static gregtech.api.unification.material.Material[] CHEMICAL_DYES = { + Materials.DyeBlack, Materials.DyeRed, + Materials.DyeGreen, Materials.DyeBrown, + Materials.DyeBlue, Materials.DyePurple, + Materials.DyeCyan, Materials.DyeLightGray, + Materials.DyeGray, Materials.DyePink, + Materials.DyeLime, Materials.DyeYellow, + Materials.DyeLightBlue, Materials.DyeMagenta, + Materials.DyeOrange, Materials.DyeWhite + }; public static Runnable combine(Runnable... runnables) { return () -> { @@ -983,7 +995,6 @@ public static String romanNumeralString(int num) { return romanNumeralConversions.get(conversion) + romanNumeralString(num - conversion); } - public static boolean isOre(Block block) { OrePrefix orePrefix = OreDictUnifier.getPrefix(new ItemStack(block)); return orePrefix != null && orePrefix.name().startsWith("ore"); diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index 465d8c6d624..ea377fe78d9 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -125,6 +125,9 @@ public static class VanillaRecipes { @Config.Comment("Whether to make miscellaneous recipes harder. Default: false") public boolean hardMiscRecipes = false; + @Config.Comment("Whether to make coloring blocks like concrete or glass harder. Default: false") + public boolean hardDyeRecipes = false; + @Config.Comment("Whether to make flint and steel recipe require steel parts. Default: true.") public boolean flintAndSteelRequireSteel = true; diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index e6046f78eca..4e65023fe88 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -355,11 +355,10 @@ public void registerSubItems() { ELITE_CIRCUIT_BOARD = addItem(406, "circuit_board.elite"); WETWARE_CIRCUIT_BOARD = addItem(407, "circuit_board.wetware"); - // Dyes: ID 421-437 - DYE_INDIGO = addItem(421, "dye.indigo").addOreDict("dyeBlue"); + // Dyes: ID 421-435 for (int i = 0; i < EnumDyeColor.values().length; i++) { EnumDyeColor dyeColor = EnumDyeColor.values()[i]; - DYE_ONLY_ITEMS[i] = addItem(422 + i, "dye." + dyeColor.getName()).addOreDict(getOredictColorName(dyeColor)); + DYE_ONLY_ITEMS[i] = addItem(421 + i, "dye." + dyeColor.getName()).addOreDict(getOredictColorName(dyeColor)); } // Plant/Rubber Related: ID 438-445 diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index dc3c41c116e..3c5cc787c6e 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -418,7 +418,6 @@ private MetaItems() { public static MetaItem.MetaValueItem BOTTLE_PURPLE_DRINK; - public static MetaItem.MetaValueItem DYE_INDIGO; public static MetaItem.MetaValueItem PLANT_BALL; public static MetaItem.MetaValueItem RUBBER_DROP; public static MetaItem.MetaValueItem ENERGIUM_DUST; diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index 59036cac00e..1c9280da304 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -72,10 +72,10 @@ private static void waferRecipes() { LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 8).buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Red).output(INTEGRATED_LOGIC_CIRCUIT_WAFER, 16).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 4).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 8).buildAndRegister(); - LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.Silver).output(RANDOM_ACCESS_MEMORY_WAFER, 16).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(120).input(SILICON_WAFER).notConsumable(craftingLens, Color.LightGray).output(RANDOM_ACCESS_MEMORY_WAFER).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.LightGray).output(RANDOM_ACCESS_MEMORY_WAFER, 4).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(200).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.LightGray).output(RANDOM_ACCESS_MEMORY_WAFER, 8).buildAndRegister(); + LASER_ENGRAVER_RECIPES.recipeBuilder().duration(50).EUt(7680).input(NEUTRONIUM_WAFER).notConsumable(craftingLens, Color.LightGray).output(RANDOM_ACCESS_MEMORY_WAFER, 16).buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(900).EUt(480).input(GLOWSTONE_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER).buildAndRegister(); LASER_ENGRAVER_RECIPES.recipeBuilder().duration(500).EUt(1920).input(NAQUADAH_WAFER).notConsumable(craftingLens, Color.LightBlue).output(NAND_MEMORY_CHIP_WAFER, 4).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 213ccc929f5..a3e02dd0a2b 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -857,13 +857,112 @@ private static void registerRecyclingRecipes() { private static void registerFluidRecipes() { - FLUID_HEATER_RECIPES.recipeBuilder().duration(32).EUt(4) .fluidInputs(Ice.getFluid(L)) .circuitMeta(1) .fluidOutputs(Water.getFluid(L)).buildAndRegister(); - FLUID_SOLIDFICATION_RECIPES.recipeBuilder().duration(100).EUt(16).notConsumable(SHAPE_MOLD_BALL).fluidInputs(Toluene.getFluid(100)).output(GELLED_TOLUENE).buildAndRegister(); + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(Toluene.getFluid(100)) + .notConsumable(SHAPE_MOLD_BALL) + .output(GELLED_TOLUENE) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeBlack.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[15].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeRed.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[14].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeGreen.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[13].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeBrown.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[12].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeBlue.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[11].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyePurple.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[10].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeCyan.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[9].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeLightGray.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[8].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeGray.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[7].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyePink.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[6].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeLime.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[5].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeYellow.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[4].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeLightBlue.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[3].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeMagenta.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[2].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeOrange.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[1].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(DyeWhite.getFluid(72)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[0].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); FLUID_HEATER_RECIPES.recipeBuilder().duration(30).EUt(32).fluidInputs(Water.getFluid(6)).circuitMeta(1).fluidOutputs(Steam.getFluid(960)).buildAndRegister(); FLUID_HEATER_RECIPES.recipeBuilder().duration(30).EUt(32).fluidInputs(DistilledWater.getFluid(6)).circuitMeta(1).fluidOutputs(Steam.getFluid(960)).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java index 692379ce07d..6fb1f7d531d 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java @@ -4,6 +4,8 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.MarkerMaterial; +import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; @@ -31,6 +33,8 @@ public static void init() { metalRecipes(); if (ConfigHolder.vanillaRecipes.hardMiscRecipes) miscRecipes(); + if (ConfigHolder.vanillaRecipes.hardDyeRecipes) + dyeRecipes(); toolArmorRecipes(); } @@ -162,7 +166,6 @@ private static void woodRecipes() { /** * + Adds Glass Handcrafting * - Removes Sand -> Glass Furnace Smelting - * - Removes Regular Glass Pane Crafting * - Removes Glass Bottle Crafting */ private static void glassRecipes() { @@ -704,6 +707,17 @@ private static void miscRecipes() { ModHandler.removeFurnaceSmelting(new ItemStack(Items.CLAY_BALL, 1, GTValues.W)); } + /** + * - Removes Concrete, Stained Clay, and Stained glass crafting recipes + */ + private static void dyeRecipes() { + for (MarkerMaterial colorMaterial : MarkerMaterials.Color.VALUES) { + ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_concrete_powder", colorMaterial))); + ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_stained_hardened_clay", colorMaterial))); + ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_stained_glass", colorMaterial))); + } + } + /** * + Replaces Vanilla Armor and Tool recipes */ diff --git a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java index 93944dbf7b8..33b71ed73f6 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java @@ -10,6 +10,7 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; +import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; @@ -504,7 +505,7 @@ private static void dyingCleaningRecipes() { MIXER_RECIPES.recipeBuilder().duration(200).EUt(7) .inputs(new ItemStack(Blocks.SAND, 4)) .inputs(new ItemStack(Blocks.GRAVEL, 4)) - .input(dye, MarkerMaterials.Color.VALUES[i]) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) .outputs(new ItemStack(Blocks.CONCRETE_POWDER, 8, i)) .buildAndRegister(); @@ -514,6 +515,36 @@ private static void dyingCleaningRecipes() { .outputs(new ItemStack(Blocks.CONCRETE, 1, i)) .buildAndRegister(); + CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) + .inputs(new ItemStack(Blocks.CONCRETE)) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .outputs(new ItemStack(Blocks.CONCRETE, 1, i)) + .buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) + .inputs(new ItemStack(Blocks.HARDENED_CLAY)) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .outputs(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, i)) + .buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) + .inputs(new ItemStack(Blocks.GLASS)) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .outputs(new ItemStack(Blocks.STAINED_GLASS, 1, i)) + .buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) + .inputs(new ItemStack(Blocks.GLASS_PANE)) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .outputs(new ItemStack(Blocks.STAINED_GLASS_PANE, 1, i)) + .buildAndRegister(); + + CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) + .inputs(new ItemStack(Blocks.WOOL)) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .outputs(new ItemStack(Blocks.WOOL, 1, i)) + .buildAndRegister(); + CUTTER_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.WOOL, 2, i)) .outputs(new ItemStack(Blocks.CARPET, 3, i)) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 10ebe2bbf04..c3627848078 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -1076,5 +1076,120 @@ public static void init() { .fluidInputs(Nitrogen.getFluid(1000)) .output(dust, NiobiumNitride, 2) .duration(200).EUt(480).buildAndRegister(); + + // Dyes + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeBlack", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeBlack.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeRed", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeRed.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeGreen", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeGreen.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeBrown", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeBrown.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeBlue", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeBlue.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyePurple", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyePurple.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeCyan", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeCyan.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeLightGray", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeLightGray.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeGray", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeGray.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyePink", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyePink.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeLime", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeLime.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeYellow", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeYellow.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeLightBlue", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeLightBlue.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeMagenta", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeMagenta.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeOrange", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeOrange.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + CHEMICAL_RECIPES.recipeBuilder() + .input("dyeWhite", 1) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(DyeWhite.getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + + } } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 88c8eaa25ac..df51a0e537c 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -754,25 +754,22 @@ metaitem.gelled_toluene.tooltip=Raw Explosive metaitem.bottle.purple.drink.name=Purple Drink metaitem.bottle.purple.drink.tooltip=How about Lemonade. Or some Ice Tea? I got Purple Drink! -metaitem.dye.indigo.name=Indigo Dye -metaitem.dye.indigo.tooltip=Blue Dye - -metaitem.dye.white.name=White Dye -metaitem.dye.orange.name=Orange Dye -metaitem.dye.magenta.name=Magenta Dye -metaitem.dye.light_blue.name=Light Blue Dye -metaitem.dye.yellow.name=Yellow Dye -metaitem.dye.lime.name=Lime Dye -metaitem.dye.pink.name=Pink Dye -metaitem.dye.gray.name=Gray Dye -metaitem.dye.silver.name=Light Gray Dye -metaitem.dye.cyan.name=Cyan Dye -metaitem.dye.purple.name=Purple Dye -metaitem.dye.blue.name=Blue Dye -metaitem.dye.brown.name=Brown Dye -metaitem.dye.green.name=Green Dye -metaitem.dye.red.name=Red Dye -metaitem.dye.black.name=Black Dye +metaitem.dye.black.name=Chemical Black Dye +metaitem.dye.red.name=Chemical Red Dye +metaitem.dye.green.name=Chemical Green Dye +metaitem.dye.brown.name=Chemical Brown Dye +metaitem.dye.blue.name=Chemical Blue Dye +metaitem.dye.purple.name=Chemical Purple Dye +metaitem.dye.cyan.name=Chemical Cyan Dye +metaitem.dye.light_gray.name=Chemical Light Gray Dye +metaitem.dye.gray.name=Chemical Gray Dye +metaitem.dye.pink.name=Chemical Pink Dye +metaitem.dye.lime.name=Chemical Lime Dye +metaitem.dye.yellow.name=Chemical Yellow Dye +metaitem.dye.light_blue.name=Chemical Light Blue Dye +metaitem.dye.magenta.name=Chemical Magenta Dye +metaitem.dye.orange.name=Chemical Orange Dye +metaitem.dye.white.name=Chemical White Dye metaitem.rubber_drop.name=Sticky Resin metaitem.plant_ball.name=Plant Ball @@ -1758,6 +1755,23 @@ material.ruby_slurry=Ruby Slurry material.sapphire_slurry=Sapphire Slurry material.green_sapphire_slurry=Green Sapphire Slurry +material.dye_black=Chemical Black Dye +material.dye_red=Chemical Red Dye +material.dye_green=Chemical Green Dye +material.dye_brown=Chemical Brown Dye +material.dye_blue=Chemical Blue Dye +material.dye_purple=Chemical Purple Dye +material.dye_cyan=Chemical Cyan Dye +material.dye_light_gray=Chemical Light Gray Dye +material.dye_gray=Chemical Gray Dye +material.dye_pink=Chemical Pink Dye +material.dye_lime=Chemical Lime Dye +material.dye_yellow=Chemical Yellow Dye +material.dye_light_blue=Chemical Light Blue Dye +material.dye_magenta=Chemical Magenta Dye +material.dye_orange=Chemical Orange Dye +material.dye_white=Chemical White Dye + item.nether_quartz.oreNetherrack=Nether Quartz Ore item.gunpowder.dustTiny=Tiny Pile of Gunpowder item.gunpowder.dustSmall=Small Pile of Gunpowder From 143ddc22db7b5b6319cd525dfba60d554820e058 Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 18:30:31 -0500 Subject: [PATCH 2/8] new spray can recipes --- .../gregtech/loaders/recipe/MachineRecipeLoader.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index a3e02dd0a2b..1318604dc4c 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -12,6 +12,7 @@ import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.MaterialStack; +import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; import gregtech.common.blocks.BlockConcrete.ConcreteVariant; import gregtech.common.blocks.BlockFusionCasing; @@ -35,7 +36,6 @@ import gregtech.loaders.recipe.chemistry.ChemistryRecipes; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraftforge.fluids.FluidStack; @@ -44,7 +44,6 @@ import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gregtech.api.util.DyeUtil.getOredictColorName; import static gregtech.common.items.MetaItems.*; import static gregtech.common.metatileentities.MetaTileEntities.WORKBENCH; @@ -428,11 +427,11 @@ private static void registerAlloyRecipes() { } private static void registerAssemblerRecipes() { - for (EnumDyeColor dyeColor : EnumDyeColor.values()) { + for (int i = 0; i < 16; i++) { CANNER_RECIPES.recipeBuilder() .inputs(MetaItems.SPRAY_EMPTY.getStackForm()) - .input(getOredictColorName(dyeColor), 1) - .outputs(MetaItems.SPRAY_CAN_DYES[dyeColor.getMetadata()].getStackForm()) + .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L * 4)) + .outputs(MetaItems.SPRAY_CAN_DYES[i].getStackForm()) .EUt(8).duration(200) .buildAndRegister(); } From 8965abb35473d2a165871a162bda045a268a994a Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 18:45:27 -0500 Subject: [PATCH 3/8] don't add recipes manually --- .../loaders/recipe/MachineRecipeLoader.java | 102 +-------------- .../recipe/chemistry/ReactorRecipes.java | 123 ++---------------- 2 files changed, 17 insertions(+), 208 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 1318604dc4c..405e02f49ff 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -867,101 +867,13 @@ private static void registerFluidRecipes() { .output(GELLED_TOLUENE) .duration(100).EUt(16).buildAndRegister(); - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeBlack.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[15].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeRed.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[14].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeGreen.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[13].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeBrown.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[12].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeBlue.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[11].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyePurple.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[10].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeCyan.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[9].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeLightGray.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[8].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeGray.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[7].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyePink.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[6].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeLime.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[5].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeYellow.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[4].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeLightBlue.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[3].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeMagenta.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[2].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeOrange.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[1].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); - - FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(DyeWhite.getFluid(72)) - .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[0].getStackForm()) - .duration(100).EUt(16).buildAndRegister(); + for (int i = 0; i < 16; i++) { + FLUID_SOLIDFICATION_RECIPES.recipeBuilder() + .fluidInputs(GTUtility.CHEMICAL_DYES[i].getFluid(GTValues.L / 2)) + .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[16 - 1 - i].getStackForm()) + .duration(100).EUt(16).buildAndRegister(); + } FLUID_HEATER_RECIPES.recipeBuilder().duration(30).EUt(32).fluidInputs(Water.getFluid(6)).circuitMeta(1).fluidOutputs(Steam.getFluid(960)).buildAndRegister(); FLUID_HEATER_RECIPES.recipeBuilder().duration(30).EUt(32).fluidInputs(DistilledWater.getFluid(6)).circuitMeta(1).fluidOutputs(Steam.getFluid(960)).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index c3627848078..0b572c033b2 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -2,8 +2,10 @@ import gregtech.api.recipes.ingredients.IntCircuitIngredient; import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.util.GTUtility; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -1078,118 +1080,13 @@ public static void init() { .duration(200).EUt(480).buildAndRegister(); // Dyes - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeBlack", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeBlack.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeRed", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeRed.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeGreen", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeGreen.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeBrown", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeBrown.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeBlue", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeBlue.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyePurple", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyePurple.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeCyan", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeCyan.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeLightGray", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeLightGray.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeGray", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeGray.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyePink", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyePink.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeLime", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeLime.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeYellow", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeYellow.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeLightBlue", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeLightBlue.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeMagenta", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeMagenta.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeOrange", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeOrange.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - CHEMICAL_RECIPES.recipeBuilder() - .input("dyeWhite", 1) - .input(dust, Salt, 2) - .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(DyeWhite.getFluid(288)) - .duration(600).EUt(24).buildAndRegister(); - - + for (int i = 0; i < 16; i++) { + CHEMICAL_RECIPES.recipeBuilder() + .input(dye, MarkerMaterials.Color.VALUES[16 - 1 - i]) + .input(dust, Salt, 2) + .fluidInputs(SulfuricAcid.getFluid(250)) + .fluidOutputs(GTUtility.CHEMICAL_DYES[i].getFluid(288)) + .duration(600).EUt(24).buildAndRegister(); + } } } From 8bfb640b68328c2df2384abd2ed59e8d33abd2e3 Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 18:49:27 -0500 Subject: [PATCH 4/8] move CHEMICAL_DYES array to Materials --- .../api/unification/material/Materials.java | 13 +++++++++++++ src/main/java/gregtech/api/util/GTUtility.java | 12 ------------ .../loaders/recipe/MachineRecipeLoader.java | 5 ++--- .../loaders/recipe/VanillaStandardRecipes.java | 13 ++++++------- .../loaders/recipe/chemistry/ReactorRecipes.java | 3 +-- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index a332a8b87b2..a208c9c0d83 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -34,6 +34,8 @@ public class Materials { private static final AtomicBoolean INIT = new AtomicBoolean(false); + public static Material[] CHEMICAL_DYES; + public static void register() { if (INIT.getAndSet(true)) { return; @@ -95,6 +97,17 @@ public static void register() { * - FREE RANGE 24000-31999 * - Reserved for CraftTweaker: 32000-32767 */ + + CHEMICAL_DYES = new Material[]{ + Materials.DyeBlack, Materials.DyeRed, + Materials.DyeGreen, Materials.DyeBrown, + Materials.DyeBlue, Materials.DyePurple, + Materials.DyeCyan, Materials.DyeLightGray, + Materials.DyeGray, Materials.DyePink, + Materials.DyeLime, Materials.DyeYellow, + Materials.DyeLightBlue, Materials.DyeMagenta, + Materials.DyeOrange, Materials.DyeWhite + }; } public static final List STD_SOLID = new ArrayList<>(); diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index a5255b42d1e..d915c76f583 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -15,7 +15,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.common.ConfigHolder; import gregtech.common.items.behaviors.CoverPlaceBehavior; @@ -78,17 +77,6 @@ public class GTUtility { private static final TreeMap romanNumeralConversions = new TreeMap<>(); - public static gregtech.api.unification.material.Material[] CHEMICAL_DYES = { - Materials.DyeBlack, Materials.DyeRed, - Materials.DyeGreen, Materials.DyeBrown, - Materials.DyeBlue, Materials.DyePurple, - Materials.DyeCyan, Materials.DyeLightGray, - Materials.DyeGray, Materials.DyePink, - Materials.DyeLime, Materials.DyeYellow, - Materials.DyeLightBlue, Materials.DyeMagenta, - Materials.DyeOrange, Materials.DyeWhite - }; - public static Runnable combine(Runnable... runnables) { return () -> { for (Runnable runnable : runnables) { diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 405e02f49ff..68f01bc4c7c 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -12,7 +12,6 @@ import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.MaterialStack; -import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; import gregtech.common.blocks.BlockConcrete.ConcreteVariant; import gregtech.common.blocks.BlockFusionCasing; @@ -430,7 +429,7 @@ private static void registerAssemblerRecipes() { for (int i = 0; i < 16; i++) { CANNER_RECIPES.recipeBuilder() .inputs(MetaItems.SPRAY_EMPTY.getStackForm()) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L * 4)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L * 4)) .outputs(MetaItems.SPRAY_CAN_DYES[i].getStackForm()) .EUt(8).duration(200) .buildAndRegister(); @@ -869,7 +868,7 @@ private static void registerFluidRecipes() { for (int i = 0; i < 16; i++) { FLUID_SOLIDFICATION_RECIPES.recipeBuilder() - .fluidInputs(GTUtility.CHEMICAL_DYES[i].getFluid(GTValues.L / 2)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 2)) .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) .outputs(MetaItems.DYE_ONLY_ITEMS[16 - 1 - i].getStackForm()) .duration(100).EUt(16).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java index 33b71ed73f6..924fd492287 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java @@ -10,7 +10,6 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; -import gregtech.api.util.GTUtility; import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; @@ -505,7 +504,7 @@ private static void dyingCleaningRecipes() { MIXER_RECIPES.recipeBuilder().duration(200).EUt(7) .inputs(new ItemStack(Blocks.SAND, 4)) .inputs(new ItemStack(Blocks.GRAVEL, 4)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) .outputs(new ItemStack(Blocks.CONCRETE_POWDER, 8, i)) .buildAndRegister(); @@ -517,31 +516,31 @@ private static void dyingCleaningRecipes() { CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.CONCRETE)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.CONCRETE, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.HARDENED_CLAY)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.GLASS)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_GLASS, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.GLASS_PANE)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_GLASS_PANE, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.WOOL)) - .fluidInputs(GTUtility.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.WOOL, 1, i)) .buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 0b572c033b2..dddca08cb20 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -5,7 +5,6 @@ import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import gregtech.api.util.GTUtility; import gregtech.common.items.MetaItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -1085,7 +1084,7 @@ public static void init() { .input(dye, MarkerMaterials.Color.VALUES[16 - 1 - i]) .input(dust, Salt, 2) .fluidInputs(SulfuricAcid.getFluid(250)) - .fluidOutputs(GTUtility.CHEMICAL_DYES[i].getFluid(288)) + .fluidOutputs(Materials.CHEMICAL_DYES[i].getFluid(288)) .duration(600).EUt(24).buildAndRegister(); } } From 8b75df079cfd98c72dcda1b7cb5f646715b345c8 Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 18:57:28 -0500 Subject: [PATCH 5/8] fix wool recipes --- .../java/gregtech/loaders/recipe/VanillaOverrideRecipes.java | 1 + .../java/gregtech/loaders/recipe/VanillaStandardRecipes.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java index 6fb1f7d531d..942435210e0 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java @@ -715,6 +715,7 @@ private static void dyeRecipes() { ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_concrete_powder", colorMaterial))); ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_stained_hardened_clay", colorMaterial))); ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_stained_glass", colorMaterial))); + ModHandler.removeRecipeByName(new ResourceLocation(String.format("minecraft:%s_wool", colorMaterial))); } } diff --git a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java index 924fd492287..8db02ba767e 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java @@ -540,7 +540,7 @@ private static void dyingCleaningRecipes() { CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.WOOL)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) .outputs(new ItemStack(Blocks.WOOL, 1, i)) .buildAndRegister(); From 678729d250b8c7c821dfda3e6ff5d8c52b7206be Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 19:33:10 -0500 Subject: [PATCH 6/8] requested changes --- .../api/unification/material/Materials.java | 16 ++++++++-------- .../java/gregtech/common/items/MetaItem1.java | 2 +- .../loaders/recipe/MachineRecipeLoader.java | 4 ++-- .../loaders/recipe/VanillaStandardRecipes.java | 12 ++++++------ .../loaders/recipe/chemistry/ReactorRecipes.java | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index a208c9c0d83..5e583134acd 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -99,14 +99,14 @@ public static void register() { */ CHEMICAL_DYES = new Material[]{ - Materials.DyeBlack, Materials.DyeRed, - Materials.DyeGreen, Materials.DyeBrown, - Materials.DyeBlue, Materials.DyePurple, - Materials.DyeCyan, Materials.DyeLightGray, - Materials.DyeGray, Materials.DyePink, - Materials.DyeLime, Materials.DyeYellow, - Materials.DyeLightBlue, Materials.DyeMagenta, - Materials.DyeOrange, Materials.DyeWhite + Materials.DyeWhite, Materials.DyeOrange, + Materials.DyeMagenta, Materials.DyeLightBlue, + Materials.DyeYellow, Materials.DyeLime, + Materials.DyePink, Materials.DyeGray, + Materials.DyeLightGray, Materials.DyeCyan, + Materials.DyePurple, Materials.DyeBlue, + Materials.DyeBrown, Materials.DyeGreen, + Materials.DyeRed, Materials.DyeBlack }; } diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 4e65023fe88..3a89a1c4feb 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -355,7 +355,7 @@ public void registerSubItems() { ELITE_CIRCUIT_BOARD = addItem(406, "circuit_board.elite"); WETWARE_CIRCUIT_BOARD = addItem(407, "circuit_board.wetware"); - // Dyes: ID 421-435 + // Dyes: ID 421-436 for (int i = 0; i < EnumDyeColor.values().length; i++) { EnumDyeColor dyeColor = EnumDyeColor.values()[i]; DYE_ONLY_ITEMS[i] = addItem(421 + i, "dye." + dyeColor.getName()).addOreDict(getOredictColorName(dyeColor)); diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 68f01bc4c7c..5a1d275ad23 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -429,7 +429,7 @@ private static void registerAssemblerRecipes() { for (int i = 0; i < 16; i++) { CANNER_RECIPES.recipeBuilder() .inputs(MetaItems.SPRAY_EMPTY.getStackForm()) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L * 4)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L * 4)) .outputs(MetaItems.SPRAY_CAN_DYES[i].getStackForm()) .EUt(8).duration(200) .buildAndRegister(); @@ -870,7 +870,7 @@ private static void registerFluidRecipes() { FLUID_SOLIDFICATION_RECIPES.recipeBuilder() .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 2)) .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) - .outputs(MetaItems.DYE_ONLY_ITEMS[16 - 1 - i].getStackForm()) + .outputs(MetaItems.DYE_ONLY_ITEMS[i].getStackForm()) .duration(100).EUt(16).buildAndRegister(); } diff --git a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java index 8db02ba767e..ec89242544b 100644 --- a/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java @@ -504,7 +504,7 @@ private static void dyingCleaningRecipes() { MIXER_RECIPES.recipeBuilder().duration(200).EUt(7) .inputs(new ItemStack(Blocks.SAND, 4)) .inputs(new ItemStack(Blocks.GRAVEL, 4)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L)) .outputs(new ItemStack(Blocks.CONCRETE_POWDER, 8, i)) .buildAndRegister(); @@ -516,31 +516,31 @@ private static void dyingCleaningRecipes() { CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.CONCRETE)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.CONCRETE, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.HARDENED_CLAY)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.GLASS)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_GLASS, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.GLASS_PANE)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L / 8)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 8)) .outputs(new ItemStack(Blocks.STAINED_GLASS_PANE, 1, i)) .buildAndRegister(); CHEMICAL_BATH_RECIPES.recipeBuilder().duration(20).EUt(7) .inputs(new ItemStack(Blocks.WOOL)) - .fluidInputs(Materials.CHEMICAL_DYES[16 - 1 - i].getFluid(GTValues.L)) + .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L)) .outputs(new ItemStack(Blocks.WOOL, 1, i)) .buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index dddca08cb20..8ce913e4d8e 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -1081,7 +1081,7 @@ public static void init() { // Dyes for (int i = 0; i < 16; i++) { CHEMICAL_RECIPES.recipeBuilder() - .input(dye, MarkerMaterials.Color.VALUES[16 - 1 - i]) + .input(dye, MarkerMaterials.Color.VALUES[i]) .input(dust, Salt, 2) .fluidInputs(SulfuricAcid.getFluid(250)) .fluidOutputs(Materials.CHEMICAL_DYES[i].getFluid(288)) From 6e34fcb3c8a00197d081ac9370b36467bee571d8 Mon Sep 17 00:00:00 2001 From: tech22 Date: Fri, 19 Nov 2021 22:44:15 -0500 Subject: [PATCH 7/8] requested changes 2 --- .../material/materials/UnknownCompositionMaterials.java | 1 + src/main/java/gregtech/api/util/GTUtility.java | 2 +- .../java/gregtech/loaders/recipe/MachineRecipeLoader.java | 4 ++-- .../gregtech/loaders/recipe/chemistry/ReactorRecipes.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java index 98538ae0f91..e9d555e0445 100644 --- a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java @@ -362,6 +362,7 @@ public static void register() { GreenSapphireSlurry = new Material.Builder(1622, "green_sapphire_slurry") .fluid().color(0x64c882).build(); + // These colors are much nicer looking than those in MC's EnumDyeColor DyeBlack = new Material.Builder(1623, "dye_black") .fluid().color(0x202020).build(); diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index d915c76f583..ae118465199 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -75,7 +75,7 @@ public class GTUtility { private static final XSTR random = new XSTR(); - private static final TreeMap romanNumeralConversions = new TreeMap<>(); + private static TreeMap romanNumeralConversions = new TreeMap<>(); public static Runnable combine(Runnable... runnables) { return () -> { diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 5a1d275ad23..bf3c204913e 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -426,7 +426,7 @@ private static void registerAlloyRecipes() { } private static void registerAssemblerRecipes() { - for (int i = 0; i < 16; i++) { + for (int i = 0; i < Materials.CHEMICAL_DYES.length; i++) { CANNER_RECIPES.recipeBuilder() .inputs(MetaItems.SPRAY_EMPTY.getStackForm()) .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L * 4)) @@ -866,7 +866,7 @@ private static void registerFluidRecipes() { .output(GELLED_TOLUENE) .duration(100).EUt(16).buildAndRegister(); - for (int i = 0; i < 16; i++) { + for (int i = 0; i < Materials.CHEMICAL_DYES.length; i++) { FLUID_SOLIDFICATION_RECIPES.recipeBuilder() .fluidInputs(Materials.CHEMICAL_DYES[i].getFluid(GTValues.L / 2)) .notConsumable(MetaItems.SHAPE_MOLD_BALL.getStackForm()) diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java index 8ce913e4d8e..1de3f9ac018 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java @@ -1079,7 +1079,7 @@ public static void init() { .duration(200).EUt(480).buildAndRegister(); // Dyes - for (int i = 0; i < 16; i++) { + for (int i = 0; i < Materials.CHEMICAL_DYES.length; i++) { CHEMICAL_RECIPES.recipeBuilder() .input(dye, MarkerMaterials.Color.VALUES[i]) .input(dust, Salt, 2) From b18b04f1c7ec713231151a678843051a701a6443 Mon Sep 17 00:00:00 2001 From: tech22 Date: Sat, 20 Nov 2021 00:44:18 -0500 Subject: [PATCH 8/8] fix code format issues --- .../api/unification/material/Materials.java | 20 +++++++++---------- .../java/gregtech/common/ConfigHolder.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java index 5e583134acd..ee39ebd201d 100644 --- a/src/main/java/gregtech/api/unification/material/Materials.java +++ b/src/main/java/gregtech/api/unification/material/Materials.java @@ -98,16 +98,16 @@ public static void register() { * - Reserved for CraftTweaker: 32000-32767 */ - CHEMICAL_DYES = new Material[]{ - Materials.DyeWhite, Materials.DyeOrange, - Materials.DyeMagenta, Materials.DyeLightBlue, - Materials.DyeYellow, Materials.DyeLime, - Materials.DyePink, Materials.DyeGray, - Materials.DyeLightGray, Materials.DyeCyan, - Materials.DyePurple, Materials.DyeBlue, - Materials.DyeBrown, Materials.DyeGreen, - Materials.DyeRed, Materials.DyeBlack - }; + CHEMICAL_DYES = new Material[]{ + Materials.DyeWhite, Materials.DyeOrange, + Materials.DyeMagenta, Materials.DyeLightBlue, + Materials.DyeYellow, Materials.DyeLime, + Materials.DyePink, Materials.DyeGray, + Materials.DyeLightGray, Materials.DyeCyan, + Materials.DyePurple, Materials.DyeBlue, + Materials.DyeBrown, Materials.DyeGreen, + Materials.DyeRed, Materials.DyeBlack + }; } public static final List STD_SOLID = new ArrayList<>(); diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index ea377fe78d9..1ff990a9f4a 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -271,7 +271,7 @@ public static class EnergyCompatibility { } public static class ClientConfig { - + @Config.Comment("Terminal root path. Default: (config/)gregtech/terminal") public String terminalRootPath = "gregtech/terminal";