From a26db02ebe5e506085114f85b1f5ec4d86058ff1 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 10 Jun 2016 13:57:52 +0200 Subject: [PATCH] Changed ESD to allow higher numbers of slots and also have no limit on the max number to input so that you can basically make it pull from infinitely many slots if the amount of slots present is able to change --- .../mod/inventory/ContainerInputter.java | 4 +- .../mod/inventory/gui/GuiInputter.java | 48 +++++++++--------- .../mod/tile/TileEntityInputter.java | 34 +++++++------ .../textures/gui/guiInputter.png | Bin 3900 -> 3842 bytes .../textures/gui/guiInputterAdvanced.png | Bin 1997 -> 2662 bytes 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 23cbb2d74..87a82485e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -46,11 +46,11 @@ public class ContainerInputter extends Container{ for(int i = 0; i < 3; i++){ for(int j = 0; j < 9; j++){ - this.addSlotToContainer(new Slot(inventory, j+i*9+9, 8+j*18, 97+i*18+(isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); + this.addSlotToContainer(new Slot(inventory, j+i*9+9, 8+j*18, 101+i*18+(isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); } } for(int i = 0; i < 9; i++){ - this.addSlotToContainer(new Slot(inventory, i, 8+i*18, 155+(isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); + this.addSlotToContainer(new Slot(inventory, i, 8+i*18, 159+(isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index d586d4b19..e48a212a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -40,7 +40,7 @@ import java.util.List; public class GuiInputter extends GuiContainer{ public static final int OFFSET_ADVANCED = 12+36; - public static final String[] sideString = new String[]{ + public static final String[] SIDES = new String[]{ StringUtil.localize("info."+ModUtil.MOD_ID+".gui.disabled"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.up"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.down"), @@ -48,8 +48,8 @@ public class GuiInputter extends GuiContainer{ StringUtil.localize("info."+ModUtil.MOD_ID+".gui.east"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.south"), StringUtil.localize("info."+ModUtil.MOD_ID+".gui.west")}; - private static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiInputter"); - private static final ResourceLocation resLocAdvanced = AssetUtil.getGuiLocation("guiInputterAdvanced"); + private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("guiInputter"); + private static final ResourceLocation RES_LOC_ADVANCED = AssetUtil.getGuiLocation("guiInputterAdvanced"); public final TileEntityInputter tileInputter; private final int x; private final int y; @@ -71,7 +71,7 @@ public class GuiInputter extends GuiContainer{ this.z = z; this.world = world; this.xSize = 176; - this.ySize = 93+86+(isAdvanced ? OFFSET_ADVANCED : 0); + this.ySize = 97+86+(isAdvanced ? OFFSET_ADVANCED : 0); this.isAdvanced = isAdvanced; } @@ -80,18 +80,18 @@ public class GuiInputter extends GuiContainer{ public void initGui(){ super.initGui(); - this.fieldPullStart = new GuiTextField(3000, this.fontRendererObj, this.guiLeft+13, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 27, 8); - this.fieldPullStart.setMaxStringLength(4); + this.fieldPullStart = new GuiTextField(3000, this.fontRendererObj, this.guiLeft+6, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPullStart.setMaxStringLength(5); this.fieldPullStart.setEnableBackgroundDrawing(false); - this.fieldPullEnd = new GuiTextField(3001, this.fontRendererObj, this.guiLeft+50, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 27, 8); - this.fieldPullEnd.setMaxStringLength(4); + this.fieldPullEnd = new GuiTextField(3001, this.fontRendererObj, this.guiLeft+50, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPullEnd.setMaxStringLength(5); this.fieldPullEnd.setEnableBackgroundDrawing(false); - this.fieldPutStart = new GuiTextField(3002, this.fontRendererObj, this.guiLeft+98, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 27, 8); - this.fieldPutStart.setMaxStringLength(4); + this.fieldPutStart = new GuiTextField(3002, this.fontRendererObj, this.guiLeft+91, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPutStart.setMaxStringLength(5); this.fieldPutStart.setEnableBackgroundDrawing(false); - this.fieldPutEnd = new GuiTextField(3004, this.fontRendererObj, this.guiLeft+135, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 27, 8); - this.fieldPutEnd.setMaxStringLength(4); + this.fieldPutEnd = new GuiTextField(3004, this.fontRendererObj, this.guiLeft+135, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0), 34, 8); + this.fieldPutEnd.setMaxStringLength(5); this.fieldPutEnd.setEnableBackgroundDrawing(false); SmallerButton buttonSidePutP = new SmallerButton(0, this.guiLeft+155, this.guiTop+43+(this.isAdvanced ? OFFSET_ADVANCED : 0), ">"); @@ -112,7 +112,7 @@ public class GuiInputter extends GuiContainer{ this.buttonList.add(this.whitelistPull); } - this.buttonList.add(new TinyButton(TileEntityInputter.OKAY_BUTTON_ID, this.guiLeft+84, this.guiTop+80+(this.isAdvanced ? OFFSET_ADVANCED : 0))); + this.buttonList.add(new TinyButton(TileEntityInputter.OKAY_BUTTON_ID, this.guiLeft+84, this.guiTop+91+(this.isAdvanced ? OFFSET_ADVANCED : 0))); } @Override @@ -143,16 +143,16 @@ public class GuiInputter extends GuiContainer{ int newTopOffset = this.guiTop+(this.isAdvanced ? OFFSET_ADVANCED : 0); //Info Mode on! - if(x >= this.guiLeft+11 && y >= newTopOffset+65 && x <= this.guiLeft+11+31 && y <= newTopOffset+65+12){ + if(x >= this.guiLeft+4 && y >= newTopOffset+65 && x <= this.guiLeft+4+38 && y <= newTopOffset+65+12){ this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); } - if(x >= this.guiLeft+96 && y >= newTopOffset+65 && x <= this.guiLeft+96+31 && y <= newTopOffset+65+12){ + if(x >= this.guiLeft+89 && y >= newTopOffset+65 && x <= this.guiLeft+89+38 && y <= newTopOffset+65+12){ this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.1").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); } - if(x >= this.guiLeft+48 && y >= newTopOffset+65 && x <= this.guiLeft+48+31 && y <= newTopOffset+65+12){ + if(x >= this.guiLeft+48 && y >= newTopOffset+65 && x <= this.guiLeft+48+38 && y <= newTopOffset+65+12){ this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.pull")), 200), x, y); } - if(x >= this.guiLeft+133 && y >= newTopOffset+65 && x <= this.guiLeft+133+31 && y <= newTopOffset+65+12){ + if(x >= this.guiLeft+133 && y >= newTopOffset+65 && x <= this.guiLeft+133+38 && y <= newTopOffset+65+12){ this.drawHoveringText(this.fontRendererObj.listFormattedStringToWidth(StringUtil.localizeFormatted("info."+ModUtil.MOD_ID+".inputter.info.2").replace("

", StringUtil.localize("info."+ModUtil.MOD_ID+".gui.put")), 200), x, y); } } @@ -167,20 +167,20 @@ public class GuiInputter extends GuiContainer{ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop+93+(this.isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); + this.drawTexturedModalRect(this.guiLeft, this.guiTop+97+(this.isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(this.isAdvanced ? resLocAdvanced : resLoc); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93+(this.isAdvanced ? OFFSET_ADVANCED : 0)); + this.mc.getTextureManager().bindTexture(this.isAdvanced ? RES_LOC_ADVANCED : RES_LOC); + this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 97+(this.isAdvanced ? OFFSET_ADVANCED : 0)); this.fontRendererObj.drawString("INBOUND", this.guiLeft+23+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); this.fontRendererObj.drawString("OUTBOUND", this.guiLeft+104+3, this.guiTop+32+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(sideString[this.tileInputter.sideToPull+1], this.guiLeft+24+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(sideString[this.tileInputter.sideToPut+1], this.guiLeft+109+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRendererObj.drawString(SIDES[this.tileInputter.sideToPull+1], this.guiLeft+24+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRendererObj.drawString(SIDES[this.tileInputter.sideToPut+1], this.guiLeft+109+1, this.guiTop+45+3+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutStart), this.guiLeft+99, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutStart), this.guiLeft+92, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutEnd), this.guiLeft+136, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullStart), this.guiLeft+14, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullStart), this.guiLeft+7, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullEnd), this.guiLeft+51, this.guiTop+67+(this.isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); this.fieldPutStart.drawTextBox(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java index 9d2b4dcde..67badc6ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java @@ -11,7 +11,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import com.sun.org.apache.bcel.internal.generic.PUTFIELD; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; import de.ellpeck.actuallyadditions.mod.util.WorldUtil; @@ -63,17 +62,17 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt public void onNumberReceived(int text, int textID, EntityPlayer player){ if(text != -1){ if(textID == 0){ - this.slotToPutStart = this.placeToPut instanceof IInventory ? Math.max(Math.min(text, ((IInventory)this.placeToPut).getSizeInventory()-1), 0) : text; + this.slotToPutStart = Math.max(text, 0); } if(textID == 1){ - this.slotToPutEnd = this.placeToPut instanceof IInventory ? Math.max(Math.min(text, ((IInventory)this.placeToPut).getSizeInventory()), 0) : text; + this.slotToPutEnd = Math.max(text, 0); } if(textID == 2){ - this.slotToPullStart = this.placeToPull instanceof IInventory ? Math.max(Math.min(text, ((IInventory)this.placeToPull).getSizeInventory()-1), 0) : text; + this.slotToPullStart = Math.max(text, 0); } if(textID == 3){ - this.slotToPullEnd = this.placeToPull instanceof IInventory ? Math.max(Math.min(text, ((IInventory)this.placeToPull).getSizeInventory()), 0) : text; + this.slotToPullEnd = Math.max(text, 0); } } this.markDirty(); @@ -279,20 +278,23 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt * Sets all of the relevant variables */ public void initVars(){ + if(this.sideToPull != -1){ + this.placeToPull = WorldUtil.getTileEntityFromSide(WorldUtil.getDirectionBySidesInOrder(this.sideToPull), this.worldObj, this.pos); - //Gets the Place to put and Pull - this.placeToPull = WorldUtil.getTileEntityFromSide(WorldUtil.getDirectionBySidesInOrder(this.sideToPull), this.worldObj, this.pos); - this.placeToPut = WorldUtil.getTileEntityFromSide(WorldUtil.getDirectionBySidesInOrder(this.sideToPut), this.worldObj, this.pos); - - //Resets the Variables - if(this.placeToPull instanceof IInventory){ - if(this.slotToPullEnd <= 0){ - this.slotToPullEnd = ((IInventory)this.placeToPull).getSizeInventory(); + if(this.placeToPull instanceof IInventory){ + if(this.slotToPullEnd <= 0){ + this.slotToPullEnd = ((IInventory)this.placeToPull).getSizeInventory(); + } } } - if(this.placeToPut instanceof IInventory){ - if(this.slotToPutEnd <= 0){ - this.slotToPutEnd = ((IInventory)this.placeToPut).getSizeInventory(); + + if(this.sideToPut != -1){ + this.placeToPut = WorldUtil.getTileEntityFromSide(WorldUtil.getDirectionBySidesInOrder(this.sideToPut), this.worldObj, this.pos); + + if(this.placeToPut instanceof IInventory){ + if(this.slotToPutEnd <= 0){ + this.slotToPutEnd = ((IInventory)this.placeToPut).getSizeInventory(); + } } } } diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiInputter.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiInputter.png index 9b4bc4d364488caec065cbb02fa7b8ba81e8be24..a5aadf9a0e5cb9ea7d369c7c11439b8d257b0e53 100644 GIT binary patch literal 3842 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 diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiInputterAdvanced.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiInputterAdvanced.png index 67673f12189cc1d2caf62116fa54a435fb7fc069..7f42011c4faa87fb1f7b3bfe98c558a3ceba9714 100644 GIT binary patch literal 2662 zcmd5;X;4#F7=1yp7!Zp!2skJmYpX;kOQ}PV#RZp^0+l5!LW~$FVj+bqjDu|Ks!CauW6VdS8sSTco>Oaw@T_(ZZ}B9UzOg`<y$8=+EBO!2_zv2%5ngLPDHtDI`-XDkF*({}bCCnGYkpdy?Rij-m4+g?}B&@C3 zHnV41pq{D51?>6vNW@&9<-Hz!t=0w_npluxEh!$Qs($Mw3R?pr2cvq1H;Ztu3HSbi zKyjyE*ntmODv$au1Da4r&1Z!y6%z@Xc0o?*kca%;KsK}X21N5Zja>yEKanUQ4}W#T zs6DxWNOfAUdxOp{=>Se$DrU*%3l;{RE^-`)klVV(5>ZX`vgoS1M~E7kV6otvE8OxW zInf>p;bg62dSm&L_+G@Df?Y~*Tv@)Pov~7fX-A3doP_;aX{>vd?-*!7$|lEMU@_ka z_MT-skd3>qr-H^X7^$aHh4XV0dCUpm)j=HnxCBU(!MPYCQ z|1(4V>;7#`Xkv?J^v2v}=qQq~#-!d3y%pq2EC63aMCU~}Zt^tvl?&A6BI;18F@Pda z&yv7sWCJ1&i5v$kHbQiEW|_X@;Zda3ZyQ8p>7%I`^N7&3Cn!8Am7vVL#1(NM(kDL8 z)@db$Gk%h@!6kYGR)M_?O$F19>!(lReD%7iD#{@t`l238j1STi!HE8P7d`0KY@}aO zYB}k|3!;|bjs@aHtw4aj|9x078Z78IB<+kh@=G`vHD&@GVQuF$Cusm8)$$d4LgsN5*wI1 zQT3A4Hd}r1_SUsPxw`r?ia=)mW=c_BhC&6CUN16lriUWCPA_l0-Hc7#I&L}iI3!tdV|eW zA|D>3N@+wxAVN;$w39lHQpfchpw=frTn^+JYK6@w<=LLrO`9upgK(vM&LLJ9n!3{H6CJIiPY;c561Pw8?gBpgc{`3X}PLSGSsH(*K|IF zVi;9I6W$=$ERV|1&96LS5PLt#JDGp^ z+Xt_=QqOEH&k-JyJr&5__^+t?81M?f0y@h z!i`%Xvfw{&(EoEAWf``tx~bW~z*O*V6UZdS8+IYZ-=A%oH8*-M)3dv!-=7(+llr}~ zyd~=D8xf$iMR_F9KMf2y@~bT0q?%f@!fjVzxZR%h?p{pT=3?cB>%KsrJ-Cw!vXN;+ zEj!%i9b5_w(Yq86yjLyV*CrRQh2jWb2EU8b8Ejs=F%?wCGksW- z$&|zP;Vb*r`^Prtefe?eEkm3MC_Ia&t2QtwGi*{?V@R zTrXSD;k@f-ujzJ@3;r+iT5@nuNM nVKPV-ZjhWkM5Nlvto|}yHj|hB@$7aHsI2vL^>bP0l+XkKrL~Bf