Improve CQR golden feather tweak

ACGaming · Sep 16, 2023 · 06c5b6d · 06c5b6d
1 parent bd2030a
commit 06c5b6d
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 36 deletions.
diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/UTVanillaEvents.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/UTVanillaEvents.java
@@ -11,10 +11,11 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent;
 
+import mod.acgaming.universaltweaks.UniversalTweaks;
 import mod.acgaming.universaltweaks.config.UTConfig;
 
 // Courtesy of Focamacho
-@Mod.EventBusSubscriber
+@Mod.EventBusSubscriber(modid = UniversalTweaks.MODID)
 public class UTVanillaEvents
 {
     @SubscribeEvent

diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfig.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfig.java
@@ -2164,7 +2164,6 @@ public static class ChiselCategory
 
         public static class ChocolateQuestCategory
         {
-            @Config.RequiresMcRestart
             @Config.Name("Legacy Golden Feather")
             @Config.Comment("Restores the golden feather behavior from the original Better Dungeons mod")
             public boolean utCQRGoldenFeatherToggle = true;
@@ -2650,7 +2649,7 @@ public static class TinkersConstructCategory
                 ({
                     "Hides tool/bow materials in the 'Materials and You' book",
                     "Syntax: material",
-                    "Enabling debug logging prints all materials on opening the book"
+                    "Enabling debug logging prints all materials on game launch"
                 })
             public String[] utTConMaterialBlacklist = new String[] {};
 

diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/cqrepoured/UTGoldenFeatherEvent.java b/src/main/java/mod/acgaming/universaltweaks/mods/cqrepoured/UTGoldenFeatherEvent.java
@@ -0,0 +1,39 @@
+package mod.acgaming.universaltweaks.mods.cqrepoured;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.EntityEquipmentSlot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.living.LivingFallEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+import mod.acgaming.universaltweaks.UniversalTweaks;
+import mod.acgaming.universaltweaks.config.UTConfig;
+import team.cqr.cqrepoured.init.CQRItems;
+
+@Mod.EventBusSubscriber(modid = UniversalTweaks.MODID)
+public class UTGoldenFeatherEvent
+{
+    @SubscribeEvent
+    public static void onLivingFallEvent(LivingFallEvent event)
+    {
+        if (UTConfig.MOD_INTEGRATION.CHOCOLATE_QUEST.utCQRGoldenFeatherToggle && event.getDistance() > 0.0F && event.getEntityLiving() instanceof EntityPlayer)
+        {
+            EntityPlayer player = (EntityPlayer) event.getEntityLiving();
+            ItemStack mainhand = player.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND);
+            ItemStack offhand = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND);
+            if (mainhand.getItem() != CQRItems.FEATHER_GOLDEN && offhand.getItem() != CQRItems.FEATHER_GOLDEN)
+            {
+                for (ItemStack stack : player.inventory.mainInventory)
+                {
+                    if (stack.getItem() == CQRItems.FEATHER_GOLDEN)
+                    {
+                        stack.damageItem((int) event.getDistance(), player);
+                        event.setDistance(0.0F);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/...in/java/mod/acgaming/universaltweaks/mods/cqrepoured/mixin/UTGoldenFeatherEventMixin.java b/...in/java/mod/acgaming/universaltweaks/mods/cqrepoured/mixin/UTGoldenFeatherEventMixin.java
diff --git a/...ain/java/mod/acgaming/universaltweaks/mods/cqrepoured/mixin/UTGoldenFeatherItemMixin.java b/...ain/java/mod/acgaming/universaltweaks/mods/cqrepoured/mixin/UTGoldenFeatherItemMixin.java
@@ -1,7 +1,6 @@
 package mod.acgaming.universaltweaks.mods.cqrepoured.mixin;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.world.World;
@@ -21,17 +20,7 @@ public class UTGoldenFeatherItemMixin extends ItemLore
     public void utGoldenFeatherItem(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected, CallbackInfo ci)
     {
         if (!UTConfig.MOD_INTEGRATION.CHOCOLATE_QUEST.utCQRGoldenFeatherToggle) return;
-        if (entity.fallDistance >= 3)
-        {
-            // Handle item damage and fall distance in the server world...
-            if (!world.isRemote)
-            {
-                stack.damageItem(1, (EntityLivingBase) entity);
-                entity.fallDistance = 0;
-            }
-            // ...and particles in the client world
-            else world.spawnParticle(EnumParticleTypes.CLOUD, entity.posX, entity.posY, entity.posZ, (itemRand.nextFloat() - 0.5) / 2, -0.5, (itemRand.nextFloat() - 0.5) / 2);
-        }
+        if (entity.fallDistance >= 3) world.spawnParticle(EnumParticleTypes.CLOUD, entity.posX, entity.posY, entity.posZ, (itemRand.nextFloat() - 0.5) / 2, -0.5, (itemRand.nextFloat() - 0.5) / 2);
         super.onUpdate(stack, world, entity, itemSlot, isSelected);
         ci.cancel();
     }

diff --git a/src/main/resources/mixins.mods.cqrepoured.json b/src/main/resources/mixins.mods.cqrepoured.json
@@ -3,5 +3,5 @@
   "refmap": "universaltweaks.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
-  "mixins": ["UTGoldenFeatherEventMixin", "UTGoldenFeatherItemMixin"]
+  "mixins": ["UTGoldenFeatherItemMixin"]
 }