feat: add lower shield

pynickle · pynickle · commit 3db2f88cf0ae · 2025-12-03T21:56:39.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -32,6 +32,10 @@ subprojects {
             name 'Xander Maven'
             url 'https://maven.isxander.dev/releases'
         }
+        maven {
+            // Mixson
+            url 'https://jitpack.io'
+        }
     }
 
     dependencies {
diff --git a/common/build.gradle b/common/build.gradle
@@ -12,4 +12,6 @@ dependencies {
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
 
     modImplementation("dev.isxander:yet-another-config-lib:${yacl_version}+1.21.9-fabric")
+
+    modImplementation "com.github.ramixin:mixson-fabric:${mixson_version}"
 }
diff --git a/common/src/main/java/com/euphony/better_client/BetterClient.java b/common/src/main/java/com/euphony/better_client/BetterClient.java
@@ -2,6 +2,7 @@
 
 import com.euphony.better_client.client.BCClientEvents;
 import com.euphony.better_client.client.init.KeyMapping;
+import com.euphony.better_client.client.resource.ResourceModification;
 import com.euphony.better_client.config.Config;
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
@@ -15,6 +16,8 @@ public final class BetterClient {
     public static void init() {
         KeyMapping.registerKeyMapping();
 
+        ResourceModification.init();
+
         BCClientEvents.init();
     }
 }
diff --git a/common/src/main/java/com/euphony/better_client/client/resource/ResourceModification.java b/common/src/main/java/com/euphony/better_client/client/resource/ResourceModification.java
@@ -0,0 +1,42 @@
+package com.euphony.better_client.client.resource;
+
+import com.google.gson.JsonPrimitive;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Items;
+import net.ramixin.mixson.inline.Mixson;
+
+import java.util.List;
+
+import static com.euphony.better_client.BetterClient.config;
+
+// Copy From https://github.com/pajicadvance/misctweaks/blob/multicutter/src/main/java/me/pajic/misctweaks/mixson/ClientResourceModifications.java
+public class ResourceModification {
+    public static void init() {
+        if (config.enableLowerShield) List.of(Items.SHIELD).forEach(item -> {
+            ResourceLocation id = item.arch$registryName();
+            if (id != null) {
+                String namespace = id.getNamespace();
+                String path = id.getPath();
+                Mixson.registerEvent(
+                        Mixson.DEFAULT_PRIORITY,
+                        rl -> rl.getNamespace().equals(namespace) && rl.getPath().equals("models/item/" + path),
+                        "misctweaks:modify_" + namespace + "_" + path + "_model",
+                        context -> {
+                            if (
+                                    context.getFile().getAsJsonObject().has("display") &&
+                                            context.getFile().getAsJsonObject().getAsJsonObject("display")
+                                                    .has("firstperson_lefthand")
+                            ) {
+                                context.getFile().getAsJsonObject()
+                                        .getAsJsonObject("display")
+                                        .getAsJsonObject("firstperson_lefthand")
+                                        .getAsJsonArray("translation")
+                                        .set(1, new JsonPrimitive(config.shieldOffset));
+                            }
+                        },
+                        true
+                );
+            }
+        });
+    }
+}
diff --git a/common/src/main/java/com/euphony/better_client/config/Config.java b/common/src/main/java/com/euphony/better_client/config/Config.java
@@ -117,6 +117,9 @@ public class Config {
 
     public boolean enableInvisibleItemFrame = true;
 
+    public boolean enableLowerShield = true;
+    public double shieldOffset = -2;
+
     public Config() {}
 
     public static Config create() {
diff --git a/common/src/main/java/com/euphony/better_client/config/screen/category/ScreenConfigScreen.java b/common/src/main/java/com/euphony/better_client/config/screen/category/ScreenConfigScreen.java
@@ -25,6 +25,7 @@ public class ScreenConfigScreen {
     private static final String NO_EXPERIMENTAL_WARNING_GROUP = "no_experimental_warning";
     private static final String BOOK_SAVE_CONFIRMATION_GROUP = "book_save_confirmation";
     private static final String WORLD_PLAY_TIME_GROUP = "world_play_time";
+    private static final String LOWER_SHIELD_GROUP = "lower_shield";
 
     public static Screen generateScreen(Screen parent) {
         // Better Ping Display
@@ -174,6 +175,19 @@ public static Screen generateScreen(Screen parent) {
                 .controller(opt -> ColorControllerBuilder.create(opt).allowAlpha(false))
                 .build();
 
+        // Lower Shield
+        Option<Boolean> enableLowerShieldOpt = ConfigUtils.buildBooleanOption(
+                "enableLowerShield",
+                DEFAULTS.enableLowerShield,
+                () -> config.enableLowerShield,
+                newVal -> config.enableLowerShield = newVal);
+        Option<Double> shieldOffsetOpt = ConfigUtils.<Double>getGenericOption("shieldOffset")
+                .binding(DEFAULTS.shieldOffset, () -> config.shieldOffset, newVal -> config.shieldOffset = newVal)
+                .controller(opt -> DoubleSliderControllerBuilder.create(opt)
+                        .range(-5.0, 5.0)
+                        .step(0.5))
+                .build();
+
         return YetAnotherConfigLib.createBuilder()
                 .title(Component.translatable("yacl3.config.better_client:config"))
                 .category(ConfigCategory.createBuilder()
@@ -216,6 +230,10 @@ public static Screen generateScreen(Screen parent) {
                                 .name(ConfigUtils.getGroupName(CLIENT_CATEGORY, WORLD_PLAY_TIME_GROUP))
                                 .options(List.of(enableWorldPlayTimeOpt, worldPlayTimeColorOpt))
                                 .build())
+                        .group(OptionGroup.createBuilder()
+                                .name(ConfigUtils.getGroupName(CLIENT_CATEGORY, LOWER_SHIELD_GROUP))
+                                .options(List.of(enableLowerShieldOpt, shieldOffsetOpt))
+                                .build())
                         .build())
                 .save(Config::save)
                 .build()
diff --git a/common/src/main/resources/assets/better_client/lang/en_us.json b/common/src/main/resources/assets/better_client/lang/en_us.json
@@ -228,5 +228,11 @@
 
   "yacl3.config.better_client:config.category.client.group.invisible_item_frame": "Invisible Item Frame",
   "yacl3.config.better_client:config.enableInvisibleItemFrame": "Enable Invisible Item Frame",
-  "yacl3.config.better_client:config.enableInvisibleItemFrame.desc": "Aim the crosshair at the item frame and press the assigned key to hide it. Holding the item frame allows you to see hidden item frames."
+  "yacl3.config.better_client:config.enableInvisibleItemFrame.desc": "Aim the crosshair at the item frame and press the assigned key to hide it. Holding the item frame allows you to see hidden item frames.",
+
+  "yacl3.config.better_client:config.category.client.group.lower_shield": "Lower Shield",
+  "yacl3.config.better_client:config.enableLowerShield": "Enable Lower Shield",
+  "yacl3.config.better_client:config.enableLowerShield.desc": "The shield appears lower, not obstructing the field of view.",
+  "yacl3.config.better_client:config.shieldOffset": "Shield Offset",
+  "yacl3.config.better_client:config.shieldOffset.desc": "How much the shield moves up and down."
 }
diff --git a/common/src/main/resources/assets/better_client/lang/zh_cn.json b/common/src/main/resources/assets/better_client/lang/zh_cn.json
@@ -228,5 +228,11 @@
 
   "yacl3.config.better_client:config.category.client.group.invisible_item_frame": "隐形物品展示框",
   "yacl3.config.better_client:config.enableInvisibleItemFrame": "启用隐形物品展示框",
-  "yacl3.config.better_client:config.enableInvisibleItemFrame.desc": "将准星对准物品展示框并按下对应按键即可隐藏它，持有物品展示框可查看隐藏的物品展示框。"
+  "yacl3.config.better_client:config.enableInvisibleItemFrame.desc": "将准星对准物品展示框并按下对应按键即可隐藏它，持有物品展示框可查看隐藏的物品展示框。",
+
+  "yacl3.config.better_client:config.category.client.group.lower_shield": "更低的盾牌",
+  "yacl3.config.better_client:config.enableLowerShield": "启用更低的盾牌",
+  "yacl3.config.better_client:config.enableLowerShield.desc": "盾牌位置更低，不会阻挡视野。",
+  "yacl3.config.better_client:config.shieldOffset": "盾牌偏移量",
+  "yacl3.config.better_client:config.shieldOffset.desc": "盾牌上下移动的幅度。"
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -51,6 +51,8 @@ dependencies {
 
     modImplementation("dev.isxander:yet-another-config-lib:${yacl_version}+1.21.9-fabric")
 
+    modImplementation "com.github.ramixin:mixson-fabric:${mixson_version}"
+
     modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
diff --git a/gradle.properties b/gradle.properties
@@ -16,3 +16,5 @@ neoforge_version=21.10.34-beta
 yacl_version=3.8.0
 
 modmenu_version=16.0.0-rc.1
+
+mixson_version=v1.4.0
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -63,6 +63,8 @@ dependencies {
         exclude group: "net.neoforged.fancymodloader", module: "loader"
     }
 
+    modImplementation "com.github.ramixin:mixson-neoforge:${mixson_version}"
+
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ subprojects {`
`32`	`32`	`name 'Xander Maven'`
`33`	`33`	`url 'https://maven.isxander.dev/releases'`
`34`	`34`	`}`
	`35`	`+ maven {`
	`36`	`+ // Mixson`
	`37`	`+ url 'https://jitpack.io'`
	`38`	`+ }`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ dependencies {`
`12`	`12`	`modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"`
`13`	`13`
`14`	`14`	`modImplementation("dev.isxander:yet-another-config-lib:${yacl_version}+1.21.9-fabric")`
	`15`	`+`
	`16`	`+ modImplementation "com.github.ramixin:mixson-fabric:${mixson_version}"`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.euphony.better_client.client.BCClientEvents;`
`4`	`4`	`import com.euphony.better_client.client.init.KeyMapping;`
	`5`	`+import com.euphony.better_client.client.resource.ResourceModification;`
`5`	`6`	`import com.euphony.better_client.config.Config;`
`6`	`7`	`import com.mojang.logging.LogUtils;`
`7`	`8`	`import org.slf4j.Logger;`
`@@ -15,6 +16,8 @@ public final class BetterClient {`
`15`	`16`	`public static void init() {`
`16`	`17`	`KeyMapping.registerKeyMapping();`
`17`	`18`
	`19`	`+ ResourceModification.init();`
	`20`	`+`
`18`	`21`	`BCClientEvents.init();`
`19`	`22`	`}`
`20`	`23`	`}`