From 9e4fecc693d1079b8766f29440652f5ea420dbec Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 08:59:36 +0800 Subject: [PATCH] triggered using mixin again --- gradle.properties | 4 +- .../storagedrawers/block/BlockDrawers.java | 3 -- .../block/tile/TileEntityDrawers.java | 48 ++++++++---------- .../core/ForgeEventHandler.java | 16 +----- .../mixins/EarlyMixinsLoader.java | 50 +++++++++++++++++++ .../storagedrawers/mixins/Mixins.java | 27 ++++++++++ .../storagedrawers/mixins/TargetMods.java | 28 +++++++++++ .../mixins/early/MixinPlayerControllerMP.java | 34 +++++++++++++ 8 files changed, 163 insertions(+), 47 deletions(-) create mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java create mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java create mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java create mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java diff --git a/gradle.properties b/gradle.properties index 5307b8c..580e80a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,7 +83,7 @@ apiPackage = api accessTransformersFile = storagedrawers_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! -usesMixins = false +usesMixins = true # Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. # This can speed up compile times thanks to not running the mixin annotation processor on all input sources. @@ -104,7 +104,7 @@ mixinsPackage = mixins # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin -coreModClass = +coreModClass = mixins.EarlyMixinsLoader # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 8a4e314..64082ab 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -36,8 +36,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.commons.compress.utils.IOUtils; import org.apache.logging.log4j.Level; @@ -61,7 +59,6 @@ import com.jaquadro.minecraft.storagedrawers.item.ItemPersonalKey; import com.jaquadro.minecraft.storagedrawers.item.ItemTrim; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade; import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeCreative; -import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; import cpw.mods.fml.common.FMLLog; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 1e408e3..ce14d8a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -5,7 +5,6 @@ import java.util.UUID; import javax.annotation.Nullable; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -18,10 +17,10 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.logging.log4j.Level; import org.jetbrains.annotations.NotNull; @@ -44,6 +43,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ISealable; import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom; import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.core.ModItems; @@ -396,58 +396,50 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public void onClick(PlayerInteractEvent event, BlockDrawers block) - { + public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world) { int dir = getDirection(); - if (dir == event.face) { + if (dir == face) { final int reach = 5; - double eyeX = event.entityPlayer.posX; - double eyeY = event.entityPlayer.posY + event.entityPlayer.getEyeHeight(); - double eyeZ = event.entityPlayer.posZ; + double eyeX = player.posX; + double eyeY = player.posY + player.getEyeHeight(); + double eyeZ = player.posZ; - Vec3 look = event.entityPlayer.getLookVec(); + Vec3 look = player.getLookVec(); Vec3 end = Vec3.createVectorHelper( eyeX + look.xCoord * reach, eyeY + look.yCoord * reach, eyeZ + look.zCoord * reach); - MovingObjectPosition mop = event.world - .rayTraceBlocks(Vec3.createVectorHelper(eyeX, eyeY, eyeZ), end); + MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(eyeX, eyeY, eyeZ), end); float hitX = (float) (mop.hitVec.xCoord - mop.blockX); float hitY = (float) (mop.hitVec.yCoord - mop.blockY); float hitZ = (float) (mop.hitVec.zCoord - mop.blockZ); boolean invertShift = StorageDrawers.config.cache.invertShift; - int slot = block.getDrawerSlot(event.face, hitX, hitY, hitZ); + int slot = block.getDrawerSlot(face, hitX, hitY, hitZ); IDrawer drawer = getDrawer(slot); if (drawer == null) return; final ItemStack item; // if invertSHift is true this will happen when the player is not shifting - if (event.entityPlayer.isSneaking() != invertShift) - item = takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); + if (player.isSneaking() != invertShift) item = takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); else item = takeItemsFromSlot(slot, 1); if (StorageDrawers.config.cache.debugTrace) FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, (item == null) ? " null item" : " " + item); if (item != null && item.stackSize > 0) { - if (!event.entityPlayer.inventory.addItemStackToInventory(item)) { - ForgeDirection dir2 = ForgeDirection.getOrientation(event.face); - block.dropItemStack( - event.world, - event.x + dir2.offsetX, - event.y, - event.z + dir2.offsetZ, - item); - event.world.markBlockForUpdate(event.x, event.y, event.z); - } else event.world.playSoundEffect( - event.x + .5f, - event.y + .5f, - event.z + .5f, + if (player.inventory.addItemStackToInventory(item)) { + ForgeDirection dir2 = ForgeDirection.getOrientation(face); + block.dropItemStack(world, x + dir2.offsetX, y, z + dir2.offsetZ, item); + world.markBlockForUpdate(x, y, z); + } else world.playSoundEffect( + x + .5f, + y + .5f, + z + .5f, "random.pop", .2f, - ((event.world.rand.nextFloat() - event.world.rand.nextFloat()) * .7f + 1) * 2); + ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); } } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java index 5492cd3..bb858eb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -1,20 +1,10 @@ package com.jaquadro.minecraft.storagedrawers.core; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import org.apache.logging.log4j.Level; - -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ForgeEventHandler { @@ -22,10 +12,8 @@ public class ForgeEventHandler { @SubscribeEvent public void playerInteracts(PlayerInteractEvent event) { if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) { - TileEntity mystery_tile = event.world.getTileEntity(event.x, event.y, event.z); - if (mystery_tile instanceof TileEntityDrawers tile - && event.world.getBlock(event.x, event.y, event.z) instanceof BlockDrawers block) { - tile.onClick(event, block); + TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); + if (tile instanceof TileEntityDrawers) { event.setCanceled(true); } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java new file mode 100644 index 0000000..2a11cc3 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java @@ -0,0 +1,50 @@ +package com.jaquadro.minecraft.storagedrawers.mixins; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; +import com.gtnewhorizon.gtnhmixins.builders.IMixins; + +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; + +@IFMLLoadingPlugin.MCVersion("1.7.10") +public class EarlyMixinsLoader implements IFMLLoadingPlugin, IEarlyMixinLoader { + + @Override + public String[] getASMTransformerClass() { + return null; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) {} + + @Override + public String getAccessTransformerClass() { + return null; + } + + @Override + public String getMixinConfig() { + // rename the associated .json file by replacing the "mymodid" with your own mod ID + // in the .json file edit the "package" and "refmap" properties to match your mod + // also edit the "refmap" property in the "mixins.mymodid.json" file + return "mixins.storagedrawers.early.json"; + } + + @Override + public List getMixins(Set loadedCoreMods) { + return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); + } +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java new file mode 100644 index 0000000..ca1d705 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java @@ -0,0 +1,27 @@ +package com.jaquadro.minecraft.storagedrawers.mixins; + +import javax.annotation.Nonnull; + +import com.gtnewhorizon.gtnhmixins.builders.IMixins; +import com.gtnewhorizon.gtnhmixins.builders.MixinBuilder; + +public enum Mixins implements IMixins { + + // Read the java doc of IMixins and MixinBuilder for further information + + // You should declare all of your mixins early and late in this same enum + + MIXIN_PLAYER_CONTROLLER(new MixinBuilder().setPhase(Phase.EARLY).addClientMixins("MixinPlayerControllerMP")); + + private final MixinBuilder builder; + + Mixins(MixinBuilder builder) { + this.builder = builder; + } + + @Nonnull + @Override + public MixinBuilder getBuilder() { + return builder; + } +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java new file mode 100644 index 0000000..9033d11 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java @@ -0,0 +1,28 @@ +package com.jaquadro.minecraft.storagedrawers.mixins; + +import javax.annotation.Nonnull; + +import com.gtnewhorizon.gtnhmixins.builders.ITargetMod; +import com.gtnewhorizon.gtnhmixins.builders.TargetModBuilder; + +public enum TargetMods implements ITargetMod { + + // Read the java doc of ITargetMod and TargetModBuilder for further information + + // Add to this enum information about the mods you need to identify during runtime + + COFHCORE("cofh.asm.LoadingPlugin", "CoFHCore"), + OPTIFINE("optifine.OptiFineForgeTweaker", "Optifine"); + + private final TargetModBuilder builder; + + TargetMods(String coreModClass, String modId) { + this.builder = new TargetModBuilder().setCoreModClass(coreModClass).setModId(modId); + } + + @Nonnull + @Override + public TargetModBuilder getBuilder() { + return builder; + } +} diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java new file mode 100644 index 0000000..808f6c6 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -0,0 +1,34 @@ +package com.jaquadro.minecraft.storagedrawers.mixins.early; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.PlayerControllerMP; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; +import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + +@Mixin(PlayerControllerMP.class) +public abstract class MixinPlayerControllerMP { + + @Shadow + private Minecraft mc; + + @Inject( + method = "onPlayerDamageBlock", + at = @At( + value = "INVOKE_ASSIGN", + target = "Lnet/minecraft/block/Block;getPlayerRelativeBlockHardness(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;III)F")) + private void mixin(int x, int y, int z, int side, CallbackInfo ci) { + if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers ted + && mc.theWorld.getBlock(x, y, z) instanceof BlockDrawers bd) { + if (ted.getDirection() == side) { + ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld); + } + } + } +}