Skip to content

Commit

Permalink
fixed visual rendering and text errors inside of import/export cables…
Browse files Browse the repository at this point in the history
… using the operation
  • Loading branch information
Lothrazar committed Oct 14, 2024
1 parent c56ac8b commit ddfa332
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/storagenetwork/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion update.json
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
}
}

0 comments on commit ddfa332

Please sign in to comment.