aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-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
4 files changed, 111 insertions, 30 deletions
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))){