From cd18aed91224384a6ad7accb71af61d10d448680 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:04:50 -0400 Subject: [PATCH 1/6] Rebalancing the wands --- .../gtnewhorizons/tcwands/GTWandRegistry.java | 50 +++++++++---------- .../com/gtnewhorizons/tcwands/api/GTTier.java | 2 + 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/GTWandRegistry.java b/src/main/java/com/gtnewhorizons/tcwands/GTWandRegistry.java index b38916d..6bc98df 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/GTWandRegistry.java +++ b/src/main/java/com/gtnewhorizons/tcwands/GTWandRegistry.java @@ -22,24 +22,24 @@ public void register() { 0, 5, GT_ModHandler.getModItem("Forestry", "oakStick", 1, 0, new ItemStack(Items.stick)), - GTTier.LV).regSceptreRecipe(2.0F); - new WandRecipeCreator("greatwood").regWandRecipe(20, 5, MV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15) + GTTier.STEAM).regSceptreRecipe(2.0F); + new WandRecipeCreator("greatwood").regWandRecipe(20, 5, LV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15) .regStaffSceptreRecipe(1.4F); - new WandRecipeCreator("reed").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("reed").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("blaze").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("blaze").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("obsidian").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("obsidian").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("ice").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("ice").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("quartz").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("quartz").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("bone").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) + new WandRecipeCreator("bone").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15) .regStaffSceptreRecipe(1.5F); - new WandRecipeCreator("silverwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.25F) + new WandRecipeCreator("silverwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.25F) .regUpwardStaffRecipe(165, 15).regStaffSceptreRecipe(1.75F); - new WandRecipeCreator("primal").regStaffRecipe(175, 20, IV).regStaffSceptreRecipe(1.25F); + new WandRecipeCreator("primal").regStaffRecipe(175, 20, EV).regStaffSceptreRecipe(1.25F); TCWandAPI.regCap(new CapWrapper("iron", 0)); TCWandAPI.regCap(new CapWrapper("copper", 1)); @@ -50,15 +50,15 @@ public void register() { if (CompatibleMods.FORBIDDEN_MAGIC.isPresent()) { TCWandsMod.LOGGER.info("Detected Forbidden Magic. Applying GTNH Recipes..."); - new WandRecipeCreator("profane").regWandRecipe(25, 5, HV).regSceptreRecipe(2F); - new WandRecipeCreator("tainted").regWandRecipe(175, 15, IV).regSceptreRecipe(1.4F); - new WandRecipeCreator("blood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.35F) + new WandRecipeCreator("profane").regWandRecipe(25, 5, MV).regSceptreRecipe(2F); + new WandRecipeCreator("tainted").regWandRecipe(175, 15, EV).regSceptreRecipe(1.4F); + new WandRecipeCreator("blood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.35F) .regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F); - new WandRecipeCreator("infernal").regWandRecipe(165, 15, IV).regSceptreRecipe(1.35F); - new WandRecipeCreator("livingwood").regWandRecipe(105, 15, EV).regSceptreRecipe(1.35F); - new WandRecipeCreator("dreamwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.3F) + new WandRecipeCreator("infernal").regWandRecipe(165, 15, EV).regSceptreRecipe(1.35F); + new WandRecipeCreator("livingwood").regWandRecipe(105, 15, HV).regSceptreRecipe(1.35F); + new WandRecipeCreator("dreamwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.3F) .regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F); - new WandRecipeCreator("witchwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.3F) + new WandRecipeCreator("witchwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.3F) .regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F); TCWandAPI.regCap(new CapWrapper("manasteel", 5)); @@ -70,14 +70,14 @@ public void register() { if (CompatibleMods.THAUMIC_TINKERER.isPresent()) { TCWandsMod.LOGGER.info("Detected Thaumic Tinkerer. Applying GTNH Recipes..."); - new WandRecipeCreator("ICHORCLOTH").regWandRecipe(250, 25, UV).regSceptreRecipe(1.25F); + new WandRecipeCreator("ICHORCLOTH").regWandRecipe(250, 25, IV).regSceptreRecipe(1.25F); TCWandAPI.regCap(new CapWrapper("ICHOR", 8)); } if (CompatibleMods.BLOOD_ARSENAL.isPresent()) { TCWandsMod.LOGGER.info("Detected Blood Arsenal. Applying GTNH Recipes..."); - new WandRecipeCreator("blood_wood").regWandRecipe(110, 15, EV).regSceptreRecipe(1.2F) + new WandRecipeCreator("blood_wood").regWandRecipe(110, 15, HV).regSceptreRecipe(1.2F) .regUpwardStaffRecipe(145, 20).regStaffSceptreRecipe(1.6F); TCWandAPI.regCap(new CapWrapper("blood_iron", 6)); @@ -99,7 +99,7 @@ public void register() { 9, new ResourceLocation("taintedmagic", "textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png")); - new WandRecipeCreator("warpwood").regWandRecipe(190, 15, LUV).regSceptreRecipe(1.2F) + new WandRecipeCreator("warpwood").regWandRecipe(190, 15, IV).regSceptreRecipe(1.2F) .regUpwardStaffRecipe(220, 25).regStaffSceptreRecipe(1.2F); TCWandAPI.regCap(new CapWrapper("cloth", 3)); @@ -110,17 +110,17 @@ public void register() { if (CompatibleMods.THAUMIC_BASES.isPresent()) { TCWandsMod.LOGGER.info("Detected Thaumic Bases. Applying GTNH Recipes..."); - new WandRecipeCreator("tbthaumium").regWandRecipe(75, 10, HV).regSceptreRecipe(1.5F); - new WandRecipeCreator("tbvoid").regWandRecipe(175, 15, EV).regSceptreRecipe(1.2F); + new WandRecipeCreator("tbthaumium").regWandRecipe(75, 10, MV).regSceptreRecipe(1.5F); + new WandRecipeCreator("tbvoid").regWandRecipe(175, 15, HV).regSceptreRecipe(1.2F); TCWandAPI.regCap(new CapWrapper("thauminite", 6)); } if (CompatibleMods.THAUMIC_EXPLORATION.isPresent()) { TCWandsMod.LOGGER.info("Detected Thaumic Exploration. Applying GTNH Recipes..."); - new WandRecipeCreator("AMBER").regWandRecipe(20, 5, MV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15) + new WandRecipeCreator("AMBER").regWandRecipe(20, 5, LV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15) .regStaffSceptreRecipe(1.4F); - new WandRecipeCreator("TRANSMUTATION").regWandRecipe(50, 10, HV).regSceptreRecipe(1.5F) + new WandRecipeCreator("TRANSMUTATION").regWandRecipe(50, 10, MV).regSceptreRecipe(1.5F) .regUpwardStaffRecipe(125, 15).regStaffSceptreRecipe(1.5F); // FIXME where's NECROMANCER // cores.add(new WandCore("BREAD",HV, LICH, 20, 5, 2F));//FIXME need or not need? @@ -132,7 +132,7 @@ public void register() { /** ChromatiCraft is non-supported content. if this ever errors out in some way feel free to remove this. */ if (CompatibleMods.CHROMATICRAFT.isPresent()) { TCWandsMod.LOGGER.info("Detected ChromatiCraft. Applying GTNH Recipes..."); - new WandRecipeCreator("CRYSTALWAND").regWandRecipe(300, 30, UV).regSceptreRecipe(2.7F); + new WandRecipeCreator("CRYSTALWAND").regWandRecipe(300, 30, IV).regSceptreRecipe(2.7F); TCWandAPI.regCap(new CapWrapper("TIEREDCAP_FOCAL", 10)); TCWandAPI.regCap(new CapWrapper("TIEREDCAP_FIRAXITE", 5)); diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index 763c008..e4cb66c 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -7,9 +7,11 @@ import gregtech.api.enums.Tier; import gregtech.api.util.GT_ModHandler; +import thaumcraft.common.config.ConfigItems; public enum GTTier { + STEAM(-1, () -> new ItemStack(ConfigItems.itemResource, 1, 14)), LV(0, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))), MV(1, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), HV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), From 1b0e4ae926524d7c747a5f51889e31b3de299f88 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:16:55 -0400 Subject: [PATCH 2/6] minor tweak --- src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index e4cb66c..bd94c92 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -9,9 +9,11 @@ import gregtech.api.util.GT_ModHandler; import thaumcraft.common.config.ConfigItems; +import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; + public enum GTTier { - STEAM(-1, () -> new ItemStack(ConfigItems.itemResource, 1, 14)), + STEAM(-1, () -> new ItemStack(ConfigItems.itemShard, 1, WILDCARD)), LV(0, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))), MV(1, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), HV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), From 0f4b4a2f62b6f8b5bf9ec65fe0d80325e7afbc7d Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Fri, 9 Aug 2024 17:24:14 +0000 Subject: [PATCH 3/6] spotlessApply --- src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index bd94c92..a4d4b4e 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -1,5 +1,7 @@ package com.gtnewhorizons.tcwands.api; +import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; + import java.util.function.Supplier; import net.minecraft.init.Items; @@ -9,8 +11,6 @@ import gregtech.api.util.GT_ModHandler; import thaumcraft.common.config.ConfigItems; -import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; - public enum GTTier { STEAM(-1, () -> new ItemStack(ConfigItems.itemShard, 1, WILDCARD)), From c9c72e451e8b5c2d9253cda4bc1eb38c7ccb3c1f Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:32:03 -0400 Subject: [PATCH 4/6] Everyone hates Wildcards apparently --- src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index bd94c92..a19a61f 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -13,7 +13,7 @@ public enum GTTier { - STEAM(-1, () -> new ItemStack(ConfigItems.itemShard, 1, WILDCARD)), + STEAM(-1, () -> new ItemStack(ConfigItems.itemShard, 1, 32767)), LV(0, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))), MV(1, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), HV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), From a0589f1157ff44a251d9a5746dd4ca3edba8c6bf Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Fri, 9 Aug 2024 17:36:02 +0000 Subject: [PATCH 5/6] spotlessApply --- src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index 64ebe20..1042b3b 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -1,7 +1,5 @@ package com.gtnewhorizons.tcwands.api; -import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; - import java.util.function.Supplier; import net.minecraft.init.Items; From 7a683a4005b6acf54bf2abee14b417afa619ea4b Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:50:01 -0400 Subject: [PATCH 6/6] Update GTTier.java --- .../com/gtnewhorizons/tcwands/api/GTTier.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java index 64ebe20..80d5c7a 100644 --- a/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java +++ b/src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java @@ -13,16 +13,16 @@ public enum GTTier { - STEAM(-1, () -> new ItemStack(ConfigItems.itemShard, 1, 32767)), - LV(0, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))), - MV(1, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), - HV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), - EV(3, () -> GT_ModHandler.getModItem("TwilightForest", "item.fieryBlood", 1, 0, new ItemStack(Items.potato))), - IV(4, () -> GT_ModHandler + STEAM(0, () -> new ItemStack(ConfigItems.itemShard, 1, 32767)), + LV(1, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))), + MV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), + HV(3, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))), + EV(4, () -> GT_ModHandler.getModItem("TwilightForest", "item.fieryBlood", 1, 0, new ItemStack(Items.potato))), + IV(5, () -> GT_ModHandler .getModItem("TwilightForest", "item.fieryTears", 1, 0, new ItemStack(Items.poisonous_potato))), - LUV(5, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))), - ZPM(6, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))), - UV(7, () -> GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBlood", 1, 0, new ItemStack(Items.cake))); + LUV(6, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))), + ZPM(7, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))), + UV(8, () -> GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBlood", 1, 0, new ItemStack(Items.cake))); private static final GTTier[] tiers;