assigned custom name to interface method with vanilla method name

causes issues after reobfuscation otherwise
klikli-dev · May 3, 2020 · f266273 · f266273
1 parent fe0b325
commit f266273
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...n/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java b/...n/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java
@@ -34,7 +34,7 @@ public interface IStorageControllerGuiContainer {
     //region Methods
     void drawGradientRect(int left, int top, int right, int bottom, int startColor, int endColor);
 
-    boolean isPointInRegion(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY);
+    boolean isPointInRegionController(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY);
 
     void renderToolTip(ItemStack stack, int x, int y);
 

diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java b/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java
@@ -86,7 +86,7 @@ public void setShowStackSize(boolean showStackSize) {
 
     //region Methods
     public boolean isMouseOverSlot(int mouseX, int mouseY) {
-        return this.parent.isPointInRegion(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY);
+        return this.parent.isPointInRegionController(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY);
     }
 
     public void drawSlot(int mx, int my) {

diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java b/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java
@@ -73,7 +73,7 @@ public void setMachine(MachineReference machine) {
 
     //region Methods
     public boolean isMouseOverSlot(double mouseX, double mouseY) {
-        return this.parent.isPointInRegion(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY);
+        return this.parent.isPointInRegionController(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY);
     }
 
     public void drawSlot(int mx, int my) {

diff --git a/...ain/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java b/...ain/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java
@@ -327,8 +327,8 @@ else if (!orderStack.isEmpty()) {
     }
 
     @Override
-    public boolean isPointInRegion(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY) {
-        return super.isPointInRegion(rectX, rectY, rectWidth, rectHeight, pointX, pointY);
+    public boolean isPointInRegionController(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY) {
+        return this.isPointInRegion(rectX, rectY, rectWidth, rectHeight, pointX, pointY);
     }
 
     @Override