dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getting a stack of unstackable stuff from grid + text rendering order

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-03-29 01:39:18 +02:00
parent 2ed22acb67
commit b63758ad78
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/gui/GuiBase.java
View File

@@ -159,6 +159,8 @@ public abstract class GuiBase extends GuiContainer {
} }
public void drawItemOverlay(ItemStack stack, String text, int x, int y) { public void drawItemOverlay(ItemStack stack, String text, int x, int y) {
itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
if (text != null) { if (text != null) {
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate(x, y, 1); GlStateManager.translate(x, y, 1);
@@ -182,8 +184,6 @@ public abstract class GuiBase extends GuiContainer {
GlStateManager.disableBlend(); GlStateManager.disableBlend();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, "");
} }
public void drawString(int x, int y, String message) { public void drawString(int x, int y, String message) {

4
src/main/java/refinedstorage/network/MessageStoragePull.java
View File

@@ -73,7 +73,9 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
} }
} else if (message.one) { } else if (message.one) {
quantity = 1; quantity = 1;
} else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack())) { }
if (quantity > item.getType().getItemStackLimit(item.toItemStack())) {
quantity = item.getType().getItemStackLimit(item.toItemStack()); quantity = item.getType().getItemStackLimit(item.toItemStack());
} }