A little hack

Starriers-Studio · Aug 12, 2024 · edfee7e · edfee7e
1 parent a4f7b9c
commit edfee7e
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 9 deletions.
diff --git a/src/main/java/appeng/items/materials/NamePressItem.java b/src/main/java/appeng/items/materials/NamePressItem.java
@@ -20,11 +20,11 @@
 
 import java.util.List;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 
 import appeng.api.ids.AEComponents;
 import appeng.items.AEBaseItem;
@@ -34,7 +34,7 @@ public NamePressItem(Properties properties) {
         super(properties);
     }
 
-    @OnlyIn(Dist.CLIENT)
+    @Environment(EnvType.CLIENT)
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> lines,
             TooltipFlag advancedTooltips) {

diff --git a/src/main/java/appeng/items/materials/UpgradeCardItem.java b/src/main/java/appeng/items/materials/UpgradeCardItem.java
@@ -20,6 +20,8 @@
 
 import java.util.List;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -28,8 +30,6 @@
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.SelectedPart;
@@ -40,14 +40,15 @@
 import appeng.core.localization.PlayerMessages;
 import appeng.items.AEBaseItem;
 import appeng.util.InteractionUtil;
+import refabricated.patches.IItemExtended;
 
-public class UpgradeCardItem extends AEBaseItem {
+public class UpgradeCardItem extends AEBaseItem implements IItemExtended {
 
     public UpgradeCardItem(Properties properties) {
         super(properties);
     }
 
-    @OnlyIn(Dist.CLIENT)
+    @Environment(EnvType.CLIENT)
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> lines,
             TooltipFlag advancedTooltips) {
@@ -111,6 +112,6 @@ public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
             }
         }
 
-        return super.onItemUseFirst(stack, context);
+        return IItemExtended.super.onItemUseFirst(stack, context);
     }
 }
diff --git a/src/main/java/refabricated/patches/IItemExtended.java b/src/main/java/refabricated/patches/IItemExtended.java
@@ -0,0 +1,13 @@
+package refabricated.patches;
+
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.UseOnContext;
+
+public interface IItemExtended {
+
+    default InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
+        return InteractionResult.PASS;
+    }
+
+}
diff --git a/src/main/java/refabricated/patches/IItemStackExtended.java b/src/main/java/refabricated/patches/IItemStackExtended.java
@@ -0,0 +1,38 @@
+package refabricated.patches;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.AdventureModePredicate;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.world.level.block.state.pattern.BlockInWorld;
+
+public interface IItemStackExtended {
+
+    private ItemStack self() {
+        return (ItemStack) (Object) this;
+    }
+
+    default InteractionResult onItemUseFirst(UseOnContext context) {
+        Player entityplayer = context.getPlayer();
+        BlockPos blockpos = context.getClickedPos();
+        BlockInWorld state = new BlockInWorld(context.getLevel(), blockpos, false);
+        AdventureModePredicate adventureModePredicate = self().get(DataComponents.CAN_PLACE_ON);
+        if (entityplayer != null && !entityplayer.getAbilities().mayBuild && (adventureModePredicate == null || !adventureModePredicate.test(state))) {
+            return InteractionResult.PASS;
+        } else {
+            Item item = self().getItem();
+            InteractionResult result = ((IItemExtended) item).onItemUseFirst(self(), context);
+            if (entityplayer != null && result == InteractionResult.SUCCESS) {
+                entityplayer.awardStat(Stats.ITEM_USED.get(item));
+            }
+
+            return result;
+        }
+    }
+
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -20,7 +20,7 @@
     "rei_client": ["appeng.integration.modules.rei.ReiPlugin"],
     "jade": ["appeng.integration.modules.jade.JadeModule"]
   },
-  "mixins": ["ae2.mixins.json"],
+  "mixins": ["ae2.mixins.json", "refabricated.mixins.json"],
   "depends": {
     "fabricloader": ">=0.16.0",
     "fabric": ">=0.102.0",
@@ -35,6 +35,10 @@
     "waila:plugins": {
       "id": "ae2:wthit",
       "initializer": "appeng.integration.modules.wthit.WthitModule"
+    },
+    "loom:injected_interfaces": {
+      "net/minecraft/class_1792": ["refabricated.patches.IItemExtended"],
+      "net/minecraft/class_1799": ["refabricated.patches.IItemStackExtended"]
     }
   }
 }
diff --git a/src/main/resources/refabricated.mixins.json b/src/main/resources/refabricated.mixins.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "minVersion": "0.8.3",
+  "package": "refabricated.mixins",
+  "compatibilityLevel": "JAVA_11",
+  "mixins": [
+  ],
+  "server": [],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}