upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pattern view for exotic stacks, fix pattern tooltips which containt super exotic stack and gt present (#1081)

Browse Source
This commit is contained in:
lc-1337 authored and GitHub committed 2026-02-20 16:01:49 +01:00
1 parent bc91fea2f4
commit f0f28dd8b4
2 files changed
+16 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/integration/modules/NEIHelpers/NEIPatternViewHandler.java
+13 -16
View File
@@ -21,7 +21,6 @@ import net.minecraft.util.ResourceLocation;
import appeng.api.config.TerminalFontSize;
import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAEStack;
import appeng.client.render.StackSizeRenderer;
import appeng.core.localization.GuiText;
@@ -183,7 +182,7 @@ public class NEIPatternViewHandler implements IUsageHandler {
public void initializeLayout() {
boolean isCraftable = patternDetails.isCraftable();
List<IAEItemStack> aeOutputs = getFilteredStacks(patternDetails.getAEOutputs());
List<IAEStack<?>> aeOutputs = getFilteredStacks(patternDetails.getAEOutputs());
int nonNullOutputs = (int) aeOutputs.stream().filter(Objects::nonNull).count();
if (isCraftable) {
@@ -229,26 +228,24 @@ public class NEIPatternViewHandler implements IUsageHandler {
outputsOffsetX = inputsOffsetX + inputsCols * 18 + 40;
}
public List<IAEItemStack> getFilteredStacks(IAEStack<?>[] stacks) {
public List<IAEStack<?>> getFilteredStacks(IAEStack<?>[] stacks) {
boolean isCraftable = patternDetails.isCraftable();
return Arrays.stream(stacks).filter(stack -> isCraftable || stack != null)
.map(stack -> stack instanceof IAEItemStack ? (IAEItemStack) stack : null)
.filter(stack -> isCraftable || stack != null).collect(Collectors.toList());
return Arrays.stream(stacks).filter(stack -> isCraftable || stack != null).collect(Collectors.toList());
}
public void initializeSlots() {
inputSlots.clear();
outputSlots.clear();
List<IAEItemStack> aeInputs = getFilteredStacks(patternDetails.getAEInputs());
List<IAEItemStack> aeOutputs = getFilteredStacks(patternDetails.getAEOutputs());
List<IAEStack<?>> aeInputs = getFilteredStacks(patternDetails.getAEInputs());
List<IAEStack<?>> aeOutputs = getFilteredStacks(patternDetails.getAEOutputs());
populateInputSlots(aeInputs);
populateOutputSlots(aeOutputs);
}
public void populateInputSlots(List<IAEItemStack> inputs) {
public void populateInputSlots(List<IAEStack<?>> inputs) {
for (int i = 0; i < inputsCols * inputsRows; i++) {
int row = i / inputsCols;
int col = i % inputsCols;
@@ -256,10 +253,10 @@ public class NEIPatternViewHandler implements IUsageHandler {
int y = SLOTS_OFFSET_Y + row * 18 + 1;
if (i < inputs.size()) {
IAEItemStack aeInput = inputs.get(i);
IAEStack<?> aeInput = inputs.get(i);
if (aeInput != null) {
ItemStack inputStack = aeInput.getItemStack().copy();
inputStack.stackSize = 1;
ItemStack inputStack = aeInput.getItemStackForNEI(aeInput.isFluid() ? 0 : 1);
if (inputStack == null) continue;
PositionedStack posStack = createPositionedStack(inputStack, x, y);
inputSlots.add(new ViewItemStack(posStack, aeInput.getStackSize()));
}
@@ -267,7 +264,7 @@ public class NEIPatternViewHandler implements IUsageHandler {
}
}
public void populateOutputSlots(List<IAEItemStack> outputs) {
public void populateOutputSlots(List<IAEStack<?>> outputs) {
for (int i = 0; i < outputsCols * outputsRows; i++) {
int row = i / outputsCols;
int col = i % outputsCols;
@@ -275,10 +272,10 @@ public class NEIPatternViewHandler implements IUsageHandler {
int y = patternDetails.isCraftable() && i == 0 ? craftingOutputY + 1 : SLOTS_OFFSET_Y + row * 18 + 1;
if (i < outputs.size()) {
IAEItemStack aeOutput = outputs.get(i);
IAEStack<?> aeOutput = outputs.get(i);
if (aeOutput != null) {
ItemStack outputStack = aeOutput.getItemStack().copy();
outputStack.stackSize = 1;
ItemStack outputStack = aeOutput.getItemStackForNEI(aeOutput.isFluid() ? 0 : 1);
if (outputStack == null) continue;
PositionedStack posStack = createPositionedStack(outputStack, x, y);
outputSlots.add(new ViewItemStack(posStack, aeOutput.getStackSize()));
}
src/main/java/appeng/items/misc/ItemEncodedPattern.java
+3 -4
View File
@@ -278,10 +278,9 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
String itemCountText = NumberFormat.getNumberInstance(locale).format(item.getStackSize());
String itemText;
if (isGTLoaded) {
itemText = isFluid ? Platform.getItemDisplayName(item).replace("drop of", "")
: ((IAEItemStack) item).getItem() instanceof ItemIntegratedCircuit
? Platform.getItemDisplayName(item) + " "
+ ((IAEItemStack) item).getItemStack().getItemDamage()
itemText = isFluid ? Platform.getItemDisplayName(item)
: item instanceof IAEItemStack ais && ais.getItem() instanceof ItemIntegratedCircuit
? Platform.getItemDisplayName(item) + " " + ais.getItemStack().getItemDamage()
: Platform.getItemDisplayName(item);
} else {
itemText = Platform.getItemDisplayName(item);