Skip to content

Commit

Permalink
replacement
Browse files Browse the repository at this point in the history 
replace new ItemStack(ItemStack) to ItemStackUtil.getCleanItem(ItemStack)
  • Loading branch information
@balugaq
balugaq committed Jan 20, 2025
1 parent e745b3e commit 3120137
Show file tree
Hide file tree
Showing 16 changed files with 97 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/balugaq/netex/api/data/ItemWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public ItemWrapper shallowClone() {

@Nonnull
public ItemWrapper deepClone() {
return new ItemWrapper(new ItemStack(this.itemStack));
return new ItemWrapper(ItemStackUtil.getCleanItem(this.itemStack));
}

@Override
Expand All @@ -139,7 +139,7 @@ public int hashCode() {
@Override
public boolean equals(@Nonnull Object obj) {
if (this.itemStack instanceof ItemStackWrapper) {
return new ItemStack(this.itemStack).equals(obj);
return ItemStackUtil.getCleanItem(this.itemStack).equals(obj);
} else {
return this.itemStack.equals(obj);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/balugaq/netex/api/helpers/SupportedAncientAltarRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -29,7 +30,7 @@ public final class SupportedAncientAltarRecipes implements HasRecipes, CanTestRe
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedArmorForgeRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedArmorForgeRecipes implements HasRecipes, CanTestReci
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedArmorForgeRecipes implements HasRecipes, CanTestReci
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedCompressorRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedCompressorRecipes implements HasRecipes, CanTestReci
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedCompressorRecipes implements HasRecipes, CanTestReci
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedCraftingTableRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedCraftingTableRecipes implements HasRecipes, CanTestR
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedCraftingTableRecipes implements HasRecipes, CanTestR
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/balugaq/netex/api/helpers/SupportedExpansionWorkbenchRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.implementation.machines.manual.ExpansionWorkbench;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -30,7 +31,7 @@ public final class SupportedExpansionWorkbenchRecipes implements HasRecipes, Can
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedGrindStoneRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedGrindStoneRecipes implements HasRecipes, CanTestReci
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedGrindStoneRecipes implements HasRecipes, CanTestReci
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedJuicerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedJuicerRecipes implements HasRecipes, CanTestRecipe {
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedJuicerRecipes implements HasRecipes, CanTestRecipe {
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedMagicWorkbenchRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedMagicWorkbenchRecipes implements HasRecipes, CanTest
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedMagicWorkbenchRecipes implements HasRecipes, CanTest
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedOreCrusherRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedOreCrusherRecipes implements HasRecipes, CanTestReci
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedOreCrusherRecipes implements HasRecipes, CanTestReci
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedPressureChamberRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedPressureChamberRecipes implements HasRecipes, CanTes
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedPressureChamberRecipes implements HasRecipes, CanTes
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/balugaq/netex/api/helpers/SupportedQuantumWorkbenchRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.slimefun.network.NetworkQuantumWorkbench;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
Expand Down Expand Up @@ -30,7 +31,7 @@ public final class SupportedQuantumWorkbenchRecipes implements HasRecipes, CanTe
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/balugaq/netex/api/helpers/SupportedSmelteryRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.balugaq.netex.api.interfaces.CanTestRecipe;
import com.balugaq.netex.api.interfaces.HasRecipes;
import com.ytdd9527.networksexpansion.utils.itemstacks.ItemStackUtil;
import io.github.sefiraat.networks.utils.StackUtils;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
Expand Down Expand Up @@ -44,7 +45,13 @@ public final class SupportedSmelteryRecipes implements HasRecipes, CanTestRecipe
}
input = newInput;
}
RECIPES.put(input, output[0]);
ItemStack[] cleanedInput = new ItemStack[9];
ItemStack cleanedOutput = null;
for (int i = 0; i < 9; i++) {
cleanedInput[i] = ItemStackUtil.getCleanItem(input[i]);
}
cleanedOutput = ItemStackUtil.getCleanItem(output[0]);
RECIPES.put(cleanedInput, cleanedOutput);
}
isInput = !isInput;
}
Expand All @@ -58,7 +65,7 @@ public final class SupportedSmelteryRecipes implements HasRecipes, CanTestRecipe
if (itemStack == null) {
itemStacks[i] = null;
} else {
itemStacks[i] = new ItemStack(itemStack.clone());
itemStacks[i] = ItemStackUtil.getCleanItem(itemStack);
}
if (++i >= 9) {
break;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/balugaq/netex/api/interfaces/RecipeItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default List<ItemStack> getDisplayRecipes() {
int inputLength = recipe.getInput().length;
int outputLength = recipe instanceof RandomMachineRecipe ? ((RandomMachineRecipe) recipe).getAllOutput().length : recipe.getOutput().length;
for (int i = 0; i < inputLength; i++) {
displayRecipes.add(new ItemStack(recipe.getInput()[i]));
displayRecipes.add(ItemStackUtil.getCleanItem(recipe.getInput()[i]));
if (i < inputLength - 1) {
displayRecipes.add(new ItemStack(Material.AIR));
}
Expand All @@ -46,7 +46,7 @@ default List<ItemStack> getDisplayRecipes() {
if (i != 0) {
displayRecipes.add(new ItemStack(Material.AIR));
}
displayRecipes.add(new ItemStack(recipe instanceof RandomMachineRecipe ? ((RandomMachineRecipe) recipe).getAllOutput()[i] : recipe.getOutput()[i]));
displayRecipes.add(ItemStackUtil.getCleanItem(recipe instanceof RandomMachineRecipe ? ((RandomMachineRecipe) recipe).getAllOutput()[i] : recipe.getOutput()[i]));
}
}
return displayRecipes;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ytdd9527/networksexpansion/core/items/machines/AbstractEncoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void tryEncode(@Nonnull Player player, @Nonnull BlockMenu blockMenu) {

for (Map.Entry<ItemStack[], ItemStack> entry : getRecipeEntries()) {
if (getRecipeTester(inputs, entry.getKey())) {
crafted = new ItemStack(entry.getValue().clone());
crafted = ItemStackUtil.getCleanItem(entry.getValue().clone());
inp = entry.getKey().clone();
for (int k = 0; k < inp.length; k++) {
if (inp[k] != null) {
Expand Down
Loading

0 comments on commit 3120137

Please sign in to comment.