Fix SME disarm (#5)

* Fix SME disarm

* Some hacks

* Cleanup & Version 0.1.0

Author: HaHaWTH

README.md

@@ -18,6 +18,7 @@ Provide bugfixes, optimizations and utilities for Forge+Bukkit server environmen
 - Fix Twilight Forest Chain with Block can break blocks in protected areas
 - Fix Thaumcraft 6 taint can spread into protected areas
 - Fix trait effects in Tinkers' Construct can bypass damage protection
+- Fix So Many Enchantments can disarm players in protected areas
 
 ## Features
 

build.gradle

@@ -137,6 +137,9 @@ dependencies {
     // Tinkers Construct
     compileOnly rfg.deobf("curse.maven:tinkers-construct-74072:2902483")
     compileOnly rfg.deobf("curse.maven:mantle-74924:2713386")
+
+    // So many enchantments
+    compileOnly rfg.deobf("curse.maven:so-many-enchantments-267035:6172363")
     if (propertyBool('use_modern_java_syntax')) {
         annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
         // Workaround for https://github.com/bsideup/jabel/issues/174

gradle.properties

@@ -11,7 +11,7 @@ generate_javadocs_jar = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 0.0.5
+mod_version = 0.1.0
 root_package = io.wdsj
 mod_id = hybridfix
 mod_name = HybridFix
@@ -101,7 +101,7 @@ mixin_booter_version = 10.5
 # You should change package root once they are generated
 generate_mixins_json = true
 # Delimit configs with spaces. Should only put configs name instead of full file name
-mixin_configs = fix.respawn tconstruct.tools thaumcraft.taint twilight_forest.item twilight_forest.entity twilight_forest.sapling bridge.duck bridge.explosion.mohist fix.respawn.mohist perf.eventbus perf.server perf.timings.v1 misc.command bukkit.plugin
+mixin_configs = fix.respawn so_many_enchantments.disarm tconstruct.tools thaumcraft.taint twilight_forest.item twilight_forest.entity twilight_forest.sapling bridge.duck bridge.explosion.mohist fix.respawn.mohist perf.eventbus perf.server perf.timings.v1 misc.command bukkit.plugin
 # A refmap is a json that denotes mapping conversions, this json is generated automatically, with the name `mixins.mod_id.refmap.json`
 # Use the property `mixin_refmap` if you want it to use a different name, only one name is accepted
 mixin_refmap = mixins.${mod_id}.refmap.json

src/main/java/io/wdsj/hybridfix/HybridFixLateLoader.java

@@ -29,6 +29,8 @@ public class HybridFixLateLoader implements ILateMixinLoader {
             put("mixins.thaumcraft.taint.json", () -> isModLoaded("thaumcraft") && Settings.modPatchSettings.patchThaumcraftTaintSpread);
             // Tconstruct patches
             put("mixins.tconstruct.tools.json", () -> isModLoaded("tconstruct") && Settings.modPatchSettings.patchTconstructToolDamage);
+            // So Many Enchantments patches
+            put("mixins.so_many_enchantments.disarm.json", () -> isModLoaded("somanyenchantments") && Settings.modPatchSettings.patchSoManyEnchantmentsDisarm);
         }
     });
 

src/main/java/io/wdsj/hybridfix/HybridFixServer.java

@@ -10,9 +10,6 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.server.permission.PermissionAPI;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_12_R1.CraftCrashReport;
-
-import java.util.logging.Level;
 
 import static io.wdsj.hybridfix.HybridFix.HAS_CLEANROOM;
 

src/main/java/io/wdsj/hybridfix/config/Settings.java

@@ -79,6 +79,10 @@ public static class ModPatchSettings {
         @Config.Comment("Patch Tinkers Construct tool damage,\nUseful for some traits that adds extra effects and disarming, etc.\nYou can use property -Dhybridfix.tconstruct.supersedeVanillaEvent=true to prevent calling original damage event.")
         @Config.RequiresMcRestart
         public boolean patchTconstructToolDamage = false;
+
+        @Config.Comment("Patch Disarm enchantment in SME(1.0.0 and higher), prevent bypassing the bukkit protection.")
+        @Config.RequiresMcRestart
+        public boolean patchSoManyEnchantmentsDisarm = false;
     }
     @Config.Comment("Configuration for HybridFix built-in bukkit plugin.")
     @Config.RequiresMcRestart

…fix/entry/bukkit/util/ListenerUtils.java …x/entry/bukkit/util/ListenerHackery.javasrc/main/java/io/wdsj/hybridfix/entry/bukkit/util/ListenerUtils.java renamed to src/main/java/io/wdsj/hybridfix/entry/bukkit/util/ListenerHackery.java src/main/java/io/wdsj/hybridfix/entry/bukkit/util/ListenerUtils.java renamed to src/main/java/io/wdsj/hybridfix/entry/bukkit/util/ListenerHackery.java

@@ -10,10 +10,19 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 
-public class ListenerUtils {
-    private ListenerUtils() {
+public class ListenerHackery {
+    private ListenerHackery() {
     }
 
+    /*
+    private static final boolean disableModuleSystemHack = Boolean.getBoolean("hybridfix.disableModuleSystemHack");
+    static {
+        if (getJavaMajorVersion() >= 17 && !disableModuleSystemHack) {
+            HybridFix.LOGGER.info("Java version is 17+, attempting to hack into module system.");
+            hackModuleSystem();
+        }
+    }
+     */
     /**
      * Hack to register a listener to target plugin ClassLoader that bypasses the isolation.
      * @param clazz listener class
@@ -42,4 +51,35 @@ public static void registerListenerToTargetPlugin(Class<? extends Listener> claz
             SneakyThrow.sneaky(e);
         }
     }
+
+    /*
+    private static void hackModuleSystem() {
+        try {
+            Class<?> UnsafeClass = Class.forName("sun.misc.Unsafe");
+            Field unsafeField = UnsafeClass.getDeclaredField("theUnsafe");
+            unsafeField.setAccessible(true);
+            Unsafe unsafe = (Unsafe) unsafeField.get(null);
+            Method getModule = Class.class.getMethod("getModule");
+            Object objectModule = getModule.invoke(Object.class);
+
+            long addr = unsafe.objectFieldOffset(Class.class.getDeclaredField("module"));
+            unsafe.getAndSetObject(ListenerHackery.class, addr, objectModule);
+        } catch (Throwable e) {
+            HybridFix.LOGGER.warn("Failed to hack into module system, you may need to manually add --add-opens=java.base/java.lang=ALL-UNNAMED to your startup flags to make plugin hooks work properly.", e);
+        }
+    }
+
+    private static int getJavaMajorVersion() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            return version.charAt(2) - '0';
+        }
+        if (version.contains("-")) {
+            version = version.substring(0, version.indexOf("-"));
+        }
+
+        int dotIndex = version.indexOf(".");
+        return Integer.parseInt(dotIndex == -1 ? version : version.substring(0, dotIndex));
+    }
+     */
 }

src/main/java/io/wdsj/hybridfix/mixin/bukkit/plugin/DedicatedServerMixin.java

@@ -7,7 +7,7 @@
 import io.wdsj.hybridfix.entry.bukkit.hook.worldguard.WGHookEntityChangeBlockListener;
 import io.wdsj.hybridfix.entry.bukkit.listener.ExplodeListener;
 import io.wdsj.hybridfix.entry.bukkit.hook.residence.ResHookEntityChangeBlockListener;
-import io.wdsj.hybridfix.entry.bukkit.util.ListenerUtils;
+import io.wdsj.hybridfix.entry.bukkit.util.ListenerHackery;
 import net.minecraft.server.dedicated.DedicatedServer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -41,8 +41,8 @@ public void onInit(CallbackInfoReturnable<Boolean> cir) {
         if (Settings.bukkitPluginConfig.hookResidence) {
             final String res = "Residence";
             if (Bukkit.getPluginManager().isPluginEnabled(res)) {
-                ListenerUtils.registerListenerToTargetPlugin(ResHookEntityChangeBlockListener.class, res);
-                ListenerUtils.registerListenerToTargetPlugin(ResHookBlockFormListener.class, res);
+                ListenerHackery.registerListenerToTargetPlugin(ResHookEntityChangeBlockListener.class, res);
+                ListenerHackery.registerListenerToTargetPlugin(ResHookBlockFormListener.class, res);
                 HybridFix.LOGGER.info("{}[HybridFix] Hooked into Residence.", ChatColor.AQUA);
             } else {
                 HybridFix.LOGGER.warn("[HybridFix] Residence not found, check your installation.");
@@ -51,7 +51,7 @@ public void onInit(CallbackInfoReturnable<Boolean> cir) {
         if (Settings.bukkitPluginConfig.hookWorldGuard) {
             final String wg = "WorldGuard";
             if (Bukkit.getPluginManager().isPluginEnabled(wg)) {
-                ListenerUtils.registerListenerToTargetPlugin(WGHookEntityChangeBlockListener.class, wg);
+                ListenerHackery.registerListenerToTargetPlugin(WGHookEntityChangeBlockListener.class, wg);
                 HybridFix.LOGGER.info("{}[HybridFix] Hooked into WorldGuard.", ChatColor.LIGHT_PURPLE);
             } else {
                 HybridFix.LOGGER.warn("[HybridFix] WorldGuard not found, check your installation.");

src/main/java/io/wdsj/hybridfix/mixin/late/so_many_enchantments/enchants/EnchantmentDisarmamentMixin.java

@@ -0,0 +1,74 @@
+package io.wdsj.hybridfix.mixin.late.so_many_enchantments.enchants;
+
+import com.shultrea.rin.enchantments.base.EnchantmentBase;
+import com.shultrea.rin.enchantments.weapon.EnchantmentDisarmament;
+import com.shultrea.rin.mixin.vanilla.IEntityLivingMixin;
+import com.shultrea.rin.util.compat.CompatUtil;
+import com.shultrea.rin.util.compat.RLCombatCompat;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.inventory.EntityEquipmentSlot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumHand;
+import net.minecraftforge.event.entity.living.LivingAttackEvent;
+import net.minecraftforge.event.entity.living.LivingDamageEvent;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = EnchantmentDisarmament.class, remap = false)
+public abstract class EnchantmentDisarmamentMixin extends EnchantmentBase {
+
+    public EnchantmentDisarmamentMixin(String name, Rarity rarity, EntityEquipmentSlot... slots) {
+        super(name, rarity, slots);
+    }
+
+    @Inject(
+            method = "onLivingAttackEvent",
+            at = @At(
+                    value = "HEAD"
+            ),
+            cancellable = true
+    )
+    public void onLivingAttackEvent(LivingAttackEvent event, CallbackInfo ci) {
+        ci.cancel();
+    }
+
+    @Unique
+    @SubscribeEvent(priority = EventPriority.HIGH)
+    public void hybridFix$onLivingDamageEvent(LivingDamageEvent event) {
+        if (!this.isEnabled()) return;
+        if (!EnchantmentBase.isDamageSourceAllowed(event.getSource())) return;
+        if (CompatUtil.isRLCombatLoaded() && !RLCombatCompat.isAttackEntityFromStrong()) return;
+        if (event.getAmount() <= 1.0F) return;
+        EntityLivingBase attacker = (EntityLivingBase) event.getSource().getTrueSource();
+        if (attacker == null) return;
+        EntityLivingBase victim = event.getEntityLiving();
+        if (victim == null) return;
+        // if (victim.world.isRemote) return;
+        ItemStack stack = attacker.getHeldItemMainhand();
+        if (stack.isEmpty()) return;
+
+        int level = EnchantmentHelper.getEnchantmentLevel(this, stack);
+        if (level > 0) {
+            if (attacker.getRNG().nextFloat() < 0.02F * (float) level) {
+                if (!victim.getHeldItemMainhand().isEmpty()) {
+                    if (victim instanceof EntityLiving && attacker.getRNG().nextFloat() >= ((IEntityLivingMixin) victim).getInventoryHandsDropChances()[0])
+                        return;
+                    victim.entityDropItem(victim.getHeldItemMainhand(), 0.5F);
+                    victim.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
+                } else if (!victim.getHeldItemOffhand().isEmpty()) {
+                    if (victim instanceof EntityLiving && attacker.getRNG().nextFloat() >= ((IEntityLivingMixin) victim).getInventoryHandsDropChances()[1])
+                        return;
+                    victim.entityDropItem(victim.getHeldItemOffhand(), 0.5F);
+                    victim.setHeldItem(EnumHand.OFF_HAND, ItemStack.EMPTY);
+                }
+            }
+        }
+    }
+}

src/main/resources/mixins.so_many_enchantments.disarm.json

@@ -0,0 +1,11 @@
+{
+  "package": "io.wdsj.hybridfix.mixin.late.so_many_enchantments.enchants",
+  "required": true,
+  "refmap": "${mixin_refmap}",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "EnchantmentDisarmamentMixin"
+  ]
+}