防止容器套娃

Author: goumo

src/main/java/com/teammoeg/frostedheart/events/FHClientEventsMod.java

@@ -263,7 +263,12 @@ public static void setup(FMLClientSetupEvent event) {
         .add(FHBlocks.TITANIUM_BLOCK)
         .add(FHBlocks.INVAR_BLOCK)
         .add(FHBlocks.TIN_BLOCK)
-        .add(FHBlocks.MAGNESIUM_BLOCK);
+        .add(FHBlocks.MAGNESIUM_BLOCK)
+        .add(FHBlocks.METAL_VAWT)
+        .add(FHBlocks.ALLOY_VAWT)
+        .add(FHBlocks.METAL_SCAFFOLDING)
+        .add(FHBlocks.METAL_SCAFFOLDING_STAIRS);
+
         ShaderCompatHelper.use(Blocks.GOLD_BLOCK)
         .add(FHBlocks.ELECTRUM_BLOCK);
         ShaderCompatHelper.use(Blocks.COPPER_BLOCK)

src/main/java/com/teammoeg/frostedheart/mixin/immersiveengineering/ToolboxItemMixin.java

@@ -0,0 +1,27 @@
+package com.teammoeg.frostedheart.mixin.immersiveengineering;
+
+import blusunrize.immersiveengineering.api.IETags;
+import blusunrize.immersiveengineering.common.items.ToolboxItem;
+import net.minecraft.world.entity.SlotAccess;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickAction;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/**
+ * 防止容器套娃
+ */
+@Mixin(ToolboxItem.class)
+public class ToolboxItemMixin {
+
+    @Inject(at = @At("HEAD"), method = "overrideOtherStackedOnMe", cancellable = true)
+    public void overrideOtherStackedOnMe(ItemStack pStack, ItemStack pOther, Slot pSlot, ClickAction pAction, Player pPlayer, SlotAccess pAccess, CallbackInfoReturnable<Boolean> cir) {
+        if (pOther.is(IETags.forbiddenInCrates)) {
+            cir.setReturnValue(false);
+        }
+    }
+}

src/main/java/com/teammoeg/frostedheart/mixin/minecraft/misc/BundleItemMixin.java

@@ -0,0 +1,34 @@
+package com.teammoeg.frostedheart.mixin.minecraft.misc;
+
+import blusunrize.immersiveengineering.api.IETags;
+import net.minecraft.world.entity.SlotAccess;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickAction;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.BundleItem;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+/**
+ * 防止容器套娃
+ */
+@Mixin(BundleItem.class)
+public class BundleItemMixin {
+
+    @Inject(at = @At("HEAD"), method = "overrideStackedOnOther", cancellable = true)
+    public void overrideStackedOnOther(ItemStack pStack, Slot pSlot, ClickAction pAction, Player pPlayer, CallbackInfoReturnable<Boolean> cir) {
+        if (pSlot.getItem().is(IETags.forbiddenInCrates)) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @Inject(at = @At("HEAD"), method = "overrideOtherStackedOnMe", cancellable = true)
+    public void overrideOtherStackedOnMe(ItemStack pStack, ItemStack pOther, Slot pSlot, ClickAction pAction, Player pPlayer, SlotAccess pAccess, CallbackInfoReturnable<Boolean> cir) {
+        if (pOther.is(IETags.forbiddenInCrates)) {
+            cir.setReturnValue(false);
+        }
+    }
+}

src/main/resources/frostedheart.mixins.json

@@ -30,6 +30,7 @@
     "forge.ServerLifecycleHooksMixin",
     "immersiveengineering.IERegistrationMixin",
     "immersiveengineering.OwnerableStateMixin",
+    "immersiveengineering.ToolboxItemMixin",
     "minecraft.accessors.CacheAllInCellAccessor",
     "minecraft.accessors.HeightmapAccessor",
     "minecraft.accessors.MultiNoiseBiomeSourceAccessor",
@@ -42,6 +43,7 @@
     "minecraft.fix.SwordItemMixin_AddDropTag",
     "minecraft.fix.WorldLoaderMixin_GetRegistries",
     "minecraft.misc.BlendDensityFoldMixin",
+    "minecraft.misc.BundleItemMixin",
     "minecraft.misc.ComposterBlockMixin",
     "minecraft.misc.ComposterBlockOutputContainerMixin",
     "minecraft.misc.MinecraftServerMixin_GenerateSpacecraft",