upstream/ThaumicEnergistics
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicEnergistics.git synced 2026-10-25 20:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow swap wand caps in arcana terminal (#107)

Browse Source
This commit is contained in:
lc-1337 authored and GitHub committed 2026-02-13 18:13:21 +01:00
1 parent 84a8adabb1
commit 8e055ec71d
1 file changed
+40 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/thaumicenergistics/common/container/ContainerPartArcaneCraftingTerminal.java
+40 -4
View File
@@ -161,10 +161,10 @@ public class ContainerPartArcaneCraftingTerminal extends ContainerMEMonitorable
boolean hasAll = true;
AspectList wandAspectList = null;
ItemWandCasting wandItem = null;
AppEngInternalInventory gridInventory = this.terminal.craftingGridInventory;
// Get the cost
this.requiredAspects = ArcaneRecipeHelper.INSTANCE
.getRecipeAspectCost(this.terminal.craftingGridInventory, 0, 9, forRecipe);
this.requiredAspects = ArcaneRecipeHelper.INSTANCE.getRecipeAspectCost(gridInventory, 0, 9, forRecipe);
// Ensure there is a cost
if (this.requiredAspects == null) {
@@ -176,6 +176,12 @@ public class ContainerPartArcaneCraftingTerminal extends ContainerMEMonitorable
ItemStack wand = this.terminal.wandInventory.getStackInSlot(0);
boolean wandInGrid = false;
if (wand == null) {
wand = getWandFromGridInventory();
if (wand != null) wandInGrid = true;
}
// Do we have a wand?
if (wand != null) {
// Get the wand item
@@ -219,7 +225,37 @@ public class ContainerPartArcaneCraftingTerminal extends ContainerMEMonitorable
// Did we have all the vis required?
if (hasAll) {
// Get the result of the recipe.
return ArcaneRecipeHelper.INSTANCE.getRecipeOutput(this.terminal.craftingGridInventory, 0, 9, forRecipe);
if (wandInGrid) {
AppEngInternalInventory ghostGrid = new AppEngInternalInventory(null, gridInventory.getSizeInventory());
for (int i = 0; i < gridInventory.getSizeInventory(); i++) {
ItemStack is = gridInventory.getStackInSlot(i);
if (is != null && is.getItem() instanceof ItemWandCasting ghostWandItem) {
is = is.copy();
ghostWandItem.consumeAllVisCrafting(
is,
this.getInventoryPlayer().player,
this.requiredAspects,
true);
}
ghostGrid.setInventorySlotContents(i, is);
}
return ArcaneRecipeHelper.INSTANCE.getRecipeOutput(ghostGrid, 0, 9, forRecipe);
} else return ArcaneRecipeHelper.INSTANCE
.getRecipeOutput(this.terminal.craftingGridInventory, 0, 9, forRecipe);
}
return null;
}
private ItemStack getWandFromGridInventory() {
AppEngInternalInventory gridInventory = this.terminal.craftingGridInventory;
for (int i = 0; i < gridInventory.getSizeInventory(); i++) {
ItemStack is = gridInventory.getStackInSlot(i);
if (wandSlot.isItemValid(is)) {
return is;
}
}
return null;
@@ -363,7 +399,7 @@ public class ContainerPartArcaneCraftingTerminal extends ContainerMEMonitorable
ItemStack wand = this.terminal.wandInventory.getStackInSlot(0);
if (wand != null && wand.getItem() instanceof ItemWandCasting wandItem) {
wandItem.consumeAllVisCrafting(wand, player, this.requiredAspects, true);
} else {
} else if (getWandFromGridInventory() == null) {
AELog.error("Failed consume vis from the wand");
return;
}