From 8fe25059b256d0b831d053f9867e46ca8d6f099a Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Tue, 23 Dec 2025 20:14:39 +0800 Subject: [PATCH 01/17] enabling hold-click mechanic for drawers (not working due to incorrect mixin target qualification) --- gradle.properties | 8 +-- .../mixins/EarlyMixinsLoader.java | 51 +++++++++++++++++++ .../storagedrawers/mixins/Mixins.java | 27 ++++++++++ .../storagedrawers/mixins/TargetMods.java | 28 ++++++++++ .../mixins/early/MixinPlayerControllerMP.java | 35 +++++++++++++ 5 files changed, 145 insertions(+), 4 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 aafd2f2..e89992c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,7 +83,7 @@ apiPackage = api accessTransformersFile = # 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. @@ -91,7 +91,7 @@ usesMixins = false separateMixinSourceSet = # Adds some debug arguments like verbose output and class export. -usesMixinDebug = false +usesMixinDebug = true # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = @@ -99,12 +99,12 @@ mixinPlugin = # Specify the package that contains all of your Mixins. The package must exist or # the build will fail. If you have a package property defined in your mixins..json, # it must match with this or the build will fail. -mixinsPackage = +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/mixins/EarlyMixinsLoader.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java new file mode 100644 index 0000000..f7e21e0 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java @@ -0,0 +1,51 @@ +package com.jaquadro.minecraft.storagedrawers.mixins; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.gtnewhorizon.gtnhlib.mixins.Mixins; +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..f7cc332 --- /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 + + EXAMPLE(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..21f3e70 --- /dev/null +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -0,0 +1,35 @@ +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 com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.llamalad7.mixinextras.sugar.Local; + +@Mixin(PlayerControllerMP.class) +public abstract class MixinPlayerControllerMP { + + @Shadow + private float curBlockDamageMP; + + @ModifyExpressionValue( + method = "clickBlock", + at = @At(value = "INVOKE", target = "Ltarget/Class;curBlockDamageMPZ")) + + private boolean withClickOnDrawer(boolean original, @Local Minecraft mc, @Local int x, @Local int y, @Local int z, + @Local int side) { + if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers) { + TileEntityDrawers ted = (TileEntityDrawers) mc.theWorld.getTileEntity(x, y, z); + if (ted.getDirection() == side) { + curBlockDamageMP = 0.0F; + return true; + } + } + return original; + } +} From 5e4cf098d556cedf2e6f381ebf4681f2bb8d94f7 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Tue, 23 Dec 2025 21:39:49 +0800 Subject: [PATCH 02/17] mixin update (still broken) --- gradle.properties | 2 +- .../mixins/early/MixinPlayerControllerMP.java | 10 +++++++--- src/main/resources/META-INF/storagedrawers_at.cfg | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/META-INF/storagedrawers_at.cfg diff --git a/gradle.properties b/gradle.properties index e89992c..8e1d24a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ apiPackage = api # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ # There can be multiple files in a space-separated list. # Example value: mymodid_at.cfg nei_at.cfg -accessTransformersFile = +accessTransformersFile = storagedrawers_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = true 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 index 21f3e70..7315efd 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.llamalad7.mixinextras.expression.Definition; +import com.llamalad7.mixinextras.expression.Expression; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; @@ -17,9 +19,11 @@ public abstract class MixinPlayerControllerMP { @Shadow private float curBlockDamageMP; - @ModifyExpressionValue( - method = "clickBlock", - at = @At(value = "INVOKE", target = "Ltarget/Class;curBlockDamageMPZ")) + @Definition( + id = "curBlockDamageMP", + field = "Lnet/minecraft/client/multiplayer/PlayerControllerMP;curBlockDamageMP:F") + @Expression("this.curBlockDamageMP == 0.0") + @ModifyExpressionValue(method = "clickBlock", at = @At(value = "MIXINEXTRAS:EXPRESSION")) private boolean withClickOnDrawer(boolean original, @Local Minecraft mc, @Local int x, @Local int y, @Local int z, @Local int side) { diff --git a/src/main/resources/META-INF/storagedrawers_at.cfg b/src/main/resources/META-INF/storagedrawers_at.cfg new file mode 100644 index 0000000..6846af2 --- /dev/null +++ b/src/main/resources/META-INF/storagedrawers_at.cfg @@ -0,0 +1 @@ +public net.minecraft.client.multiplayer.PlayerControllerMP field_78770_f \ No newline at end of file From f0701fbd14a3a8923a47b908126899f208b22ff6 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Wed, 24 Dec 2025 22:47:23 +0800 Subject: [PATCH 03/17] fixed mixin, speeding up algorithm still not working --- gradle.properties | 2 +- .../storagedrawers/block/BlockDrawers.java | 3 ++ .../block/tile/TileEntityDrawers.java | 35 ++++++++++++++++--- .../mixins/EarlyMixinsLoader.java | 1 - .../storagedrawers/mixins/Mixins.java | 2 +- .../mixins/early/MixinPlayerControllerMP.java | 33 ++++++++--------- 6 files changed, 50 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8e1d24a..580e80a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,7 @@ developmentEnvironmentUserName = Developer # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = false +enableModernJavaSyntax = true # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. 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 ddff5db..298df9f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -514,6 +514,9 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); + tileDrawers.clickedOnPreviousTick = true; + Minecraft.getMinecraft().playerController.curBlockDamageMP = 0.0F; + if (tileDrawers.getDirection() != side) return; if (tileDrawers.isSealed()) return; 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 e18f633..4c36449 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,6 +5,7 @@ import java.util.UUID; import javax.annotation.Nullable; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -68,6 +69,10 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private boolean hideUpgrade = false; private boolean downgraded = false; + private int ticksClickedInARow = 10000; + private int itemsOutputInARow = 0; + public boolean clickedOnPreviousTick = false; + private UUID owner; private String securityKey; @@ -84,6 +89,17 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private ItemStack materialFront; private ItemStack materialTrim; + @Override + public void updateEntity() { + if (clickedOnPreviousTick) { + ticksClickedInARow++; + } else { + ticksClickedInARow = 10000; // set high so that it always registers on first click! + itemsOutputInARow = 0; + } + clickedOnPreviousTick = false; + } + protected TileEntityDrawers(int drawerCount) { initWithDrawerCount(drawerCount); } @@ -541,6 +557,20 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe ItemStack stack = getItemsFromSlot(slot, count); if (stack == null) return null; + int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); + + if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; + + System.out.println( + "Reached tick goal of " + ticksConsecutiveClickRequirement + + "and outputted " + + itemsOutputInARow + + " items. Current player block break progress is at " + + Minecraft.getMinecraft().playerController.curBlockDamageMP); + + ticksClickedInARow = 0; + itemsOutputInARow++; + IDrawer drawer = drawers[slot]; drawer.setStoredItemCount(drawer.getStoredItemCount() - stack.stackSize); @@ -780,11 +810,6 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe } } - @Override - public boolean canUpdate() { - return false; - } - @Override public void markDirty() { inventory.markDirty(); diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java index f7e21e0..2a11cc3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.gtnewhorizon.gtnhlib.mixins.Mixins; import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; import com.gtnewhorizon.gtnhmixins.builders.IMixins; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java index f7cc332..ca1d705 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java @@ -11,7 +11,7 @@ public enum Mixins implements IMixins { // You should declare all of your mixins early and late in this same enum - EXAMPLE(new MixinBuilder().setPhase(Phase.EARLY).addClientMixins("MixinPlayerControllerMP")); + MIXIN_PLAYER_CONTROLLER(new MixinBuilder().setPhase(Phase.EARLY).addClientMixins("MixinPlayerControllerMP")); private final MixinBuilder 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 index 7315efd..cf699aa 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -6,34 +6,31 @@ 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; -import com.llamalad7.mixinextras.expression.Definition; -import com.llamalad7.mixinextras.expression.Expression; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import com.llamalad7.mixinextras.sugar.Local; @Mixin(PlayerControllerMP.class) public abstract class MixinPlayerControllerMP { @Shadow - private float curBlockDamageMP; + private Minecraft mc; - @Definition( - id = "curBlockDamageMP", - field = "Lnet/minecraft/client/multiplayer/PlayerControllerMP;curBlockDamageMP:F") - @Expression("this.curBlockDamageMP == 0.0") - @ModifyExpressionValue(method = "clickBlock", at = @At(value = "MIXINEXTRAS:EXPRESSION")) - - private boolean withClickOnDrawer(boolean original, @Local Minecraft mc, @Local int x, @Local int y, @Local int z, - @Local int side) { - if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers) { - TileEntityDrawers ted = (TileEntityDrawers) mc.theWorld.getTileEntity(x, y, z); + @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) { // cancels block break progress and fires a + // click + // block event on the TileEntityDrawer if applicable + if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers ted + && mc.theWorld.getBlock(x, y, z) instanceof BlockDrawers bd) { if (ted.getDirection() == side) { - curBlockDamageMP = 0.0F; - return true; + bd.onBlockClicked(mc.theWorld, x, y, z, mc.thePlayer); } } - return original; } } From 02e108e75dc4058e6dbe7a804542b010f0620b4d Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 01:03:23 +0800 Subject: [PATCH 04/17] refactor to use mixin and not forgeeventhandler (still has comments) --- .../block/BlockCompDrawers.java | 2 +- .../storagedrawers/block/BlockDrawers.java | 58 ++++++++------- .../block/tile/TileEntityDrawers.java | 3 + .../core/ForgeEventHandler.java | 72 +++++++++++++++++-- .../mixins/early/MixinPlayerControllerMP.java | 45 +++++------- 5 files changed, 116 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java index 497ab2b..6e0170e 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -47,7 +47,7 @@ public class BlockCompDrawers extends BlockDrawers implements INetworked { } @Override - protected int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { + public int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { if (hitTop(hitY)) return 0; if (hitLeft(side, hitX, hitZ)) return 1; 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 298df9f..6659b2c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -450,7 +450,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return false; } - protected int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { + public int getDrawerSlot(int side, float hitX, float hitY, float hitZ) { if (drawerCount == 1) return 0; if (drawerCount == 2) return hitTop(hitY) ? 0 : 1; @@ -514,8 +514,6 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); - tileDrawers.clickedOnPreviousTick = true; - Minecraft.getMinecraft().playerController.curBlockDamageMP = 0.0F; if (tileDrawers.getDirection() != side) return; @@ -523,32 +521,32 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) return; - int slot = getDrawerSlot(side, hitX, hitY, hitZ); - IDrawer drawer = tileDrawers.getDrawer(slot); - if (drawer == null) return; - - final ItemStack item; - // if invertSHift is true this will happen when the player is not shifting - if (player.isSneaking() != invertShift) - item = tileDrawers.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); - else item = tileDrawers.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 (!player.inventory.addItemStackToInventory(item)) { - ForgeDirection dir = ForgeDirection.getOrientation(side); - dropItemStack(world, x + dir.offsetX, y, z + dir.offsetZ, item); - world.markBlockForUpdate(x, y, z); - } else world.playSoundEffect( - x + .5f, - y + .5f, - z + .5f, - "random.pop", - .2f, - ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); - } + // int slot = getDrawerSlot(side, hitX, hitY, hitZ); + // IDrawer drawer = tileDrawers.getDrawer(slot); + // if (drawer == null) return; + // + // final ItemStack item; + // // if invertSHift is true this will happen when the player is not shifting + // if (player.isSneaking() != invertShift) + // item = tileDrawers.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); + // else item = tileDrawers.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 (!player.inventory.addItemStackToInventory(item)) { + // ForgeDirection dir = ForgeDirection.getOrientation(side); + // dropItemStack(world, x + dir.offsetX, y, z + dir.offsetZ, item); + // world.markBlockForUpdate(x, y, z); + // } else world.playSoundEffect( + // x + .5f, + // y + .5f, + // z + .5f, + // "random.pop", + // .2f, + // ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); + // } } @Override @@ -586,7 +584,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return side.ordinal() != getTileEntity(world, x, y, z).getDirection(); } - private void dropItemStack(World world, int x, int y, int z, ItemStack stack) { + public void dropItemStack(World world, int x, int y, int z, ItemStack stack) { EntityItem entity = new EntityItem(world, x + .5f, y + .5f, z + .5f, stack); entity.addVelocity(-entity.motionX, -entity.motionY, -entity.motionZ); world.spawnEntityInWorld(entity); 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 4c36449..5b92734 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 @@ -557,6 +557,9 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe ItemStack stack = getItemsFromSlot(slot, count); if (stack == null) return null; + clickedOnPreviousTick = true; + Minecraft.getMinecraft().playerController.curBlockDamageMP = 0.0F; + int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; 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 7fd937a..d1918db 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -1,24 +1,82 @@ 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 { @SubscribeEvent public void playerInteracts(PlayerInteractEvent event) { - if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK - && event.entityPlayer.capabilities.isCreativeMode) { - TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (tile instanceof TileEntityDrawers) { - int dir = ((TileEntityDrawers) tile).getDirection(); + 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) { + int dir = tile.getDirection(); if (dir == event.face) { - event.setCanceled(true); - return; + final int reach = 5; + double eyeX = event.entityPlayer.posX; + double eyeY = event.entityPlayer.posY + event.entityPlayer.getEyeHeight(); + double eyeZ = event.entityPlayer.posZ; + + Vec3 look = event.entityPlayer.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); + 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); + IDrawer drawer = tile.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 = tile.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); + else item = tile.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, + "random.pop", + .2f, + ((event.world.rand.nextFloat() - event.world.rand.nextFloat()) * .7f + 1) * 2); + event.setCanceled(true); + } } } } 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 index cf699aa..32b6197 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -1,36 +1,29 @@ 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) { // cancels block break progress and fires a - // click - // block event on the TileEntityDrawer if applicable - if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers ted - && mc.theWorld.getBlock(x, y, z) instanceof BlockDrawers bd) { - if (ted.getDirection() == side) { - bd.onBlockClicked(mc.theWorld, x, y, z, mc.thePlayer); - } - } - } + // @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) { // cancels block break progress and fires a + // // click + // // block event on the TileEntityDrawer if applicable + // if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers ted + // && mc.theWorld.getBlock(x, y, z) instanceof BlockDrawers bd) { + // if (ted.getDirection() == side) { + // bd.onBlockClicked(mc.theWorld, x, y, z, mc.thePlayer); + // } + // } + // } } From 5963ae9c10be6694737ee033df44d4b57ce833f7 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 07:34:57 +0800 Subject: [PATCH 05/17] moved logic to TE side --- gradle.properties | 4 +- .../storagedrawers/block/BlockDrawers.java | 74 +------------------ .../block/tile/TileEntityDrawers.java | 60 +++++++++++++++ .../core/ForgeEventHandler.java | 55 +------------- .../mixins/EarlyMixinsLoader.java | 50 ------------- .../storagedrawers/mixins/Mixins.java | 27 ------- .../storagedrawers/mixins/TargetMods.java | 28 ------- .../mixins/early/MixinPlayerControllerMP.java | 29 -------- 8 files changed, 65 insertions(+), 262 deletions(-) delete mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java delete mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java delete mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java delete mode 100644 src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java diff --git a/gradle.properties b/gradle.properties index 580e80a..5307b8c 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 = true +usesMixins = false # 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 = mixins.EarlyMixinsLoader +coreModClass = # 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 6659b2c..8a4e314 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -72,7 +72,7 @@ import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.items.ItemMatterCluster; import xonin.backhand.api.core.BackhandUtils; -public class BlockDrawers extends BlockContainer implements IExtendedBlockClickHandler, INetworked { +public class BlockDrawers extends BlockContainer implements INetworked { private static final ResourceLocation blockConfig = new ResourceLocation( StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); @@ -477,78 +477,6 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } } - @Override - public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { - if (world.isRemote) { - MovingObjectPosition posn = Minecraft.getMinecraft().objectMouseOver; - float hitX = (float) (posn.hitVec.xCoord - posn.blockX); - float hitY = (float) (posn.hitVec.yCoord - posn.blockY); - float hitZ = (float) (posn.hitVec.zCoord - posn.blockZ); - - StorageDrawers.network.sendToServer( - new BlockClickMessage( - x, - y, - z, - posn.sideHit, - hitX, - hitY, - hitZ, - StorageDrawers.config.cache.invertShift)); - - if (StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "BlockDrawers.onBlockClicked with " + posn); - } - } - - @Override - public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, - float hitZ, boolean invertShift) { - if (StorageDrawers.config.cache.debugTrace) - FMLLog.log(StorageDrawers.MOD_ID, Level.INFO, "IExtendedBlockClickHandler.onBlockClicked"); - - if (!player.capabilities.isCreativeMode) { - PlayerInteractEvent event = ForgeEventFactory - .onPlayerInteract(player, PlayerInteractEvent.Action.LEFT_CLICK_BLOCK, x, y, z, side, world); - if (event.isCanceled()) return; - } - - TileEntityDrawers tileDrawers = getTileEntitySafe(world, x, y, z); - - if (tileDrawers.getDirection() != side) return; - - if (tileDrawers.isSealed()) return; - - if (!SecurityManager.hasAccess(player.getGameProfile(), tileDrawers)) return; - - // int slot = getDrawerSlot(side, hitX, hitY, hitZ); - // IDrawer drawer = tileDrawers.getDrawer(slot); - // if (drawer == null) return; - // - // final ItemStack item; - // // if invertSHift is true this will happen when the player is not shifting - // if (player.isSneaking() != invertShift) - // item = tileDrawers.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); - // else item = tileDrawers.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 (!player.inventory.addItemStackToInventory(item)) { - // ForgeDirection dir = ForgeDirection.getOrientation(side); - // dropItemStack(world, x + dir.offsetX, y, z + dir.offsetZ, item); - // world.markBlockForUpdate(x, y, z); - // } else world.playSoundEffect( - // x + .5f, - // y + .5f, - // z + .5f, - // "random.pop", - // .2f, - // ((world.rand.nextFloat() - world.rand.nextFloat()) * .7f + 1) * 2); - // } - } - @Override public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { TileEntityDrawers tile = getTileEntitySafe(world, x, y, z); 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 5b92734..1e408e3 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,6 +5,7 @@ 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; @@ -15,9 +16,12 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; 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; @@ -392,6 +396,62 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } + public void onClick(PlayerInteractEvent event, BlockDrawers block) + { + int dir = getDirection(); + if (dir == event.face) { + final int reach = 5; + double eyeX = event.entityPlayer.posX; + double eyeY = event.entityPlayer.posY + event.entityPlayer.getEyeHeight(); + double eyeZ = event.entityPlayer.posZ; + + Vec3 look = event.entityPlayer.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); + 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); + 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()); + 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, + "random.pop", + .2f, + ((event.world.rand.nextFloat() - event.world.rand.nextFloat()) * .7f + 1) * 2); + } + } + } + public boolean isVoid() { if (!StorageDrawers.config.cache.enableVoidUpgrades) return false; 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 d1918db..5492cd3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -25,59 +25,8 @@ public class ForgeEventHandler { 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) { - int dir = tile.getDirection(); - if (dir == event.face) { - final int reach = 5; - double eyeX = event.entityPlayer.posX; - double eyeY = event.entityPlayer.posY + event.entityPlayer.getEyeHeight(); - double eyeZ = event.entityPlayer.posZ; - - Vec3 look = event.entityPlayer.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); - 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); - IDrawer drawer = tile.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 = tile.takeItemsFromSlot(slot, drawer.getStoredItemStackSize()); - else item = tile.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, - "random.pop", - .2f, - ((event.world.rand.nextFloat() - event.world.rand.nextFloat()) * .7f + 1) * 2); - event.setCanceled(true); - } - } + tile.onClick(event, block); + 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 deleted file mode 100644 index 2a11cc3..0000000 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/EarlyMixinsLoader.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index ca1d705..0000000 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/Mixins.java +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 9033d11..0000000 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/TargetMods.java +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 32b6197..0000000 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.mixins.early; - -import net.minecraft.client.multiplayer.PlayerControllerMP; - -import org.spongepowered.asm.mixin.Mixin; - -@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) { // cancels block break progress and fires a - // // click - // // block event on the TileEntityDrawer if applicable - // if (mc.theWorld.getTileEntity(x, y, z) instanceof TileEntityDrawers ted - // && mc.theWorld.getBlock(x, y, z) instanceof BlockDrawers bd) { - // if (ted.getDirection() == side) { - // bd.onBlockClicked(mc.theWorld, x, y, z, mc.thePlayer); - // } - // } - // } -} From 9e4fecc693d1079b8766f29440652f5ea420dbec Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 08:59:36 +0800 Subject: [PATCH 06/17] 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); + } + } + } +} From f2412f191bfdb3c012c26bb9352d951d9fc402ca Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 09:01:09 +0800 Subject: [PATCH 07/17] removed debug statement --- .../storagedrawers/block/tile/TileEntityDrawers.java | 7 ------- 1 file changed, 7 deletions(-) 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 ce14d8a..78b88d2 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 @@ -616,13 +616,6 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; - System.out.println( - "Reached tick goal of " + ticksConsecutiveClickRequirement - + "and outputted " - + itemsOutputInARow - + " items. Current player block break progress is at " - + Minecraft.getMinecraft().playerController.curBlockDamageMP); - ticksClickedInARow = 0; itemsOutputInARow++; From a5070f8ed8a1cc40d3d5446ad5085402a91ab332 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 14:09:35 +0800 Subject: [PATCH 08/17] fixed giving 2 at start of holding --- .../storagedrawers/block/tile/TileEntityDrawers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 78b88d2..71a08ee 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 @@ -73,7 +73,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private boolean hideUpgrade = false; private boolean downgraded = false; - private int ticksClickedInARow = 10000; + private int ticksClickedInARow = 9; private int itemsOutputInARow = 0; public boolean clickedOnPreviousTick = false; @@ -98,7 +98,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe if (clickedOnPreviousTick) { ticksClickedInARow++; } else { - ticksClickedInARow = 10000; // set high so that it always registers on first click! + ticksClickedInARow = 9; // set high so that it always registers on first click! itemsOutputInARow = 0; } clickedOnPreviousTick = false; From c47aa7dfe19efe46238e3d0bf6fd6da1a1bf8adb Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 14:28:57 +0800 Subject: [PATCH 09/17] fixed drawer being ghost block when broken --- .../block/tile/TileEntityDrawers.java | 20 +--------------- .../core/ForgeEventHandler.java | 9 +++++-- .../mixins/early/MixinPlayerControllerMP.java | 24 ++++++++++++++++++- 3 files changed, 31 insertions(+), 22 deletions(-) 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 71a08ee..267523d 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 @@ -396,27 +396,9 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world) { + public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world, float hitX, float hitY, float hitZ, boolean invertShift) { int dir = getDirection(); if (dir == face) { - final int reach = 5; - double eyeX = player.posX; - double eyeY = player.posY + player.getEyeHeight(); - double eyeZ = player.posZ; - - Vec3 look = player.getLookVec(); - - Vec3 end = Vec3.createVectorHelper( - eyeX + look.xCoord * reach, - eyeY + look.yCoord * reach, - eyeZ + look.zCoord * reach); - - 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(face, hitX, hitY, hitZ); IDrawer drawer = getDrawer(slot); if (drawer == null) return; 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 bb858eb..7fd937a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -11,10 +11,15 @@ public class ForgeEventHandler { @SubscribeEvent public void playerInteracts(PlayerInteractEvent event) { - if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) { + if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK + && event.entityPlayer.capabilities.isCreativeMode) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (tile instanceof TileEntityDrawers) { - event.setCanceled(true); + int dir = ((TileEntityDrawers) tile).getDirection(); + if (dir == event.face) { + event.setCanceled(true); + return; + } } } } 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 index 808f6c6..c1aa91a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -1,8 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.mixins.early; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -27,7 +31,25 @@ public abstract class MixinPlayerControllerMP { 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); + final int reach = 5; + double eyeX = mc.thePlayer.posX; + double eyeY = mc.thePlayer.posY + mc.thePlayer.getEyeHeight(); + double eyeZ = mc.thePlayer.posZ; + + Vec3 look = mc.thePlayer.getLookVec(); + + Vec3 end = Vec3.createVectorHelper( + eyeX + look.xCoord * reach, + eyeY + look.yCoord * reach, + eyeZ + look.zCoord * reach); + + MovingObjectPosition mop = mc.theWorld.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; + StorageDrawers.network.sendToServer(new BlockClickMessage(x,y,z,side,hitX,hitY,hitZ,invertShift)); + ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld, hitX, hitY, hitZ,invertShift); } } } From 9121ced00e3e23576c82077fe108a1e046f7ee95 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 14:42:06 +0800 Subject: [PATCH 10/17] spotless --- .../block/tile/TileEntityDrawers.java | 5 ++--- .../mixins/early/MixinPlayerControllerMP.java | 13 +++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) 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 267523d..0b7a601 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 @@ -15,8 +15,6 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; 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; @@ -396,7 +394,8 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world, float hitX, float hitY, float hitZ, boolean invertShift) { + public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world, float hitX, + float hitY, float hitZ, boolean invertShift) { int dir = getDirection(); if (dir == face) { int slot = block.getDrawerSlot(face, hitX, hitY, hitZ); 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 index c1aa91a..67e7315 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -1,20 +1,20 @@ package com.jaquadro.minecraft.storagedrawers.mixins.early; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; - import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; + 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.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.jaquadro.minecraft.storagedrawers.network.BlockClickMessage; @Mixin(PlayerControllerMP.class) public abstract class MixinPlayerControllerMP { @@ -47,9 +47,10 @@ public abstract class MixinPlayerControllerMP { 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; - StorageDrawers.network.sendToServer(new BlockClickMessage(x,y,z,side,hitX,hitY,hitZ,invertShift)); - ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld, hitX, hitY, hitZ,invertShift); + boolean invertShift = StorageDrawers.config.cache.invertShift; + StorageDrawers.network + .sendToServer(new BlockClickMessage(x, y, z, side, hitX, hitY, hitZ, invertShift)); + ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld, hitX, hitY, hitZ, invertShift); } } } From 07d59e9cc6315c2a7d3d59dda15e08139eee0852 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 15:41:58 +0800 Subject: [PATCH 11/17] fixed ghost blocks --- .../minecraft/storagedrawers/block/BlockDrawers.java | 9 ++++++++- .../storagedrawers/block/tile/TileEntityDrawers.java | 5 +++-- .../mixins/early/MixinPlayerControllerMP.java | 1 - 3 files changed, 11 insertions(+), 4 deletions(-) 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 64082ab..342fbfc 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -69,7 +69,7 @@ import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.items.ItemMatterCluster; import xonin.backhand.api.core.BackhandUtils; -public class BlockDrawers extends BlockContainer implements INetworked { +public class BlockDrawers extends BlockContainer implements INetworked, IExtendedBlockClickHandler { private static final ResourceLocation blockConfig = new ResourceLocation( StorageDrawers.MOD_ID + ":textures/blocks/block_config.mcmeta"); @@ -496,6 +496,13 @@ public class BlockDrawers extends BlockContainer implements INetworked { return true; } + @Override + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, + float hitZ, boolean invertShift) { + TileEntityDrawers ted = getTileEntitySafe(world, x, y, z); + ted.onClick(player, x, y, z, side, world, hitX, hitY, hitZ, invertShift); + } + @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { if (halfDepth) return false; 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 0b7a601..9bd6945 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 @@ -394,8 +394,9 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe downgraded = state; } - public void onClick(BlockDrawers block, EntityPlayer player, int x, int y, int z, int face, World world, float hitX, - float hitY, float hitZ, boolean invertShift) { + public void onClick(EntityPlayer player, int x, int y, int z, int face, World world, float hitX, float hitY, + float hitZ, boolean invertShift) { + BlockDrawers block = (BlockDrawers) world.getBlock(x, y, z); int dir = getDirection(); if (dir == face) { int slot = block.getDrawerSlot(face, hitX, hitY, hitZ); 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 index 67e7315..1df40d9 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/mixins/early/MixinPlayerControllerMP.java @@ -50,7 +50,6 @@ public abstract class MixinPlayerControllerMP { boolean invertShift = StorageDrawers.config.cache.invertShift; StorageDrawers.network .sendToServer(new BlockClickMessage(x, y, z, side, hitX, hitY, hitZ, invertShift)); - ted.onClick(bd, mc.thePlayer, x, y, z, side, mc.theWorld, hitX, hitY, hitZ, invertShift); } } } From f6fc653dd76ead4b214ad76d029086c8f7f620a5 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 16:57:28 +0800 Subject: [PATCH 12/17] fixed items not dropping on drawer break (drawer somehow has a dupe) --- .../storagedrawers/block/BlockDrawers.java | 2 +- .../block/tile/TileEntityDrawers.java | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) 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 342fbfc..adf5536 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -583,7 +583,7 @@ public class BlockDrawers extends BlockContainer implements INetworked, IExtende if (!drawer.isDrawerEnabled(drawerIndex)) return; IDrawer subDrawer = drawer.getDrawer(drawerIndex); while (subDrawer.getStoredItemCount() > 0) { - ItemStack stack = drawer.takeItemsFromSlot(drawerIndex, subDrawer.getStoredItemStackSize()); + ItemStack stack = drawer.takeItemsFromSlotWithDestroy(drawerIndex, subDrawer.getStoredItemStackSize()); if (stack == null || stack.stackSize == 0) break; action.accept(stack); } 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 9bd6945..74c2687 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 @@ -73,7 +73,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private int ticksClickedInARow = 9; private int itemsOutputInARow = 0; - public boolean clickedOnPreviousTick = false; + private boolean clickedOnPreviousTick = false; private UUID owner; private String securityKey; @@ -596,7 +596,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); - if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; + if (ticksClickedInARow < ticksConsecutiveClickRequirement) return stack; ticksClickedInARow = 0; itemsOutputInARow++; @@ -614,6 +614,23 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe return stack; } + public ItemStack takeItemsFromSlotWithDestroy(int slot, int count) { + if (slot < 0 || slot >= getDrawerCount()) return null; + + ItemStack stack = getItemsFromSlot(slot, count); + if (stack == null) return null; + + IDrawer drawer = drawers[slot]; + drawer.setStoredItemCount(drawer.getStoredItemCount() - stack.stackSize); + + if (isRedstone() && worldObj != null) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord - 1, zCoord, getBlockType()); + } + + return stack; + } + /** * Returns an ItemStack that will have a maximum size of {@link ItemStack#getMaxStackSize()} */ From 32e87da755c21522087c25c775b2fa18f3fd1497 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 18:13:38 +0800 Subject: [PATCH 13/17] fixed dupe --- .../minecraft/storagedrawers/block/tile/TileEntityDrawers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 74c2687..505f9c0 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 @@ -596,7 +596,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); - if (ticksClickedInARow < ticksConsecutiveClickRequirement) return stack; + if (ticksClickedInARow < ticksConsecutiveClickRequirement) return null; ticksClickedInARow = 0; itemsOutputInARow++; From 02d5932b4329f782620bceed8e4c0ec3f89a0d69 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Thu, 25 Dec 2025 18:30:46 +0800 Subject: [PATCH 14/17] optimized hold-click check --- .../block/tile/TileEntityDrawers.java | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) 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 505f9c0..0e0128c 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 @@ -16,6 +16,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; @@ -51,6 +52,9 @@ import com.jaquadro.minecraft.storagedrawers.network.CountUpdateMessage; import com.jaquadro.minecraft.storagedrawers.storage.IUpgradeProvider; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import it.unimi.dsi.fastutil.ints.IntIterators; @@ -73,7 +77,7 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private int ticksClickedInARow = 9; private int itemsOutputInARow = 0; - private boolean clickedOnPreviousTick = false; + private long lastLeftClickTime; private UUID owner; private String securityKey; @@ -91,19 +95,10 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe private ItemStack materialFront; private ItemStack materialTrim; - @Override - public void updateEntity() { - if (clickedOnPreviousTick) { - ticksClickedInARow++; - } else { - ticksClickedInARow = 9; // set high so that it always registers on first click! - itemsOutputInARow = 0; - } - clickedOnPreviousTick = false; - } - protected TileEntityDrawers(int drawerCount) { initWithDrawerCount(drawerCount); + TileEntityDrawersEvents eventHandler = new TileEntityDrawersEvents(); + MinecraftForge.EVENT_BUS.register(eventHandler); } protected abstract IDrawer createDrawer(int slot); @@ -591,7 +586,15 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe ItemStack stack = getItemsFromSlot(slot, count); if (stack == null) return null; - clickedOnPreviousTick = true; + if (worldObj.getTotalWorldTime() - lastLeftClickTime > 1) { + ticksClickedInARow = 9; + itemsOutputInARow = 0; + } else { + ticksClickedInARow++; + } + + lastLeftClickTime = worldObj.getTotalWorldTime(); + Minecraft.getMinecraft().playerController.curBlockDamageMP = 0.0F; int ticksConsecutiveClickRequirement = 50 / (itemsOutputInARow + 5); @@ -1150,4 +1153,12 @@ public abstract class TileEntityDrawers extends BaseTileEntity implements IDrawe }; } } + + private class TileEntityDrawersEvents { + + @SubscribeEvent(priority = EventPriority.NORMAL) + public void whenPlayerChangesDimension(PlayerEvent.PlayerChangedDimensionEvent event) { + lastLeftClickTime = 0; + } + } } From 4bd1e4a710f1f4bfc693295db185e557c2dd1b54 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Tue, 30 Dec 2025 00:38:31 +0800 Subject: [PATCH 15/17] adding mixin .json files --- .gitignore | 1 - src/main/resources/mixins.StorageDrawers.json | 7 +++++++ src/main/resources/mixins.storagedrawers.early.json | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/mixins.StorageDrawers.json create mode 100644 src/main/resources/mixins.storagedrawers.early.json diff --git a/.gitignore b/.gitignore index 748a67b..f802260 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ whitelist.json *.iml *.ipr *.iws -src/main/resources/mixins.*.json *.bat runtime/ layout.json diff --git a/src/main/resources/mixins.StorageDrawers.json b/src/main/resources/mixins.StorageDrawers.json new file mode 100644 index 0000000..8eda7ce --- /dev/null +++ b/src/main/resources/mixins.StorageDrawers.json @@ -0,0 +1,7 @@ +{ + "required": true, + "minVersion": "0.8.5-GTNH", + "refmap": "mixins.storagedrawers.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8" +} \ No newline at end of file diff --git a/src/main/resources/mixins.storagedrawers.early.json b/src/main/resources/mixins.storagedrawers.early.json new file mode 100644 index 0000000..8eda7ce --- /dev/null +++ b/src/main/resources/mixins.storagedrawers.early.json @@ -0,0 +1,7 @@ +{ + "required": true, + "minVersion": "0.8.5-GTNH", + "refmap": "mixins.storagedrawers.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8" +} \ No newline at end of file From 171294745ad3abde196550b15e38c5aafbd3ba9a Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Tue, 30 Dec 2025 00:41:12 +0800 Subject: [PATCH 16/17] fixed copy+paste error --- src/main/resources/mixins.storagedrawers.early.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/mixins.storagedrawers.early.json b/src/main/resources/mixins.storagedrawers.early.json index 8eda7ce..d16a818 100644 --- a/src/main/resources/mixins.storagedrawers.early.json +++ b/src/main/resources/mixins.storagedrawers.early.json @@ -1,6 +1,7 @@ { "required": true, "minVersion": "0.8.5-GTNH", + "package": "com.jaquadro.minecraft.storagedrawers.mixins.early", "refmap": "mixins.storagedrawers.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8" From e4df95820cbc9fa6627789e35793a292ae9f4894 Mon Sep 17 00:00:00 2001 From: loenaaaa Date: Tue, 30 Dec 2025 00:45:12 +0800 Subject: [PATCH 17/17] added mixin ignore back to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f802260..748a67b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ whitelist.json *.iml *.ipr *.iws +src/main/resources/mixins.*.json *.bat runtime/ layout.json