Merge pull request #33 from GTNewHorizons/ethryans-patch

Update the Charging machine and max charge for the QVoidBoots + recipe fix
GTNewHorizons · Nov 5, 2024 · 93b3d88 · 93b3d88
2 parents f37f64d + 1a2b5c0
commit 93b3d88
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/main/java/thaumicboots/item/boots/voidwalker/ItemElectricVoidwalkerBoots.java b/src/main/java/thaumicboots/item/boots/voidwalker/ItemElectricVoidwalkerBoots.java
@@ -32,8 +32,8 @@ public ItemElectricVoidwalkerBoots(final ArmorMaterial material, final int j, fi
 
     protected void setBootsData() {
         super.setBootsData();
-        maxCharge = 1_000_000;
-        energyPerDamage = 500; // allows for 2k hits 2x more than base electric (for this mod)
+        maxCharge = 100_000;
+        energyPerDamage = 100; // allows for 2k hits 2x more than base electric (for this mod)
         runicCharge = 0;
         visDiscount = 5 + 2; // voidwalker + electric discount
         provideEnergy = false;

diff --git a/src/main/java/thaumicboots/item/boots/voidwalker/ItemNanoVoidwalkerBoots.java b/src/main/java/thaumicboots/item/boots/voidwalker/ItemNanoVoidwalkerBoots.java
@@ -8,8 +8,8 @@ public ItemNanoVoidwalkerBoots(final ArmorMaterial material, final int j, final
 
     protected void setBootsData() {
         super.setBootsData();
-        maxCharge = 10_000_000;
-        energyPerDamage = 2_500; // allows for 4k hits 2x more than base nano, 2x more than prev (for this mod)
+        maxCharge = 1_000_000;
+        energyPerDamage = 500; // allows for 4k hits 2x more than base nano, 2x more than prev (for this mod)
         visDiscount = 5 + 4; // voidwalker + nano discount
         damageAbsorptionRatio = 2.75D;
         transferLimit = 2_400;

diff --git a/src/main/java/thaumicboots/item/boots/voidwalker/ItemQuantumVoidwalkerBoots.java b/src/main/java/thaumicboots/item/boots/voidwalker/ItemQuantumVoidwalkerBoots.java
@@ -8,13 +8,15 @@ public ItemQuantumVoidwalkerBoots(final ArmorMaterial material, final int j, fin
 
     protected void setBootsData() {
         super.setBootsData();
-        maxCharge = 100_000_000;
-        energyPerDamage = 12_500; // allows for 8k hits 2x more than base quantum, 2x more than prev (for this mod)
+        maxCharge = 10_000_000;
+        energyPerDamage = 2_500; // allows for 8k hits 2x more than base quantum, 2x more than prev (for this mod)
         visDiscount = 5 + 5; // voidwalker + quantum discount
         damageAbsorptionRatio = 3.0D;
         transferLimit = 24_000;
         jumpBonus = 1.0175D; // 11 blocks
         runBonus = 1.250F;
+
+        tier = 4;
         iconResPath = "thaumicboots:quantumVoid_16x";
         armorResPath = "thaumicboots:model/quantumbootsVoidwalker.png";
         unlocalisedName = "ItemQuantumVoid";

diff --git a/src/main/java/thaumicboots/main/utils/compat/EMTHelper.java b/src/main/java/thaumicboots/main/utils/compat/EMTHelper.java
@@ -120,7 +120,7 @@ public static void setupCrafting() {
         if (ExplorationsHelper.isActive()) {
             electricComet = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsElectricComet, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsElectricComet, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -148,7 +148,7 @@ public static void setupCrafting() {
 
             nanoComet = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsNanoComet, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsNanoComet, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -176,7 +176,7 @@ public static void setupCrafting() {
 
             quantumComet = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsQuantumComet, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsQuantumComet, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -204,7 +204,7 @@ public static void setupCrafting() {
 
             electricMeteor = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsElectricMeteor, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsElectricMeteor, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -232,7 +232,7 @@ public static void setupCrafting() {
 
             nanoMeteor = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsNanoMeteor, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsNanoMeteor, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -260,7 +260,7 @@ public static void setupCrafting() {
 
             quantumMeteor = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_Explorations_EMT_Compat",
-                    new ItemStack(EMTHelper.bootsQuantumMeteor, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsQuantumMeteor, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -290,7 +290,7 @@ public static void setupCrafting() {
         if (TaintedHelper.isActive()) {
             electricVoid = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_EMT_Tainted_Compat",
-                    new ItemStack(EMTHelper.bootsElectricVoid, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsElectricVoid, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -318,7 +318,7 @@ public static void setupCrafting() {
 
             nanoVoid = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_EMT_Tainted_Compat",
-                    new ItemStack(EMTHelper.bootsNanoVoid, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsNanoVoid, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),
@@ -346,7 +346,7 @@ public static void setupCrafting() {
 
             quantumVoid = ThaumcraftApi.addInfusionCraftingRecipe(
                     "TB_EMT_Tainted_Compat",
-                    new ItemStack(EMTHelper.bootsQuantumVoid, 1, OreDictionary.WILDCARD_VALUE),
+                    new ItemStack(EMTHelper.bootsQuantumVoid, 1, 0),
                     0,
                     new AspectList().add(Aspect.EXCHANGE, 75).add(Aspect.MAGIC, 50).add(Aspect.CRAFT, 50)
                             .add(TB_Aspect.SPACE, 25).add(TB_Aspect.BOOTS, 25),