v0.2.0

added option to disable rendering
added options to reset segment selection on different triggers

Author: csutora

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.14.19
 
 # Mod Properties
-	mod_version = 0.0.1-1.19.4
+	mod_version = 0.2.0-1.19.4
 	maven_group = io.csum
 	archives_base_name = segmented
 

src/main/java/io/csum/segmented/SegmentedMod.java

@@ -7,6 +7,7 @@
 
 public class SegmentedMod implements ModInitializer {
 	public static int selectedHotbarSegment = -1;
+	public static float cancelTimer = 0;
 
 	@Override
 	public void onInitialize() {

src/main/java/io/csum/segmented/client/control/SegmentedKeyHandler.java

@@ -15,9 +15,11 @@ public boolean handleSegmentedHotbarSlotSelection(PlayerInventory inventory, int
         if (slot > 2) { return true; }
         if (SegmentedMod.selectedHotbarSegment == -1) {
             SegmentedMod.selectedHotbarSegment = slot;
+            SegmentedMod.cancelTimer = config.timerreset * 20;
         } else {
             inventory.selectedSlot = slot + 3 * SegmentedMod.selectedHotbarSegment;
             SegmentedMod.selectedHotbarSegment = -1;
+            SegmentedMod.cancelTimer = 0;
         }
         return true;
     }

src/main/java/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java

@@ -30,7 +30,7 @@ public class SegmentedHotbarRenderer extends DrawableHelper {
 
     public boolean renderSegmentedHotbar(MatrixStack matrices) {
 
-        if (isHidden() || !config.enabled) { return false; }
+        if (isHidden() || !config.enabled || config.norender) { return false; }
 
         PlayerEntity player = (PlayerEntity)client.cameraEntity;
         if (player == null) { return false; }

src/main/java/io/csum/segmented/config/SegmentedConfig.java

@@ -12,6 +12,22 @@ public class SegmentedConfig implements ConfigData {
     @Comment("Enables or disables the segmented hotbar")
     public boolean enabled = true;
 
+    @ConfigEntry.Gui.Tooltip
+    @Comment("If true, disables the custom hotbar but keeps the selection mechanics")
+    public boolean norender = false;
+
+    @ConfigEntry.Gui.Tooltip
+    @Comment("Enables or disables the mechanic where scrolling clears the segment selection")
+    public boolean scrollreset = true;
+
+    @ConfigEntry.Gui.Tooltip
+    @Comment("Enables or disables the mechanic where using an item clears the segment selection")
+    public boolean usereset = true;
+
+    @ConfigEntry.Gui.Tooltip
+    @Comment("Sets the time in seconds after which the segment selection gets cleared, 0 disables this feature")
+    public float timerreset = 5;
+
 //    this will be used for a mode i want to add later on,
 //    when it's turned on the textures will be stitched together from the minecraft widgets texture,
 //    allowing for easier resource pack compatibility. might not be possible to implement this, we'll see.

src/main/java/io/csum/segmented/mixin/client/InGameHudMixin.java

@@ -1,6 +1,9 @@
 package io.csum.segmented.mixin.client;
 
+import io.csum.segmented.SegmentedMod;
 import io.csum.segmented.client.gui.SegmentedHotbarRenderer;
+import io.csum.segmented.config.SegmentedConfig;
+import me.shedaniel.autoconfig.AutoConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawableHelper;
@@ -15,8 +18,20 @@
 @Environment(EnvType.CLIENT)
 public abstract class InGameHudMixin extends DrawableHelper {
 
+    private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig();
+
+    // rewrites the hotbar renderer so it's segmented, and handles cancelling segment selection on a timer
     @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable = true, require = 0)
     private void renderSegmentedHotbar(float tickDelta, MatrixStack matrices, CallbackInfo ci) {
+        if (config.timerreset > 0) {
+            if (SegmentedMod.cancelTimer > 0) {
+                SegmentedMod.cancelTimer -= tickDelta;
+            } else {
+                SegmentedMod.cancelTimer = 0;
+                SegmentedMod.selectedHotbarSegment = -1;
+            }
+        }
+
         SegmentedHotbarRenderer segmentedHotbarRenderer = new SegmentedHotbarRenderer();
         if (segmentedHotbarRenderer.renderSegmentedHotbar(matrices)) {
             ci.cancel();

src/main/java/io/csum/segmented/mixin/client/MinecraftClientMixin.java

@@ -24,8 +24,6 @@ public abstract class MinecraftClientMixin {
     @Shadow @Nullable
     public Screen currentScreen;
 
-
-
     @Redirect(method = "handleInputEvents",
             at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/option/KeyBinding;wasPressed()Z",

src/main/java/io/csum/segmented/mixin/client/MouseMixin.java

@@ -0,0 +1,28 @@
+package io.csum.segmented.mixin.client;
+
+import io.csum.segmented.SegmentedMod;
+import io.csum.segmented.config.SegmentedConfig;
+import me.shedaniel.autoconfig.AutoConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.Mouse;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = Mouse.class, priority = 9999)
+@Environment(EnvType.CLIENT)
+public abstract class MouseMixin {
+
+    // clears segment selection on item use
+    @Inject(method = "onMouseButton",
+            at = @At(value = "INVOKE",
+                    target = "Lnet/minecraft/client/option/KeyBinding;onKeyPressed(Lnet/minecraft/client/util/InputUtil$Key;)V"))
+    private void segmentedOnKeyPressed(long window, int button, int action, int mods, CallbackInfo ci) {
+
+        SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig();
+        if (config.enabled && config.usereset) { SegmentedMod.selectedHotbarSegment = -1; }
+
+    }
+}

src/main/java/io/csum/segmented/mixin/client/PlayerInventoryMixin.java

@@ -0,0 +1,24 @@
+package io.csum.segmented.mixin.client;
+
+import io.csum.segmented.SegmentedMod;
+import io.csum.segmented.config.SegmentedConfig;
+import me.shedaniel.autoconfig.AutoConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.entity.player.PlayerInventory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = PlayerInventory.class, priority = 9999)
+@Environment(EnvType.CLIENT)
+public abstract class PlayerInventoryMixin {
+
+    @Inject(method = "scrollInHotbar",
+            at = @At(value = "HEAD"))
+    private void segmentedScrollInHotbar(double scrollAmount, CallbackInfo ci) {
+        SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig();
+        if (config.enabled && config.scrollreset) { SegmentedMod.selectedHotbarSegment = -1; }
+    }
+}

src/main/resources/assets/segmented/lang/en_us.json

@@ -1,5 +1,17 @@
 {
   "text.autoconfig.segmented.title" : "Segmented Options",
   "text.autoconfig.segmented.option.enabled" : "Enabled",
-  "text.autoconfig.segmented.option.enabled.@Tooltip" : "Enables or disables the segmented hotbar"
+  "text.autoconfig.segmented.option.enabled.@Tooltip" : "Enables or disables the segmented hotbar",
+
+  "text.autoconfig.segmented.option.norender" : "Use vanilla hotbar rendering",
+  "text.autoconfig.segmented.option.norender.@Tooltip" : "If true, disables the custom hotbar but keeps the selection mechanics",
+
+  "text.autoconfig.segmented.option.scrollreset" :  "Scrolling clears segment selection",
+  "text.autoconfig.segmented.option.scrollreset.@Tooltip": "Enables or disables the mechanic where scrolling clears the segment selection",
+
+  "text.autoconfig.segmented.option.usereset" : "Using item clears segment selection",
+  "text.autoconfig.segmented.option.usereset.@Tooltip" : "Enables or disables the mechanic where using an item clears the segment selection",
+
+  "text.autoconfig.segmented.option.timerreset" : "Segment selection clear time",
+  "text.autoconfig.segmented.option.timerreset.@Tooltip" : "Sets the time in seconds after which the segment selection gets cleared, 0 disables this feature"
 }