diff --git a/src/main/java/com/lothrazar/storagenetwork/block/cable/export/ScreenCableExportFilter.java b/src/main/java/com/lothrazar/storagenetwork/block/cable/export/ScreenCableExportFilter.java index 8941b317..4baf3643 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/cable/export/ScreenCableExportFilter.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/cable/export/ScreenCableExportFilter.java @@ -168,7 +168,6 @@ private void drawTooltips(GuiGraphics ms, final int mouseX, final int mouseY) { @Override protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) { - int xCenter = (width - imageWidth) / 2; int yCenter = (height - imageHeight) / 2; ms.blit(texture, xCenter, yCenter, 0, 0, imageWidth, imageHeight); diff --git a/src/main/java/com/lothrazar/storagenetwork/block/cable/inputfilter/ScreenCableImportFilter.java b/src/main/java/com/lothrazar/storagenetwork/block/cable/inputfilter/ScreenCableImportFilter.java index 2d4c8f85..c74957f2 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/cable/inputfilter/ScreenCableImportFilter.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/cable/inputfilter/ScreenCableImportFilter.java @@ -175,7 +175,6 @@ private void drawTooltips(GuiGraphics ms, final int mouseX, final int mouseY) { @Override protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) { - int xCenter = (width - imageWidth) / 2; int yCenter = (height - imageHeight) / 2; ms.blit(texture, xCenter, yCenter, 0, 0, imageWidth, imageHeight); diff --git a/src/main/java/com/lothrazar/storagenetwork/block/cable/linkfilter/ScreenCableFilter.java b/src/main/java/com/lothrazar/storagenetwork/block/cable/linkfilter/ScreenCableFilter.java index 862a394b..51e5bb49 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/cable/linkfilter/ScreenCableFilter.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/cable/linkfilter/ScreenCableFilter.java @@ -138,7 +138,6 @@ public void drawGradient(GuiGraphics ms, int x, int y, int x2, int y2, int u, in @Override protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) { - int xCenter = (width - imageWidth) / 2; int yCenter = (height - imageHeight) / 2; ms.blit(texture, xCenter, yCenter, 0, 0, imageWidth, imageHeight); diff --git a/src/main/java/com/lothrazar/storagenetwork/block/collection/ScreenCollectionFilter.java b/src/main/java/com/lothrazar/storagenetwork/block/collection/ScreenCollectionFilter.java index 1b6e2d90..5dad1ba7 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/collection/ScreenCollectionFilter.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/collection/ScreenCollectionFilter.java @@ -56,7 +56,6 @@ public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) { @Override protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) { - int xCenter = (width - imageWidth) / 2; int yCenter = (height - imageHeight) / 2; ms.blit(texture, xCenter, yCenter, 0, 0, imageWidth, imageHeight); diff --git a/src/main/java/com/lothrazar/storagenetwork/block/inventory/ScreenNetworkInventory.java b/src/main/java/com/lothrazar/storagenetwork/block/inventory/ScreenNetworkInventory.java index c818226e..a57f4eab 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/inventory/ScreenNetworkInventory.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/inventory/ScreenNetworkInventory.java @@ -132,7 +132,6 @@ public void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) int xCenter = (width - imageWidth) / 2; int yCenter = (height - imageHeight) / 2; ms.blit(texture, xCenter, yCenter, 0, 0, imageWidth, imageHeight); - network.applySearchTextToSlots(); network.renderItemSlots(ms, mouseX, mouseY, font); } diff --git a/src/main/java/com/lothrazar/storagenetwork/block/request/ScreenNetworkTable.java b/src/main/java/com/lothrazar/storagenetwork/block/request/ScreenNetworkTable.java index 72ed8fca..6ecebedf 100644 --- a/src/main/java/com/lothrazar/storagenetwork/block/request/ScreenNetworkTable.java +++ b/src/main/java/com/lothrazar/storagenetwork/block/request/ScreenNetworkTable.java @@ -216,7 +216,6 @@ else if (!network.stackUnderMouse.isEmpty()) { } //regardles of above branch, also check this if (minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) { - minecraft.player.closeContainer(); return true; // Forge MC-146650: Needs to return true when the key is handled. } diff --git a/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkCraftingRemote.java b/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkCraftingRemote.java index 75367bf3..5a8ff55d 100644 --- a/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkCraftingRemote.java +++ b/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkCraftingRemote.java @@ -138,7 +138,6 @@ public void render(GuiGraphics ms, int mouseX, int mouseY, float partialTicks) { @Override protected void renderBg(GuiGraphics ms, float partialTicks, int mouseX, int mouseY) { - int xCenter = (this.width - this.imageWidth) / 2; int yCenter = (this.height - this.imageHeight) / 2; ms.blit(textureCraft, xCenter, yCenter, 0, 0, this.imageWidth, this.imageHeight); @@ -209,7 +208,6 @@ else if (!network.stackUnderMouse.isEmpty()) { } } //Regardless of above branch, also check this - if (minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) { minecraft.player.closeContainer(); return true; // Forge MC-146650: Needs to return true when the key is handled. diff --git a/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkRemote.java b/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkRemote.java index aed449e0..6d859c30 100644 --- a/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkRemote.java +++ b/src/main/java/com/lothrazar/storagenetwork/item/remote/ScreenNetworkRemote.java @@ -197,7 +197,6 @@ else if (!network.stackUnderMouse.isEmpty()) { } //regardles of above branch, also check this if (minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) { - minecraft.player.closeContainer(); return true; // Forge MC-146650: Needs to return true when the key is handled. } diff --git a/src/main/resources/assets/storagenetwork/lang/en_us.json b/src/main/resources/assets/storagenetwork/lang/en_us.json index af6cdffd..76df02ea 100644 --- a/src/main/resources/assets/storagenetwork/lang/en_us.json +++ b/src/main/resources/assets/storagenetwork/lang/en_us.json @@ -172,9 +172,9 @@ "gui.storagenetwork.operate.tooltip":"If the logic check passes, the cable operates", - "gui.storagenetwork.operate.tooltip.more":"Item count must be more than value", - "gui.storagenetwork.operate.tooltip.less":"Item count must be less than value", - "gui.storagenetwork.operate.tooltip.eq":"Item count must be equal", + "gui.storagenetwork.operate.tooltip.more":"Total in network must be more than value", + "gui.storagenetwork.operate.tooltip.less":"Total in network must be less than value", + "gui.storagenetwork.operate.tooltip.eq":"Total in network must be equal", "processing.buttons.toggle.true": "Always Active", "processing.buttons.toggle.false": "Only process the requested number", diff --git a/update.json b/update.json index 77e4d30a..2f1ee442 100644 --- a/update.json +++ b/update.json @@ -11,6 +11,6 @@ ,"1.11.1":"The Storage Request Table 'storagenetwork:request' block no longer saves the contents of its crafting-grid; instead items are returned to the player on close, exactly matching vanilla crafting table behavior (this was changed to prevent potential exploits. If any items are left behind in the grid during world upgrade they will be returned and not lost. No changes were made to the remotes or to other blocks). Fixed a null pointer exception " ,"1.11.2":"Ported the Cable Facades feature (from Minecraft 1.12.2), so that you can shift-left-click with a block on a cable to hide it with a facade. Disable this feature or ignore certain blocks with the config file" - ,"1.11.3":"Fixed item tooltips not rendering in Storage Remote. " + ,"1.11.3":"Fixed item tooltips not rendering in Storage Remote. Fixed visual rendering and text errors inside of import/export cables using the 'operation upgrade'" } }