mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-17 11:05:07 +00:00
Bookmarks Chains: Optimize GTTools (#667)
This commit is contained in:
1 parent
b87e389132
commit
0634466851
9 files changed
+138
-97
No files matched your search
@@ -6,11 +6,12 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import codechicken.nei.ItemStackAmount;
|
||||
import codechicken.nei.NEIClientUtils;
|
||||
@@ -22,6 +23,19 @@ import codechicken.nei.recipe.StackInfo;
|
||||
|
||||
public class RecipeChainMath {
|
||||
|
||||
private static class ContainerItemResult {
|
||||
|
||||
public ItemStack stack;
|
||||
public ItemStack containerItem;
|
||||
public long leftSteps;
|
||||
|
||||
public ContainerItemResult(ItemStack stack, long leftSteps, ItemStack containerItem) {
|
||||
this.stack = stack;
|
||||
this.leftSteps = leftSteps;
|
||||
this.containerItem = containerItem;
|
||||
}
|
||||
}
|
||||
|
||||
private static final ItemStack ROOT_ITEM = new ItemStack(Blocks.fire);
|
||||
private static final RecipeId ROOT_RECIPE_ID = RecipeId
|
||||
.of(ROOT_ITEM, "recipe-autocrafting", Collections.emptyList());
|
||||
@@ -280,6 +294,9 @@ public class RecipeChainMath {
|
||||
}
|
||||
|
||||
public RecipeChainMath refresh() {
|
||||
final boolean isPausedItemDamageSound = StackInfo.isPausedItemDamageSound();
|
||||
StackInfo.pauseItemDamageSound(true);
|
||||
|
||||
resetCalculation();
|
||||
|
||||
if (this.outputRecipes.containsKey(ROOT_RECIPE_ID)) {
|
||||
@@ -313,6 +330,7 @@ public class RecipeChainMath {
|
||||
}
|
||||
}
|
||||
|
||||
StackInfo.pauseItemDamageSound(isPausedItemDamageSound);
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -405,22 +423,13 @@ public class RecipeChainMath {
|
||||
ItemStack bStack = this.containerItems.get(i);
|
||||
|
||||
if (bStack != null && NEIClientUtils.areStacksSameTypeCraftingWithNBT(aStack, bStack)) {
|
||||
final ContainerItemResult result = getToolsContainerItems(bStack, steps);
|
||||
|
||||
while (bStack != null && steps > 0) {
|
||||
final Optional<ItemStack> containerItem = StackInfo.getContainerItem(bStack);
|
||||
bStack = result.stack;
|
||||
steps = result.leftSteps;
|
||||
|
||||
steps--;
|
||||
|
||||
if (containerItem != null && containerItem.isPresent()) {
|
||||
bStack = containerItem.get();
|
||||
|
||||
if (aStack.getItem() != bStack.getItem()) {
|
||||
this.containerItems.add(bStack);
|
||||
bStack = null;
|
||||
}
|
||||
} else {
|
||||
bStack = null;
|
||||
}
|
||||
if (result.containerItem != null) {
|
||||
this.containerItems.add(result.containerItem);
|
||||
}
|
||||
|
||||
this.containerItems.set(i, bStack);
|
||||
@@ -433,6 +442,60 @@ public class RecipeChainMath {
|
||||
return steps;
|
||||
}
|
||||
|
||||
private ContainerItemResult getToolsContainerItems(ItemStack aStack, long steps) {
|
||||
final NBTTagCompound tagCompound = aStack.getTagCompound();
|
||||
|
||||
if (tagCompound != null && tagCompound.hasKey("GT.ToolStats")) {
|
||||
final int damagePerContainerCraft = getGTToolDamagePerContainerCraft(aStack);
|
||||
|
||||
if (damagePerContainerCraft > 0) {
|
||||
final NBTTagCompound toolStats = tagCompound.getCompoundTag("GT.ToolStats");
|
||||
final long maxDamage = toolStats.getLong("MaxDamage");
|
||||
final long damage = toolStats.getLong("Damage");
|
||||
final long leftSteps = (maxDamage - damage) / damagePerContainerCraft;
|
||||
final long availableSteps = Math.min(steps, Math.max(1, leftSteps));
|
||||
|
||||
steps -= availableSteps;
|
||||
|
||||
if ((damage + availableSteps * damagePerContainerCraft) == maxDamage || leftSteps <= 0) {
|
||||
aStack = null;
|
||||
} else {
|
||||
toolStats.setLong("Damage", damage + availableSteps * damagePerContainerCraft);
|
||||
}
|
||||
|
||||
return new ContainerItemResult(aStack, steps, null);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
final Item item = aStack.getItem();
|
||||
|
||||
while (aStack != null && steps > 0) {
|
||||
aStack = item.getContainerItem(aStack);
|
||||
|
||||
steps--;
|
||||
|
||||
if (aStack != null && item != aStack.getItem()) {
|
||||
return new ContainerItemResult(null, steps, aStack);
|
||||
}
|
||||
}
|
||||
|
||||
return new ContainerItemResult(aStack, steps, null);
|
||||
}
|
||||
|
||||
private int getGTToolDamagePerContainerCraft(ItemStack aStack) {
|
||||
|
||||
try {
|
||||
final Object toolStats = aStack.getItem().getClass().getMethod("getToolStats", ItemStack.class)
|
||||
.invoke(aStack.getItem(), aStack);
|
||||
return (int) toolStats.getClass().getMethod("getToolDamagePerContainerCraft").invoke(toolStats);
|
||||
} catch (Throwable th) {
|
||||
th.printStackTrace();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private boolean hasContainerItem(ItemStack aStack) {
|
||||
|
||||
if (aStack.getItem().hasContainerItem(aStack)) {
|
||||
|
||||
Reference in new issue
Block a user