aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlmarsXd <ilmars500@gmail.com>2023-03-21 18:27:13 +0200
committerIlmarsXd <ilmars500@gmail.com>2023-03-21 18:27:13 +0200
commitf520f4bceee9243d585cc0146123c92981d90019 (patch)
tree48ef87f9ac733a1a24abbc5b961c86305866fef4
parent00b04cb86e6f1ab2aa0cdf85a43a5bd32cea6a8d (diff)
downloadDulkirMod-f520f4bceee9243d585cc0146123c92981d90019.tar.gz
DulkirMod-f520f4bceee9243d585cc0146123c92981d90019.tar.bz2
DulkirMod-f520f4bceee9243d585cc0146123c92981d90019.zip
remove jvmfield/jvmstatic
-rw-r--r--src/main/java/dulkirmod/mixins/MixinGuiContainer.java2
-rw-r--r--src/main/kotlin/dulkirmod/features/DungeonLeap.kt3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
index ac79168..97a4341 100644
--- a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
+++ b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
@@ -22,7 +22,7 @@ public abstract class MixinGuiContainer extends GuiScreen {
if (Croesus.inCroesus() && Croesus.isChestOpened(slotIn)) {
ci.cancel();
}
- if (DungeonLeap.inLeapMenu && DungeonLeap.isHighlightedLeapPlayer(slotIn)) {
+ if (DungeonLeap.INSTANCE.getInLeapMenu() && DungeonLeap.INSTANCE.isHighlightedLeapPlayer(slotIn)) {
ci.cancel();
ItemStack stack = new ItemStack(Blocks.wool, 1, EnumDyeColor.GREEN.getMetadata());
diff --git a/src/main/kotlin/dulkirmod/features/DungeonLeap.kt b/src/main/kotlin/dulkirmod/features/DungeonLeap.kt
index 9c54c46..bfbfe50 100644
--- a/src/main/kotlin/dulkirmod/features/DungeonLeap.kt
+++ b/src/main/kotlin/dulkirmod/features/DungeonLeap.kt
@@ -10,7 +10,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
object DungeonLeap {
- @JvmField
var inLeapMenu = false
var leapPlayers = BooleanArray(5) { false }
@@ -44,7 +43,7 @@ object DungeonLeap {
}
}
}
- @JvmStatic
+
fun isHighlightedLeapPlayer(slotIn: Slot): Boolean {
if (!inLeapMenu) return false
if (slotIn.inventory == mc.thePlayer.inventory) return false