From fdce1a65b5c594594e758c90b4e7557af794245d Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 17 Jul 2025 16:06:48 +0200 Subject: [PATCH 1/2] remove systematic registration of modules to forge event bus --- src/main/java/binnie/core/AbstractMod.java | 3 - src/main/java/binnie/core/BinnieCore.java | 6 ++ .../binnie/core/genetics/ManagerGenetics.java | 15 +++-- .../java/binnie/core/item/ModuleItems.java | 59 +++++++++++-------- 4 files changed, 50 insertions(+), 33 deletions(-) diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 8c70748b..af7d96a1 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -6,8 +6,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import net.minecraftforge.common.MinecraftForge; - import binnie.core.gui.IBinnieGUID; import binnie.core.mod.parser.FieldParser; import binnie.core.network.BinniePacketHandler; @@ -130,6 +128,5 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { protected void addModule(IInitializable init) { modules.add(init); - MinecraftForge.EVENT_BUS.register(init); } } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index d9c29f4f..7eaa096f 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -81,9 +81,15 @@ public class BinnieCore extends AbstractMod { addModule(baseManager); } + MinecraftForge.EVENT_BUS.register(Binnie.Genetics.handler); + addModule(new ModuleCraftGUI()); addModule(new ModuleStorage()); + + ModuleItems moduleItems = new ModuleItems(); addModule(new ModuleItems()); + MinecraftForge.EVENT_BUS.register(moduleItems.handler); + if (Loader.isModLoaded("BuildCraft|Silicon")) { addModule(new ModuleTrigger()); } diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 8d2c3b6f..516d3837 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -40,11 +40,13 @@ public class ManagerGenetics extends ManagerBase { private final Map breedingSystems; private final List invalidChromosomeTypes; private final Map>> chromosomeArray; + public EventHandler handler; public ManagerGenetics() { breedingSystems = new LinkedHashMap<>(); invalidChromosomeTypes = new ArrayList<>(); chromosomeArray = new LinkedHashMap<>(); + handler = new EventHandler(); } @Override @@ -140,11 +142,6 @@ public class ManagerGenetics extends ManagerBase { return (system == null) ? null : system.getConversion(stack); } - @SubscribeEvent - public void onWorldLoad(WorldEvent.Load event) { - refreshData(); - } - private void refreshData() { loadAlleles(); for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) { @@ -219,4 +216,12 @@ public class ManagerGenetics extends ManagerBase { return o1.getUID().compareTo(o2.getUID()); } } + + public class EventHandler { + + @SubscribeEvent + public void onWorldLoad(WorldEvent.Load event) { + refreshData(); + } + } } diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index bcc771c4..ea0543a8 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -21,6 +21,12 @@ import cpw.mods.fml.common.registry.GameRegistry; public class ModuleItems implements IInitializable { + public EventHandler handler; + + public ModuleItems() { + handler = new EventHandler(); + } + @Override public void preInit() { BinnieCore.fieldKit = new ItemFieldKit(); @@ -49,36 +55,39 @@ public class ModuleItems implements IInitializable { new ItemStack(Items.dye, 1)); } - @SubscribeEvent - public void onUseFieldKit(PlayerInteractEvent event) { - if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { - return; - } + public class EventHandler { - EntityPlayer player = event.entityPlayer; - if (player != null && player.getHeldItem() != null - && player.getHeldItem().getItem() == BinnieCore.fieldKit - && player.isSneaking()) { - TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); - if (!(tile instanceof TileEntityFlower tileFlower)) { + @SubscribeEvent + public void onUseFieldKit(PlayerInteractEvent event) { + if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { return; } - IFlower flower = tileFlower.getFlower(); - if (flower == null) { - return; - } + EntityPlayer player = event.entityPlayer; + if (player != null && player.getHeldItem() != null + && player.getHeldItem().getItem() == BinnieCore.fieldKit + && player.isSneaking()) { + TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); + if (!(tile instanceof TileEntityFlower tileFlower)) { + return; + } - NBTTagCompound info = new NBTTagCompound(); - info.setString("Species", flower.getGenome().getPrimary().getUID()); - info.setString("Species2", flower.getGenome().getSecondary().getUID()); - info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); - info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); - info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); - info.setBoolean("Wilting", flower.isWilted()); - info.setBoolean("Flowered", flower.hasFlowered()); - Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer); - event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); + IFlower flower = tileFlower.getFlower(); + if (flower == null) { + return; + } + + NBTTagCompound info = new NBTTagCompound(); + info.setString("Species", flower.getGenome().getPrimary().getUID()); + info.setString("Species2", flower.getGenome().getSecondary().getUID()); + info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); + info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); + info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); + info.setBoolean("Wilting", flower.isWilted()); + info.setBoolean("Flowered", flower.hasFlowered()); + Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer); + event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); + } } } } From 929e0506310602b368494bc7932a51b82a71371f Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 17 Jul 2025 16:15:59 +0200 Subject: [PATCH 2/2] Speed up BlockCarpentry event registration --- .../extratrees/carpentry/BlockDesign.java | 62 ++++++++++--------- .../extratrees/carpentry/ModuleCarpentry.java | 2 +- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index b27e5133..d40b27f0 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -35,43 +35,18 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo protected IDesignSystem designSystem; + public EventHandler handler; + public BlockDesign(IDesignSystem system, Material material) { super(material); designSystem = system; + handler = new EventHandler(); } public static int getMetadata(int plank1, int plank2, int design) { return plank1 + (plank2 << 9) + (design << 18); } - @SubscribeEvent - public void onClick(PlayerInteractEvent event) { - if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { - return; - } - - World world = event.entityPlayer.worldObj; - EntityPlayer player = event.entityPlayer; - int x = event.x; - int y = event.y; - int z = event.z; - if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) { - return; - } - - ItemStack item = player.getHeldItem(); - if (item == null || !(item.getItem() instanceof IToolHammer) - || !((IToolHammer) item.getItem()).isActive(item)) { - return; - } - - DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z); - TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); - carpentryBlock.rotate(event.face, item, player, world, x, y, z); - int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem()); - tile.setTileMetadata(meta, true); - } - public abstract ItemStack getCreativeStack(IDesign design); @Override @@ -160,4 +135,35 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public int getNumberOfPasses() { return 2; } + + public class EventHandler { + + @SubscribeEvent + public void onClick(PlayerInteractEvent event) { + if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { + return; + } + + World world = event.entityPlayer.worldObj; + EntityPlayer player = event.entityPlayer; + int x = event.x; + int y = event.y; + int z = event.z; + if (!(world.getBlock(x, y, z) instanceof BlockDesign blockDesign)) { + return; + } + + ItemStack item = player.getHeldItem(); + if (item == null || !(item.getItem() instanceof IToolHammer) + || !((IToolHammer) item.getItem()).isActive(item)) { + return; + } + + DesignBlock carpentryBlock = blockDesign.getCarpentryBlock(world, x, y, z); + TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); + carpentryBlock.rotate(event.face, item, player, world, x, y, z); + int meta = carpentryBlock.getBlockMetadata(blockDesign.getDesignSystem()); + tile.setTileMetadata(meta, true); + } + } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 7dec990d..88b217f3 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -93,7 +93,7 @@ public class ModuleCarpentry implements IInitializable { BinnieCore.proxy.registerCustomItemRenderer( Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); - MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry); + MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry.handler); BinnieCore.proxy .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); }