From d37994418fda851534e532287db1a1acba40c5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= Date: Tue, 19 Aug 2025 15:33:52 +0200 Subject: [PATCH] Fixes --- gradle.properties | 2 +- src/main/java/com/kasetoatz/biggerhotbar/Biggerhotbar.java | 2 +- .../kasetoatz/biggerhotbar/mixin/HandledScreenMixin.java | 2 +- .../com/kasetoatz/biggerhotbar/mixin/InGameHudMixin.java | 2 +- .../kasetoatz/biggerhotbar/mixin/PlayerInventoryMixin.java | 3 ++- .../biggerhotbar/{Manager.java => state/StateManager.java} | 6 ++---- 6 files changed, 8 insertions(+), 9 deletions(-) rename src/main/java/com/kasetoatz/biggerhotbar/{Manager.java => state/StateManager.java} (94%) diff --git a/gradle.properties b/gradle.properties index bef590c..006a35c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.21.8 yarn_mappings=1.21.8+build.1 loader_version=0.17.2 # Mod Properties -mod_version=1.0 +mod_version=1.1 maven_group=com.kasetoatz archives_base_name=biggerhotbar # Dependencies diff --git a/src/main/java/com/kasetoatz/biggerhotbar/Biggerhotbar.java b/src/main/java/com/kasetoatz/biggerhotbar/Biggerhotbar.java index 279d876..f4491c5 100644 --- a/src/main/java/com/kasetoatz/biggerhotbar/Biggerhotbar.java +++ b/src/main/java/com/kasetoatz/biggerhotbar/Biggerhotbar.java @@ -7,7 +7,7 @@ import net.minecraft.client.network.ClientPlayerInteractionManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.slot.SlotActionType; -import static com.kasetoatz.biggerhotbar.Manager.*; +import static com.kasetoatz.biggerhotbar.state.StateManager.*; public class Biggerhotbar implements ClientModInitializer { diff --git a/src/main/java/com/kasetoatz/biggerhotbar/mixin/HandledScreenMixin.java b/src/main/java/com/kasetoatz/biggerhotbar/mixin/HandledScreenMixin.java index 75e39cb..a6fd596 100644 --- a/src/main/java/com/kasetoatz/biggerhotbar/mixin/HandledScreenMixin.java +++ b/src/main/java/com/kasetoatz/biggerhotbar/mixin/HandledScreenMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.invoke.arg.Args; -import static com.kasetoatz.biggerhotbar.Manager.isFlipped; +import static com.kasetoatz.biggerhotbar.state.StateManager.isFlipped; @Mixin(HandledScreen.class) public abstract class HandledScreenMixin diff --git a/src/main/java/com/kasetoatz/biggerhotbar/mixin/InGameHudMixin.java b/src/main/java/com/kasetoatz/biggerhotbar/mixin/InGameHudMixin.java index 033e27a..25511e0 100644 --- a/src/main/java/com/kasetoatz/biggerhotbar/mixin/InGameHudMixin.java +++ b/src/main/java/com/kasetoatz/biggerhotbar/mixin/InGameHudMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.kasetoatz.biggerhotbar.Manager.isFlipped; +import static com.kasetoatz.biggerhotbar.state.StateManager.isFlipped; @Mixin(InGameHud.class) public abstract class InGameHudMixin diff --git a/src/main/java/com/kasetoatz/biggerhotbar/mixin/PlayerInventoryMixin.java b/src/main/java/com/kasetoatz/biggerhotbar/mixin/PlayerInventoryMixin.java index a8bfb39..55723a1 100644 --- a/src/main/java/com/kasetoatz/biggerhotbar/mixin/PlayerInventoryMixin.java +++ b/src/main/java/com/kasetoatz/biggerhotbar/mixin/PlayerInventoryMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static com.kasetoatz.biggerhotbar.Manager.isFlipped; +import static com.kasetoatz.biggerhotbar.state.StateManager.isFlipped; @Mixin(PlayerInventory.class) public abstract class PlayerInventoryMixin @@ -37,6 +37,7 @@ public abstract class PlayerInventoryMixin } manager.clickSlot(player.playerScreenHandler.syncId, flipped ? slot + 36 : slot, 0, SlotActionType.PICKUP, player); manager.clickSlot(player.playerScreenHandler.syncId, i, 0, SlotActionType.PICKUP, player); + return; } } } diff --git a/src/main/java/com/kasetoatz/biggerhotbar/Manager.java b/src/main/java/com/kasetoatz/biggerhotbar/state/StateManager.java similarity index 94% rename from src/main/java/com/kasetoatz/biggerhotbar/Manager.java rename to src/main/java/com/kasetoatz/biggerhotbar/state/StateManager.java index ea8777e..1df919f 100644 --- a/src/main/java/com/kasetoatz/biggerhotbar/Manager.java +++ b/src/main/java/com/kasetoatz/biggerhotbar/state/StateManager.java @@ -1,6 +1,5 @@ -package com.kasetoatz.biggerhotbar; +package com.kasetoatz.biggerhotbar.state; -import com.fasterxml.jackson.databind.type.ArrayType; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -16,9 +15,8 @@ import java.lang.reflect.Type; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.List; -public class Manager +public class StateManager { private static final Path FILE = FabricLoader.getInstance().getConfigDir().resolve("bh_entries.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();