fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

encoded pattern render fixes

Browse Source
This commit is contained in:
PrototypeTrousers
2022-10-12 04:08:39 -03:00
parent 88e3df897e
commit 601faf5087
2 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+8 -27
View File
@@ -29,17 +29,8 @@ import appeng.client.me.SlotDisconnected;
import appeng.client.me.SlotME; import appeng.client.me.SlotME;
import appeng.client.render.StackSizeRenderer; import appeng.client.render.StackSizeRenderer;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.slot.AppEngCraftingSlot; import appeng.container.slot.*;
import appeng.container.slot.AppEngSlot;
import appeng.container.slot.AppEngSlot.hasCalculatedValidness; import appeng.container.slot.AppEngSlot.hasCalculatedValidness;
import appeng.container.slot.IOptionalSlot;
import appeng.container.slot.SlotCraftingTerm;
import appeng.container.slot.SlotDisabled;
import appeng.container.slot.SlotFake;
import appeng.container.slot.SlotInaccessible;
import appeng.container.slot.SlotOutput;
import appeng.container.slot.SlotPatternTerm;
import appeng.container.slot.SlotRestrictedInput;
import appeng.core.AELog; import appeng.core.AELog;
import appeng.core.AppEng; import appeng.core.AppEng;
import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.NetworkHandler;
@@ -82,18 +73,13 @@ import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import yalter.mousetweaks.api.IMTModGuiContainer2; import yalter.mousetweaks.api.IMTModGuiContainer2;
import javax.annotation.Nonnull;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static appeng.integration.modules.jei.JEIPlugin.aeGuiHandler; import static appeng.integration.modules.jei.JEIPlugin.aeGuiHandler;
@@ -905,8 +891,8 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
} }
} }
if (s instanceof SlotFake) { if (s instanceof AppEngSlot) {
((SlotFake) s).setDisplay(true); ((AppEngSlot) s).setDisplay(true);
this.zLevel = 100.0F; this.zLevel = 100.0F;
this.itemRender.zLevel = 100.0F; this.itemRender.zLevel = 100.0F;
@@ -918,15 +904,10 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
this.itemRender.zLevel = 0.0F; this.itemRender.zLevel = 0.0F;
// Annoying but easier than trying to splice into render item // Annoying but easier than trying to splice into render item
super.drawSlot(new Size1Slot(new SlotItemHandler(((SlotFake) s).getItemHandler(), s.getSlotIndex(), s.xPos, s.yPos)));
this.stackSizeRenderer.renderStackSize(this.fontRenderer, AEItemStack.fromItemStack(s.getStack()), s.xPos, s.yPos);
return;
}
if (s instanceof AppEngSlot) {
((AppEngSlot) s).setDisplay(true);
super.drawSlot(s); super.drawSlot(s);
this.stackSizeRenderer.renderStackSize(this.fontRenderer, AEItemStack.fromItemStack(((AppEngSlot) s).getDisplayStack()), s.xPos, s.yPos);
return;
} else { } else {
super.drawSlot(s); super.drawSlot(s);
} }
src/main/java/appeng/container/slot/AppEngSlot.java
+3 -1
View File
@@ -96,7 +96,9 @@ public class AppEngSlot extends Slot {
if (this.isDisplay()) { if (this.isDisplay()) {
this.setDisplay(false); this.setDisplay(false);
return this.getDisplayStack(); ItemStack retStack = this.getDisplayStack().copy();
retStack.setCount(1);
return retStack;
} }
return this.itemHandler.getStackInSlot(this.index); return this.itemHandler.getStackInSlot(this.index);