1.3.6, closes #78, closes #77

evanbones · evanbones · commit c46db2b91622 · 2026-02-09T17:44:27.000-08:00
diff --git a/CHANGELOG-LATEST.md b/CHANGELOG-LATEST.md
@@ -0,0 +1,7 @@
+### Added
+
+- Added new "item only" config option to fully disable mod behaviour.
+
+### Fixed
+
+- Fixed shield cooldown not working properly.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,16 @@
-* Fix server config syncing.
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.3.6] - 2026-02-09
+
+### Added
+
+- Added new "item only" config option to fully disable mod behaviour.
+
+### Fixed
+
+- Fixed shield cooldown not working properly.
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/compat/BetterCombatAttackListener.java b/common/src/main/java/org/infernalstudios/shieldexp/compat/BetterCombatAttackListener.java
@@ -10,6 +10,8 @@ public class BetterCombatAttackListener {
 
     public static void register() {
         BetterCombatClientEvents.ATTACK_START.register((player, hand) -> {
+            if (ShieldExpansionConfig.ITEM_ONLY_MODE) return;
+
             Item item = player.getOffhandItem().getItem();
             if (ShieldExpansionConfig.isShield(item)) {
                 Services.NETWORK.sendToServer(new SyncBlocking(player.getUUID(), false));
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/config/ClothConfigIntegration.java b/common/src/main/java/org/infernalstudios/shieldexp/config/ClothConfigIntegration.java
@@ -44,6 +44,12 @@ public static Screen createScreen(Screen parent) {
                 .setSaveConsumer(list -> ShieldExpansionConfig.SHIELD_BLACKLIST = list)
                 .build());
 
+        modifiers.addEntry(entryBuilder.startBooleanToggle(Component.translatable("config.shieldexp.option.item_only_mode"), ShieldExpansionConfig.ITEM_ONLY_MODE)
+                .setDefaultValue(false)
+                .setTooltip(Component.translatable("config.shieldexp.tooltip.item_only_mode"))
+                .setSaveConsumer(newValue -> ShieldExpansionConfig.ITEM_ONLY_MODE = newValue)
+                .build());
+
         modifiers.addEntry(entryBuilder.startBooleanToggle(Component.translatable("config.shieldexp.option.lowering_cooldown"), ShieldExpansionConfig.STASHING_COOLDOWN)
                 .setDefaultValue(true)
                 .setTooltip(Component.translatable("config.shieldexp.tooltip.lowering_cooldown"))
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/config/ShieldExpansionConfig.java b/common/src/main/java/org/infernalstudios/shieldexp/config/ShieldExpansionConfig.java
@@ -21,6 +21,8 @@ public class ShieldExpansionConfig {
     public static List<String> SHIELD_LIST = new ArrayList<>();
     public static List<String> SHIELD_BLACKLIST = new ArrayList<>();
 
+    public static boolean ITEM_ONLY_MODE = false;
+
     public static boolean TOOLTIPS = true;
 
     public static boolean TOOLTIP_COOLDOWN = true;
@@ -54,6 +56,7 @@ public static void load() {
             if (data != null) {
                 SHIELD_LIST = data.shieldList;
                 SHIELD_BLACKLIST = data.shieldBlacklist;
+                ITEM_ONLY_MODE = data.itemOnlyMode;
                 STASHING_COOLDOWN = data.stashingCooldown;
                 GENERAL_COOLDOWN = data.generalCooldown;
                 SPEED_MODIFICATION = data.speedModification;
@@ -77,6 +80,7 @@ public static void save() {
         ConfigData data = new ConfigData();
         data.shieldList = SHIELD_LIST;
         data.shieldBlacklist = SHIELD_BLACKLIST;
+        data.itemOnlyMode = ITEM_ONLY_MODE;
         data.stashingCooldown = STASHING_COOLDOWN;
         data.generalCooldown = GENERAL_COOLDOWN;
         data.speedModification = SPEED_MODIFICATION;
@@ -141,6 +145,7 @@ public static Boolean lenientStaminaEnabled() {
     private static class ConfigData {
         List<String> shieldList = new ArrayList<>();
         List<String> shieldBlacklist = new ArrayList<>();
+        boolean itemOnlyMode = false;
         boolean stashingCooldown = true;
         boolean generalCooldown = true;
         boolean speedModification = true;
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/events/FovEvents.java b/common/src/main/java/org/infernalstudios/shieldexp/events/FovEvents.java
@@ -4,10 +4,13 @@
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.player.Player;
+import org.infernalstudios.shieldexp.config.ShieldExpansionConfig;
 
 public class FovEvents {
 
     public static float onComputeFov(Player player, float currentFovModifier) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return currentFovModifier;
+
         AttributeInstance speedAttribute = player.getAttribute(Attributes.MOVEMENT_SPEED);
         if (speedAttribute != null) {
             AttributeModifier shieldMod = speedAttribute.getModifier(ShieldEvents.SPEED_MODIFIER_ID);
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/events/ShieldEvents.java b/common/src/main/java/org/infernalstudios/shieldexp/events/ShieldEvents.java
@@ -33,6 +33,8 @@ public class ShieldEvents {
     public static final UUID SPEED_MODIFIER_ID = UUID.fromString("3c1b8a2e-3c62-4f5c-9e9a-5b92fcae4d2c");
 
     public static boolean onStartUsing(Entity entity, ItemStack stack) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return false;
+
         Item item = stack.getItem();
         if (entity instanceof Player player && player.getCooldowns().isOnCooldown(item)) {
             return true;
@@ -63,6 +65,8 @@ public static boolean onStartUsing(Entity entity, ItemStack stack) {
     }
 
     public static void onStopUsing(Entity entity, ItemStack stack) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return;
+
         Item item = stack.getItem();
         if (entity instanceof Player player && ShieldExpansionConfig.isShield(item)) {
             removeBlocking(player);
@@ -72,6 +76,8 @@ public static void onStopUsing(Entity entity, ItemStack stack) {
     }
 
     public static void onUseTick(Entity entity, ItemStack stack) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return;
+
         Item item = stack.getItem();
         if (entity instanceof Player player && ShieldExpansionConfig.isShield(item) && LivingEntityAccess.get(player).getBlocking() && player.attackAnim > 0) {
             removeBlocking(player);
@@ -82,6 +88,8 @@ public static void onUseTick(Entity entity, ItemStack stack) {
     }
 
     public static void onPlayerTick(Player player) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return;
+
         Item item = player.getUseItem().getItem();
         Item lastShield = LivingEntityAccess.get(player).getLastShield().getItem();
 
@@ -104,6 +112,8 @@ public static void onPlayerTick(Player player) {
     }
 
     public static boolean onLivingHurt(LivingEntity entity, DamageSource source, float amount) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return false;
+
         if (!(entity instanceof Player player)) return false;
 
         if (validateBlocking(player) && (source.getMsgId().equals("player") || source.getMsgId().equals("mob"))) {
@@ -194,6 +204,8 @@ private static void handleExplosion(Player player, DamageSource source, float am
     }
 
     public static boolean onProjectileImpact(Entity entity, Entity projectile) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return false;
+
         if (entity instanceof Player player && validateBlocking(player)) {
             Item item = player.getUseItem().getItem();
             player.level().playSound(null, player.getOnPos(), SoundEvents.SHIELD_BLOCK, SoundSource.HOSTILE, 1.0f, 1.0f);
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/events/TooltipEvents.java b/common/src/main/java/org/infernalstudios/shieldexp/events/TooltipEvents.java
@@ -11,6 +11,8 @@
 
 public class TooltipEvents {
     public static void addTooltip(ItemStack stack, Player player, List<Component> tooltip) {
+        if (ShieldExpansionConfig.ITEM_ONLY_MODE) return;
+
         Item item = stack.getItem();
         if (player != null && ShieldExpansionConfig.isShield(item) && ShieldExpansionConfig.TOOLTIPS) {
             tooltip.add(Component.literal(" "));
diff --git a/common/src/main/java/org/infernalstudios/shieldexp/network/SyncConfig.java b/common/src/main/java/org/infernalstudios/shieldexp/network/SyncConfig.java
@@ -5,6 +5,7 @@
 import org.infernalstudios.shieldexp.config.ShieldExpansionConfig;
 
 public class SyncConfig implements IPacket {
+    private final boolean itemOnlyMode;
     private final boolean stashingCooldown;
     private final boolean generalCooldown;
     private final boolean speedModification;
@@ -13,6 +14,7 @@ public class SyncConfig implements IPacket {
     private final boolean lenientStamina;
 
     public SyncConfig() {
+        this.itemOnlyMode = ShieldExpansionConfig.ITEM_ONLY_MODE;
         this.stashingCooldown = ShieldExpansionConfig.STASHING_COOLDOWN;
         this.generalCooldown = ShieldExpansionConfig.GENERAL_COOLDOWN;
         this.speedModification = ShieldExpansionConfig.SPEED_MODIFICATION;
@@ -22,6 +24,7 @@ public SyncConfig() {
     }
 
     public SyncConfig(FriendlyByteBuf buf) {
+        this.itemOnlyMode = buf.readBoolean();
         this.stashingCooldown = buf.readBoolean();
         this.generalCooldown = buf.readBoolean();
         this.speedModification = buf.readBoolean();
@@ -32,6 +35,7 @@ public SyncConfig(FriendlyByteBuf buf) {
 
     @Override
     public void encode(FriendlyByteBuf buf) {
+        buf.writeBoolean(itemOnlyMode);
         buf.writeBoolean(stashingCooldown);
         buf.writeBoolean(generalCooldown);
         buf.writeBoolean(speedModification);
@@ -43,6 +47,7 @@ public void encode(FriendlyByteBuf buf) {
     @Override
     public void handle(Player player) {
         if (player.level().isClientSide || player.hasPermissions(2)) {
+            ShieldExpansionConfig.ITEM_ONLY_MODE = this.itemOnlyMode;
             ShieldExpansionConfig.STASHING_COOLDOWN = this.stashingCooldown;
             ShieldExpansionConfig.GENERAL_COOLDOWN = this.generalCooldown;
             ShieldExpansionConfig.SPEED_MODIFICATION = this.speedModification;
diff --git a/common/src/main/resources/assets/shieldexp/lang/en_us.json b/common/src/main/resources/assets/shieldexp/lang/en_us.json
@@ -15,6 +15,9 @@
   "config.shieldexp.option.cooldown": "Shield Cooldowns",
   "config.shieldexp.tooltip.cooldown": "Enable shield cooldowns mechanisms.",
 
+  "config.shieldexp.option.item_only_mode": "Item Only Mode",
+  "config.shieldexp.tooltip.item_only_mode": "Disable all Shield Expansion behaviour (for use with other shield mods like Guarding).",
+
   "config.shieldexp.option.speed_modifier": "Speed Adjustment",
   "config.shieldexp.tooltip.speed_modifier": "Enable the speed adjustment to make blocking faster (reduces the vanilla movement penalty).",
 
diff --git a/common/src/main/resources/shieldexp.mixins.json b/common/src/main/resources/shieldexp.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "org.infernalstudios.shieldexp.mixin",
-  "refmap": "shieldexp.refmap.json",
+  "refmap": "${mod_id}.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "LivingEntityMixin",
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -52,7 +52,7 @@ loom {
 
 publishMods {
     file = tasks.named("remapJar").flatMap { it.archiveFile }
-    changelog = rootProject.file("CHANGELOG.md").text
+    changelog = rootProject.file("CHANGELOG-LATEST.md").text
     type = STABLE
     displayName = "${mod_name} Fabric ${minecraft_version} - ${project.version}"
     modLoaders.add("fabric")
diff --git a/fabric/src/main/resources/shieldexp.fabric.mixins.json b/fabric/src/main/resources/shieldexp.fabric.mixins.json
@@ -17,5 +17,5 @@
   "injectors": {
     "defaultRequire": 1
   }
-  }
+}
   
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -71,7 +71,7 @@ jar {
 
 publishMods {
     file = tasks.named("reobfJar").flatMap { it.archiveFile }
-    changelog = rootProject.file("CHANGELOG.md").text
+    changelog = rootProject.file("CHANGELOG-LATEST.md").text
     type = STABLE
     displayName = "${mod_name} Forge ${minecraft_version} - ${project.version}"
     modLoaders.add("forge")
diff --git a/forge/src/main/java/org/infernalstudios/shieldexp/forge/events/ForgeShieldEvents.java b/forge/src/main/java/org/infernalstudios/shieldexp/forge/events/ForgeShieldEvents.java
@@ -6,8 +6,8 @@
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.ProjectileImpactEvent;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent;
+import net.minecraftforge.event.entity.living.LivingIncomingDamageEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -56,7 +56,7 @@ public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
     }
 
     @SubscribeEvent
-    public static void onLivingHurt(LivingAttackEvent event) {
+    public static void onIncomingDamage(LivingIncomingDamageEvent event) {
         if (ShieldEvents.onLivingHurt(event.getEntity(), event.getSource(), event.getAmount())) {
             event.setCanceled(true);
         }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version=1.3.5
+version=1.3.6
 group=org.infernalstudios.shieldexp
 java_version=17
 
