Skip to content

Commit 378e35a

Browse files
authored
Merge pull request Sefiraat#208 from balugaq/master
rollback changes
2 parents 93773b0 + 50f40e9 commit 378e35a

12 files changed

+21
-75
lines changed

src/main/java/com/balugaq/netex/api/helpers/SupportedAncientAltarRecipes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public final class SupportedAncientAltarRecipes implements HasRecipes, CanTestRe
3030
if (itemStack == null) {
3131
itemStacks[i] = null;
3232
} else {
33-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
33+
itemStacks[i] = new ItemStack(itemStack.clone());
3434
}
3535
if (++i >= 9) {
3636
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedArmorForgeRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedArmorForgeRecipes implements HasRecipes, CanTestReci
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedArmorForgeRecipes implements HasRecipes, CanTestReci
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedCompressorRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedCompressorRecipes implements HasRecipes, CanTestReci
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedCompressorRecipes implements HasRecipes, CanTestReci
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedCraftingTableRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedCraftingTableRecipes implements HasRecipes, CanTestR
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedCraftingTableRecipes implements HasRecipes, CanTestR
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedExpansionWorkbenchRecipes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class SupportedExpansionWorkbenchRecipes implements HasRecipes, Can
3131
if (itemStack == null) {
3232
itemStacks[i] = null;
3333
} else {
34-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
34+
itemStacks[i] = new ItemStack(itemStack.clone());
3535
}
3636
if (++i >= 9) {
3737
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedGrindStoneRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedGrindStoneRecipes implements HasRecipes, CanTestReci
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedGrindStoneRecipes implements HasRecipes, CanTestReci
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedJuicerRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedJuicerRecipes implements HasRecipes, CanTestRecipe {
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedJuicerRecipes implements HasRecipes, CanTestRecipe {
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedMagicWorkbenchRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedMagicWorkbenchRecipes implements HasRecipes, CanTest
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedMagicWorkbenchRecipes implements HasRecipes, CanTest
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedOreCrusherRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedOreCrusherRecipes implements HasRecipes, CanTestReci
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedOreCrusherRecipes implements HasRecipes, CanTestReci
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedPressureChamberRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedPressureChamberRecipes implements HasRecipes, CanTes
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedPressureChamberRecipes implements HasRecipes, CanTes
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedQuantumWorkbenchRecipes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class SupportedQuantumWorkbenchRecipes implements HasRecipes, CanTe
3131
if (itemStack == null) {
3232
itemStacks[i] = null;
3333
} else {
34-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
34+
itemStacks[i] = new ItemStack(itemStack.clone());
3535
}
3636
if (++i >= 9) {
3737
break;

src/main/java/com/balugaq/netex/api/helpers/SupportedSmelteryRecipes.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ public final class SupportedSmelteryRecipes implements HasRecipes, CanTestRecipe
4545
}
4646
input = newInput;
4747
}
48-
ItemStack[] cleanedInput = new ItemStack[9];
49-
ItemStack cleanedOutput = null;
50-
for (int i = 0; i < 9; i++) {
51-
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
52-
}
53-
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
54-
RECIPES.put(cleanedInput, cleanedOutput);
48+
RECIPES.put(input, output[0]);
5549
}
5650
isInput = !isInput;
5751
}
@@ -65,7 +59,7 @@ public final class SupportedSmelteryRecipes implements HasRecipes, CanTestRecipe
6559
if (itemStack == null) {
6660
itemStacks[i] = null;
6761
} else {
68-
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
62+
itemStacks[i] = new ItemStack(itemStack.clone());
6963
}
7064
if (++i >= 9) {
7165
break;

0 commit comments

Comments
 (0)