aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java75
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java59
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java38
-rw-r--r--src/Java/gtPlusPlus/core/util/item/UtilsItems.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java109
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_PleaseRefactorMe.java28
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java2
8 files changed, 173 insertions, 142 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index be020b7d05..7638da6f0a 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -9,7 +9,6 @@ import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.UtilsItems;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
import java.util.List;
@@ -72,7 +71,6 @@ public class BaseItemDust extends Item{
oredictName = temp;
GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this));
}
- addMixerRecipe();
addFurnaceRecipe();
addMacerationRecipe();
}
@@ -133,79 +131,6 @@ public class BaseItemDust extends Item{
}
-
-
- private void addMixerRecipe(){
-
- ItemStack thisItem;
- ItemStack normalDust = dustInfo.getDust(1);
- ItemStack smallDust = dustInfo.getSmallDust(1);
- ItemStack tinyDust = dustInfo.getTinyDust(1);
-
- ItemStack[] inputStacks = dustInfo.getMaterialComposites();
- ItemStack outputStacks = dustInfo.getDust(10);
-
- if (oredictName.contains("dustTiny")){
- thisItem = tinyDust;
- ItemStack normalStack = dustInfo.getDust(1);
- ItemStack tinyStack = dustInfo.getTinyDust(9);
- Utils.LOG_INFO("Generating a 9 Tiny dust to 1 Dust recipe for "+materialName);
- UtilsRecipe.recipeBuilder(
- thisItem, thisItem, thisItem,
- thisItem, thisItem, thisItem,
- thisItem, thisItem, thisItem,
- normalStack);
-
- Utils.LOG_INFO("Generating a 9 Tiny dust from 1 Dust recipe for "+materialName);
- UtilsRecipe.recipeBuilder(
- normalStack, null, null,
- null, null, null,
- null, null, null,
- tinyStack);
-
- }
- else if (oredictName.contains("dustSmall")){
- thisItem = smallDust;
- ItemStack normalStack = dustInfo.getDust(1);
- ItemStack smallStack = dustInfo.getSmallDust(4);
-
- Utils.LOG_INFO("Generating a 4 Small dust to 1 Dust recipe for "+materialName);
- UtilsRecipe.recipeBuilder(
- thisItem, thisItem, null,
- thisItem, thisItem, null,
- null, null, null,
- normalStack);
-
- Utils.LOG_INFO("Generating a 4 Small dust from 1 Dust recipe for "+materialName);
- UtilsRecipe.recipeBuilder(
- null, normalStack, null,
- null, null, null,
- null, null, null,
- smallStack);
-
- }
- else {
- thisItem = normalDust;
- }
-
- if (thisItem == normalDust){
- Utils.LOG_WARNING("Generating a Dust recipe for "+materialName+" in the mixer.");
-
- if (inputStacks.length != 0){
- GT_Values.RA.addMixerRecipe(
- inputStacks[0], inputStacks[1],
- inputStacks[2], inputStacks[3],
- null, null,
- outputStacks,
- 8*mTier*20, 8*mTier*2);
- }
- else {
- return;
- }
- }
- }
-
-
private void addMacerationRecipe(){
Utils.LOG_WARNING("Adding recipe for "+materialName+" Dusts");
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 0aa819ee48..ea5b90259f 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -35,7 +35,8 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.URANIUM, 90),
+ new MaterialStack(ELEMENT.URANIUM, 45),
+ new MaterialStack(ELEMENT.URANIUM, 45),
new MaterialStack(ELEMENT.TITANIUM, 10)
});
@@ -49,9 +50,9 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.TUNGSTEN, 7),
- new MaterialStack(ELEMENT.TANTALUM, 90),
- new MaterialStack(ELEMENT.TANTALUM, 2)
+ new MaterialStack(ELEMENT.TUNGSTEN, 8),
+ new MaterialStack(ELEMENT.TANTALUM, 46),
+ new MaterialStack(ELEMENT.TANTALUM, 46)
});
public static final Material TANTALLOY_61 = new Material(
@@ -64,10 +65,10 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.TUNGSTEN, 10),
- new MaterialStack(ELEMENT.TANTALUM, 70),
- new MaterialStack(ELEMENT.TITANIUM, 10),
- new MaterialStack(ELEMENT.YTTRIUM, 10)
+ new MaterialStack(ELEMENT.TUNGSTEN, 20),
+ new MaterialStack(ELEMENT.TANTALUM, 60),
+ new MaterialStack(ELEMENT.TITANIUM, 12),
+ new MaterialStack(ELEMENT.YTTRIUM, 8)
});
public static final Material QUANTUM = new Material(
@@ -91,7 +92,8 @@ public final class ALLOY {
false, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.COPPER, 75),
+ new MaterialStack(ELEMENT.COPPER, 35),
+ new MaterialStack(ELEMENT.COPPER, 40),
new MaterialStack(ELEMENT.TIN, 25)
});
@@ -105,7 +107,8 @@ public final class ALLOY {
false, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.GOLD, 70),
+ new MaterialStack(ELEMENT.GOLD, 30),
+ new MaterialStack(ELEMENT.GOLD, 40),
new MaterialStack(ELEMENT.COPPER, 30)
});
@@ -193,8 +196,10 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.CARBON, 05),
- new MaterialStack(ELEMENT.IRON, 95)
+ new MaterialStack(ELEMENT.CARBON, 10),
+ new MaterialStack(ELEMENT.IRON, 30),
+ new MaterialStack(ELEMENT.IRON, 30),
+ new MaterialStack(ELEMENT.IRON, 30)
});
public static final Material ZERON_100 = new Material(
@@ -224,9 +229,9 @@ public final class ALLOY {
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.TITANIUM, 5),
- new MaterialStack(ELEMENT.NICKEL, 16),
- new MaterialStack(ELEMENT.COBALT, 9),
- new MaterialStack(ALLOY.STEEL, 70)
+ new MaterialStack(ELEMENT.NICKEL, 25),
+ new MaterialStack(ELEMENT.COBALT, 10),
+ new MaterialStack(ALLOY.STEEL, 60)
});
public static final Material MARAGING300 = new Material(
@@ -240,8 +245,8 @@ public final class ALLOY {
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.TITANIUM, 10),
- new MaterialStack(ELEMENT.NICKEL, 21),
- new MaterialStack(ELEMENT.COBALT, 14),
+ new MaterialStack(ELEMENT.NICKEL, 20),
+ new MaterialStack(ELEMENT.COBALT, 15),
new MaterialStack(ALLOY.STEEL, 55)
});
@@ -256,8 +261,8 @@ public final class ALLOY {
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(ELEMENT.TITANIUM, 15),
- new MaterialStack(ELEMENT.NICKEL, 21),
- new MaterialStack(ELEMENT.COBALT, 9),
+ new MaterialStack(ELEMENT.NICKEL, 20),
+ new MaterialStack(ELEMENT.COBALT, 10),
new MaterialStack(ALLOY.STEEL, 55)
});
@@ -305,8 +310,8 @@ public final class ALLOY {
new MaterialStack[]{
new MaterialStack(ELEMENT.IRON, 06),
new MaterialStack(ELEMENT.MOLYBDENUM, 24),
- new MaterialStack(ELEMENT.CHROMIUM, 5),
- new MaterialStack(ELEMENT.NICKEL, 65)
+ new MaterialStack(ELEMENT.CHROMIUM, 8),
+ new MaterialStack(ELEMENT.NICKEL, 62)
});
/*public static final Material HASTELLOY_X = new Material(
@@ -351,10 +356,10 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.YTTRIUM, 05),
+ new MaterialStack(ELEMENT.YTTRIUM, 10),
new MaterialStack(ELEMENT.MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.CHROMIUM, 7),
- new MaterialStack(ELEMENT.NICKEL, 72)
+ new MaterialStack(ELEMENT.CHROMIUM, 10),
+ new MaterialStack(ELEMENT.NICKEL, 64)
});
public static final Material HASTELLOY_C276 = new Material(
@@ -415,10 +420,10 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ELEMENT.IRON, 75),
- new MaterialStack(ELEMENT.ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.IRON, 64),
+ new MaterialStack(ELEMENT.ALUMINIUM, 12),
new MaterialStack(ELEMENT.CHROMIUM, 20),
- new MaterialStack(ELEMENT.YTTRIUM, 1)
+ new MaterialStack(ELEMENT.YTTRIUM, 4)
});
public static final Material TUNGSTEN_CARBIDE = new Material(
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 44a8c021f9..3190486537 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -6,10 +6,6 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.UtilsItems;
import gtPlusPlus.core.util.materials.MaterialUtils;
import gtPlusPlus.core.util.math.MathUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
import net.minecraft.item.ItemStack;
public class Material {
@@ -20,7 +16,7 @@ public class Material {
protected Object dataVar;
private MaterialStack[] materialInput = new MaterialStack[4];
- final List<MaterialStack> mMaterialList = new ArrayList<MaterialStack>();
+ public final long[] vSmallestRatio;
final short[] RGBA;
@@ -35,7 +31,7 @@ public class Material {
final long vProtons;
final long vNeutrons;
final long vMass;
- final int smallestStackSizeWhenProcessing; //Add a check for <=0 || > 64
+ public final int smallestStackSizeWhenProcessing; //Add a check for <=0 || > 64
public final int vTier;
public final int vVoltageMultiplier;
public final String vChemicalFormula;
@@ -65,14 +61,14 @@ public class Material {
this.vNeutrons = neutrons;
this.vMass = getMass();
- //List<MaterialStack> inputArray = Arrays.asList(inputs);
+ /*//List<MaterialStack> inputArray = Arrays.asList(inputs);
int tempSmallestSize = getSmallestStackForCrafting(inputs);
if (tempSmallestSize <= 64 && tempSmallestSize >= 1){
this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
}
else {
this.smallestStackSizeWhenProcessing = 50; //Can divide my math by 1/2 and round it~
- }
+ }*/
//Sets the Rad level
if (radiationLevel != 0){
@@ -134,6 +130,28 @@ public class Material {
}
}
}
+
+ this.vSmallestRatio = getSmallestRatio(materialInput);
+ int tempSmallestSize = 0;
+
+ if (vSmallestRatio != null){
+ for (int v=0;v<this.vSmallestRatio.length;v++){
+ tempSmallestSize=(int) (tempSmallestSize+vSmallestRatio[v]);
+ }
+ this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
+ }
+ else {
+ this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes
+ }
+
+
+
+ /*if (tempSmallestSize <= 64 && tempSmallestSize >= 1){
+ this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
+ }
+ else {
+ this.smallestStackSizeWhenProcessing = 50; //Can divide my math by 1/2 and round it~
+ }*/
//Makes a Fancy Chemical Tooltip
this.vChemicalSymbol = chemicalSymbol;
@@ -152,7 +170,7 @@ public class Material {
dataVar = MathUtils.generateSingularRandomHexValue();
Utils.LOG_INFO("Creating a Material instance for "+materialName);
- Utils.LOG_INFO("Formula: "+vChemicalFormula);
+ Utils.LOG_INFO("Formula: "+vChemicalFormula + " Smallest Stack: "+smallestStackSizeWhenProcessing+" Smallest Ratio:"+vSmallestRatio);
Utils.LOG_INFO("Protons: "+vProtons);
Utils.LOG_INFO("Neutrons: "+vNeutrons);
Utils.LOG_INFO("Mass: "+vMass+"/units");
@@ -405,7 +423,7 @@ public class Material {
return null;
}
- public int getSmallestStackForCrafting(MaterialStack[] inputs){
+ private int getSmallestStackForCrafting(MaterialStack[] inputs){
if (inputs != null){
if (inputs.length != 0){
long[] smallestRatio = getSmallestRatio(inputs);
diff --git a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
index 530ac24f98..41dccda796 100644
--- a/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
+++ b/src/Java/gtPlusPlus/core/util/item/UtilsItems.java
@@ -32,6 +32,7 @@ import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.materials.MaterialUtils;
import gtPlusPlus.core.util.wrapper.var;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
@@ -386,6 +387,7 @@ public class UtilsItems {
RecipeGen_Plates.generateRecipes(matInfo);
RecipeGen_Extruder.generateRecipes(matInfo);
RecipeGen_ShapedCrafting.generateRecipes(matInfo);
+ RecipeGen_DustGeneration.generateRecipes(matInfo);
FluidUtils.generateFluid(matInfo, 1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
new file mode 100644
index 0000000000..6a499a640e
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -0,0 +1,109 @@
+package gtPlusPlus.xmod.gregtech.loaders;
+
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import net.minecraft.item.ItemStack;
+
+public class RecipeGen_DustGeneration {
+
+ public static void generateRecipes(Material material){
+ int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
+
+ Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
+ //Ring Recipe
+
+ if (UtilsRecipe.addShapedGregtechRecipe(
+ "craftingToolWrench", null, null,
+ null, material.getRod(1), null,
+ null, null, null,
+ material.getRing(1))){
+ Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+
+
+ ItemStack normalDust = material.getDust(1);
+ ItemStack smallDust = material.getSmallDust(1);
+ ItemStack tinyDust = material.getTinyDust(1);
+
+ ItemStack[] inputStacks = material.getMaterialComposites();
+ ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing);
+
+ if (UtilsRecipe.recipeBuilder(
+ tinyDust, tinyDust, tinyDust,
+ tinyDust, tinyDust, tinyDust,
+ tinyDust, tinyDust, tinyDust,
+ normalDust)){
+ Utils.LOG_INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+
+ if (UtilsRecipe.recipeBuilder(
+ normalDust, null, null,
+ null, null, null,
+ null, null, null,
+ material.getTinyDust(9))){
+ Utils.LOG_INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+
+
+ if (UtilsRecipe.recipeBuilder(
+ smallDust, smallDust, null,
+ smallDust, smallDust, null,
+ null, null, null,
+ normalDust)){
+ Utils.LOG_INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+
+
+ if (UtilsRecipe.recipeBuilder(
+ null, normalDust, null,
+ null, null, null,
+ null, null, null,
+ material.getSmallDust(4))){
+ Utils.LOG_INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+
+
+ if (inputStacks.length > 0){
+ Utils.LOG_INFO(UtilsItems.getArrayStackNames(inputStacks));
+ long[] inputStackSize = material.vSmallestRatio;
+ if (inputStackSize != null){
+ for (short x=0;x<inputStacks.length;x++){
+ if (inputStacks[x] != null && inputStackSize[x] != 0)
+ inputStacks[x].stackSize = (int) inputStackSize[x];
+ }
+ Utils.LOG_INFO(UtilsItems.getArrayStackNames(inputStacks));
+ if (GT_Values.RA.addMixerRecipe(
+ inputStacks[0], inputStacks[1],
+ inputStacks[2], inputStacks[3],
+ null, null,
+ outputStacks,
+ (int) Math.max(material.getMass() * 2L * 1, 1),
+ 6 * material.vVoltageMultiplier)){
+ Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+ }
+ }
+ }
+}
+
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index 0f9a1bca7f..cc7b413061 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -90,7 +90,7 @@ public class RecipeGen_Extruder {
shape_Bolt,
material.getBolt(8),
(int) Math.max(material.getMass() * 2L * 1, 1),
- 8 * material.vVoltageMultiplier)){
+ 6 * material.vVoltageMultiplier)){
Utils.LOG_INFO("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Success");
}
else {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_PleaseRefactorMe.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_PleaseRefactorMe.java
deleted file mode 100644
index 1919534ad0..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_PleaseRefactorMe.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.xmod.gregtech.loaders;
-
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.recipe.UtilsRecipe;
-
-public class RecipeGen_PleaseRefactorMe {
-
- public static void generateRecipes(Material material){
- int tVoltageMultiplier = material.getMeltingPoint_K() >= 2800 ? 64 : 16;
- Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
- //Ring Recipe
-
- if (UtilsRecipe.addShapedGregtechRecipe(
- "craftingToolWrench", null, null,
- null, material.getRod(1), null,
- null, null, null,
- material.getRing(1))){
- Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Success");
- }
- else {
- Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Failed");
- }
-
-
-
- }
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 65eb280c2f..d62e472b0d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -48,7 +48,7 @@ public class RecipeGen_ShapedCrafting {
//Ring Recipe
if (!material.isRadioactive){
if (UtilsRecipe.recipeBuilder(
- "craftingToolWrench", null, null,
+ "craftingToolHardHammer", null, null,
null, material.getRod(1), null,
null, null, null,
material.getRing(1))){
generated by cgit (git 2.46.0) at 2025-03-10 21:55:01 +0000