Add tag support for disabling (#159)

Author: H31M5

common/src/main/java/com/xtracr/realcamera/compat/CompatibilityHelper.java

@@ -14,6 +14,8 @@ public class CompatibilityHelper {
     private static Method NEA_playerTransformer_setDeltaTick;
     private static Field NEA_NEAnimationsLoader_INSTANCE;
     private static Field NEA_NEAnimationsLoader_playerTransformer;
+    private static Class<?> SW_ClientEventHandler;
+    private static Field SW_ClientEventHandler_zoomTime;
 
     public static void initialize(PlatformHelper platformHelper) {
         CompatibilityHelper.platformHelper = platformHelper;
@@ -41,6 +43,23 @@ public static void initialize(PlatformHelper platformHelper) {
         } catch (Exception e) {
             RealCamera.LOGGER.warn("Compatibility with Not Enough Animations is outdated: [{}] {}", e.getClass().getName(), e.getMessage());
         }
+        if(isModLoaded("superbwarfare")) try{
+            SW_ClientEventHandler = Class.forName("com.atsuishio.superbwarfare.event.ClientEventHandler");
+            SW_ClientEventHandler_zoomTime = SW_ClientEventHandler.getDeclaredField("zoomTime");
+            DisableHelper.MAIN_FEATURE.registerOrInBinding(player -> CompatibilityHelper.SW_gunsIsZooming());
+        } catch (Exception e) {
+            RealCamera.LOGGER.warn("SuperbWarfare is not loaded correctly: [{}] {}", e.getClass().getName(), e.getMessage());
+        }
+    }
+
+    private static boolean SW_gunsIsZooming(){
+        try {
+            double zoomTimeValue = SW_ClientEventHandler_zoomTime.getDouble(null);
+            return zoomTimeValue > 0;
+        } catch (Exception e) {
+            RealCamera.LOGGER.error("Failed to access SuperbWarfare's zoomTime field", e);
+            return false;
+        }
     }
 
     public static void NEA_setDeltaTick(float deltaTick) {

common/src/main/java/com/xtracr/realcamera/compat/DisableHelper.java

@@ -2,13 +2,19 @@
 
 import com.xtracr.realcamera.RealCameraCore;
 import com.xtracr.realcamera.config.ConfigFile;
+import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 public class DisableHelper {
@@ -28,15 +34,15 @@ public class DisableHelper {
             String mainHand = BuiltInRegistries.ITEM.getKey(player.getMainHandItem().getItem()).toString();
             String offHand = BuiltInRegistries.ITEM.getKey(player.getOffhandItem().getItem()).toString();
             for (String item : ConfigFile.config().getDisableMainFeatureItems())
-                if (simpleWildcardMatch(mainHand, item) || simpleWildcardMatch(offHand, item))
+                if (matchesItemPattern(mainHand, item) || matchesItemPattern(offHand, item))
                     return true;
             return false;
         });
         RENDER_MODEL.registerOrInBinding(player -> {
             String mainHand = BuiltInRegistries.ITEM.getKey(player.getMainHandItem().getItem()).toString();
             String offHand = BuiltInRegistries.ITEM.getKey(player.getOffhandItem().getItem()).toString();
             for (String item : ConfigFile.config().getDisableRenderItems())
-                if (simpleWildcardMatch(mainHand, item) || simpleWildcardMatch(offHand, item))
+                if (matchesItemPattern(mainHand, item) || matchesItemPattern(offHand, item))
                     return true;
             return false;
         });
@@ -62,7 +68,20 @@ public static void registerOr(String name, Predicate<LivingEntity> predicate) {
         entries.get(name).registerOrInBinding(predicate::test);
     }
 
-    public static boolean simpleWildcardMatch(String text, String pattern) {
+    public static boolean matchesItemPattern(String text, String pattern) {
+        if (pattern.startsWith("#")) {
+            String tagId = pattern.substring(1);
+            TagKey<Item> itemTag = TagKey.create(BuiltInRegistries.ITEM.key(), ResourceLocation.parse(tagId));
+            return BuiltInRegistries.ITEM.getTag(itemTag)
+                .<Boolean>map(tag -> {
+                    ResourceLocation itemLocation = ResourceLocation.tryParse(text);
+                    if (itemLocation == null) return false;
+                    ResourceKey<Item> itemKey = ResourceKey.create(BuiltInRegistries.ITEM.key(), itemLocation);
+                    Optional<Holder.Reference<Item>> itemRef = BuiltInRegistries.ITEM.getHolder(itemKey);
+                    return itemRef.map(holderRef -> tag.contains(holderRef)).orElse(false);
+                })
+                .orElse(false);
+        }
         if (pattern.isEmpty()) return text.isEmpty();
         String[] parts = pattern.split("\\*+");
         if (parts.length == 0) return true;

common/src/main/resources/assets/realcamera/lang/en_us.json

@@ -64,7 +64,7 @@
   "config.tooltip.xtracr_realcamera.bindResultRetentionFrames": "For several frames after the binding failure, continue to use the previous successful binding result",
   "config.tooltip.xtracr_realcamera.displacementSmoothFactor": "Smooth factor of camera displacement, the higher the value, the smoother the movement",
   "config.tooltip.xtracr_realcamera.rotationSmoothFactor": "Smooth factor of camera rotation, the higher the value, the smoother the movement",
-  "config.tooltip.xtracr_realcamera.disableRenderItems": "Support using `*` to match any number of characters, for example `minecraft:*sword` matches all swords",
+  "config.tooltip.xtracr_realcamera.disableRenderItems": "Three matching methods are supported:\n1. Wildcard `*` matching (e.g., `minecraft:*sword`)\n2. Tag matching (starts with `#`, e.g., `#minecraft:tools`)\n3. Direct item ID (e.g., `minecraft:diamond_sword`)",
 
   "message.xtracr_realcamera.bindingFailed": "[%s]: Binding failed, please go to the %s screen and configure manually (Key: %s)",
 

common/src/main/resources/assets/realcamera/lang/zh_cn.json

@@ -64,7 +64,7 @@
   "config.tooltip.xtracr_realcamera.bindResultRetentionFrames": "在绑定失败后的数帧内，沿用上个成功的绑定结果",
   "config.tooltip.xtracr_realcamera.displacementSmoothFactor": "相机位移平滑系数，值越大越平滑",
   "config.tooltip.xtracr_realcamera.rotationSmoothFactor": "相机旋转平滑系数，值越大越平滑",
-  "config.tooltip.xtracr_realcamera.disableRenderItems": "支持用`*`匹配任意数量字符，比如用`minecraft:*sword`匹配所有剑",
+  "config.tooltip.xtracr_realcamera.disableRenderItems": "支持三种匹配方式：\n1. 通配符`*`匹配（如`minecraft:*sword`）\n2. 标签匹配以`#`开头（如`#minecraft:tools`）\n3. 直接物品ID（如`minecraft:diamond_sword`）",
 
   "message.xtracr_realcamera.bindingFailed": "[%s]: 绑定失败，请前往%s界面手动设置（键位：%s）",