From 387b639d15cf8f34006bcf54ed05133877b74f53 Mon Sep 17 00:00:00 2001 From: Gofer2x Date: Fri, 6 Sep 2024 20:32:46 +0200 Subject: [PATCH 1/2] buff thaumium reinforced jar recipe can't test if this works in game because nightly busted but it builds --- src/main/java/kekztech/common/Recipes.java | 47 ++++++++----------- src/main/java/kekztech/common/Researches.java | 2 +- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/main/java/kekztech/common/Recipes.java b/src/main/java/kekztech/common/Recipes.java index e6472c23a32..5cbdf5d4b74 100644 --- a/src/main/java/kekztech/common/Recipes.java +++ b/src/main/java/kekztech/common/Recipes.java @@ -1,16 +1,16 @@ package kekztech.common; -import static gregtech.api.enums.Mods.ThaumicTinkerer; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.util.GTModHandler.getModItem; +import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; import java.util.HashMap; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import kekztech.KekzCore; import kekztech.common.recipeLoaders.AlloySmelter; @@ -27,10 +27,12 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; public class Recipes { public static final HashMap infusionRecipes = new HashMap<>(); + public static final HashMap shapedArcaneRecipes = new HashMap<>(); public static void postInit() { KekzCore.LOGGER.info("Registering recipes..."); @@ -55,32 +57,23 @@ public static void postInit() { private static void registerRecipes_Jars() { // Thaumium Reinforced Jar - final ItemStack[] recipe_jarthaumiumreinforced = { - GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1), - new ItemStack(net.minecraft.init.Blocks.glass_pane), }; - final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64) - .add(Aspect.ORDER, 32) - .add(Aspect.WATER, 32) - .add(Aspect.GREED, 16) - .add(Aspect.VOID, 16) - .add(Aspect.AIR, 8); - infusionRecipes.put( + shapedArcaneRecipes.put( "THAUMIUMREINFORCEDJAR", - ThaumcraftApi.addInfusionCraftingRecipe( + addArcaneCraftingRecipe( "THAUMIUMREINFORCEDJAR", new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), - 5, - aspects_jarthaumiumreinforced, - ItemApi.getBlock("blockJar", 0), - recipe_jarthaumiumreinforced)); + new AspectList().add(Aspect.WATER, 30), + "MTM", + "TJT", + "GGG", + "M", + getModItem(Botania.ID, "manaGlass", 1, 0), + "T", + GTOreDictUnificator.get(OrePrefixes.block, Materials.Thaumium, 1L), + "J", + getModItem(Thaumcraft.ID, "blockJar", 1, 0), + "G", + getModItem(Minecraft.ID, "glass", 1, 0))); // Thaumium Reinforced Void Jar final ItemStack[] recipe_voidjarupgrade = { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1), @@ -100,7 +93,7 @@ private static void registerRecipes_Jars() { new ItemStack(Blocks.jarThaumiumReinforced, 1, 0), recipe_voidjarupgrade)); - final ItemStack[] recipe_jarichor = { GTModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0), + final ItemStack[] recipe_jarichor = { getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1), new ItemStack(net.minecraft.init.Blocks.glass_pane), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), diff --git a/src/main/java/kekztech/common/Researches.java b/src/main/java/kekztech/common/Researches.java index 8944f7a4863..e489ccb111e 100644 --- a/src/main/java/kekztech/common/Researches.java +++ b/src/main/java/kekztech/common/Researches.java @@ -38,7 +38,7 @@ public static void postInit() { new ItemStack(Blocks.jarThaumiumReinforced, 1)) .setPages( new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")), + new ResearchPage(Recipes.shapedArcaneRecipes.get("THAUMIUMREINFORCEDJAR")), new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")), new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1")) .setConcealed() From 2403e70c6c28acbc442a600fe7cac9dd2675d096 Mon Sep 17 00:00:00 2001 From: Gofer2x Date: Sun, 8 Sep 2024 19:23:37 +0200 Subject: [PATCH 2/2] fix " ' difference --- src/main/java/kekztech/common/Recipes.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/kekztech/common/Recipes.java b/src/main/java/kekztech/common/Recipes.java index 5cbdf5d4b74..230a10896de 100644 --- a/src/main/java/kekztech/common/Recipes.java +++ b/src/main/java/kekztech/common/Recipes.java @@ -66,13 +66,13 @@ private static void registerRecipes_Jars() { "MTM", "TJT", "GGG", - "M", + 'M', getModItem(Botania.ID, "manaGlass", 1, 0), - "T", + 'T', GTOreDictUnificator.get(OrePrefixes.block, Materials.Thaumium, 1L), - "J", + 'J', getModItem(Thaumcraft.ID, "blockJar", 1, 0), - "G", + 'G', getModItem(Minecraft.ID, "glass", 1, 0))); // Thaumium Reinforced Void Jar final ItemStack[] recipe_voidjarupgrade = {