From 581150178f022c8a552247a9519d832cbd7ffde7 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Fri, 18 Jul 2025 00:37:03 +0200 Subject: [PATCH] Speed up forge event registration (#200) Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> --- .../enderio/conduit/BlockConduitBundle.java | 111 +++---- .../item/darksteel/ItemDarkSteelAxe.java | 29 +- .../item/darksteel/ItemDarkSteelPickaxe.java | 2 - .../item/darksteel/ItemDarkSteelShears.java | 25 +- .../item/darksteel/ItemDarkSteelSword.java | 136 +++++---- .../item/darksteel/ItemEndSteelAxe.java | 2 - .../item/darksteel/ItemEndSteelPickaxe.java | 2 - .../item/darksteel/ItemEndSteelSword.java | 2 - .../item/darksteel/ItemStellarAxe.java | 2 - .../item/darksteel/ItemStellarPickaxe.java | 2 - .../item/darksteel/ItemStellarSword.java | 2 - .../machine/killera/BlockKillerJoe.java | 25 +- .../inhibitor/BlockInhibitorObelisk.java | 28 +- .../machine/spawner/BlockPoweredSpawner.java | 286 +++++++++--------- 14 files changed, 339 insertions(+), 315 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index ee7ed7f5..b1f8aa16 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -160,7 +160,6 @@ public class BlockConduitBundle extends BlockEio BlockConduitBundle result = new BlockConduitBundle(); result.init(); - MinecraftForge.EVENT_BUS.register(result); return result; } @@ -292,41 +291,6 @@ public class BlockConduitBundle extends BlockEio effectRenderer.addEffect(digFX); } - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onPlaySound(PlaySoundSourceEvent event) { - String path = event.sound.getPositionedSoundLocation().getResourcePath(); - if ("silence.step".equals(path)) { - ISound snd = event.sound; - World world = EnderIO.proxy.getClientWorld(); - BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF()); - TileEntity te = bc.getTileEntity(world); - if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { - Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); - ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z); - } else { - ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); - } - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) { - String path = event.name; - World world = event.entity.worldObj; - if ("EnderIO:silence.step".equals(path) && world.isRemote) { - BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ); - TileEntity te = bc.getTileEntity(world); - if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { - Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); - ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z); - } else { - ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); - } - } - } - @Override protected void init() { super.init(); @@ -334,6 +298,7 @@ public class BlockConduitBundle extends BlockEio EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this); } EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this); + MinecraftForge.EVENT_BUS.register(new EventHandler()); } @Override @@ -473,24 +438,6 @@ public class BlockConduitBundle extends BlockEio : resist; } - @SubscribeEvent - public void onBreakSpeed(BreakSpeed event) { - if (event.block == this) { - ItemStack held = event.entityPlayer.getCurrentEquippedItem(); - if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { - event.newSpeed += 2; - } - IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); - if (te != null && te.getFacadeType() == FacadeType.HARDENED) { - if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { - event.newSpeed *= 6; - } else { - event.newSpeed *= 2; - } - } - } - } - @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { @@ -1274,4 +1221,60 @@ public class BlockConduitBundle extends BlockEio private boolean hasMicroblocks(IConduitBundle bundle) { return !bundle.getCoverSystem().getAllParts().isEmpty(); } + + public class EventHandler { + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlaySound(PlaySoundSourceEvent event) { + String path = event.sound.getPositionedSoundLocation().getResourcePath(); + if ("silence.step".equals(path)) { + ISound snd = event.sound; + World world = EnderIO.proxy.getClientWorld(); + BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF()); + TileEntity te = bc.getTileEntity(world); + if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { + Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); + ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z); + } else { + ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); + } + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) { + String path = event.name; + World world = event.entity.worldObj; + if ("EnderIO:silence.step".equals(path) && world.isRemote) { + BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ); + TileEntity te = bc.getTileEntity(world); + if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { + Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); + ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z); + } else { + ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); + } + } + } + + @SubscribeEvent + public void onBreakSpeed(BreakSpeed event) { + if (event.block == BlockConduitBundle.this) { + ItemStack held = event.entityPlayer.getCurrentEquippedItem(); + if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { + event.newSpeed += 2; + } + IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); + if (te != null && te.getFacadeType() == FacadeType.HARDENED) { + if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { + event.newSpeed *= 6; + } else { + event.newSpeed *= 2; + } + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 257589da..aa929f7b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -67,7 +67,6 @@ public class ItemDarkSteelAxe extends ItemAxe public static ItemDarkSteelAxe create() { ItemDarkSteelAxe res = new ItemDarkSteelAxe(); - MinecraftForge.EVENT_BUS.register(res); res.init(); return res; } @@ -188,18 +187,6 @@ public class ItemDarkSteelAxe extends ItemAxe return usedPower; } - @SubscribeEvent - public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { - if (evt.entityPlayer.isSneaking() - && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) - && isLog(evt.block, evt.metadata)) { - evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; - } - if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) { - evt.newSpeed = 6; - } - } - @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { @@ -258,6 +245,7 @@ public class ItemDarkSteelAxe extends ItemAxe protected void init() { GameRegistry.registerItem(this, getUnlocalizedName()); + MinecraftForge.EVENT_BUS.register(new EventHandler()); } @Override @@ -336,4 +324,19 @@ public class ItemDarkSteelAxe extends ItemAxe return (x < y) ? -1 : ((x == y) ? 0 : 1); } } + + public class EventHandler { + + @SubscribeEvent + public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { + if (evt.entityPlayer.isSneaking() + && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) + && isLog(evt.block, evt.metadata)) { + evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; + } + if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) { + evt.newSpeed = 6; + } + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 750580a7..e62aea1a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.MinecraftForge; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; @@ -61,7 +60,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe public static ItemDarkSteelPickaxe create() { ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index c002d4d3..71729b49 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -62,13 +62,12 @@ public class ItemDarkSteelShears extends ItemShears public static ItemDarkSteelShears create() { ItemDarkSteelShears res = new ItemDarkSteelShears(); - MinecraftForge.EVENT_BUS.register(res); res.init(); return res; } - protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); - protected final EntityComparator entityComparator = new EntityComparator(); + private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + private final EntityComparator entityComparator = new EntityComparator(); protected String name; protected ItemDarkSteelShears(String name) { @@ -202,14 +201,6 @@ public class ItemDarkSteelShears extends ItemShears return false; } - @SubscribeEvent - public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { - if (evt.originalSpeed > 2.0 - && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) { - evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered; - } - } - @Override public void setDamage(ItemStack stack, int newDamage) { int oldDamage = getDamage(stack); @@ -231,6 +222,7 @@ public class ItemDarkSteelShears extends ItemShears protected void init() { GameRegistry.registerItem(this, getUnlocalizedName()); + MinecraftForge.EVENT_BUS.register(new EventHandler()); } @Override @@ -330,4 +322,15 @@ public class ItemDarkSteelShears extends ItemShears return 0; } } + + public static class EventHandler { + + @SubscribeEvent + public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { + if (evt.originalSpeed > 2.0 + && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) { + evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered; + } + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 2576ada4..8f8bca0d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -72,7 +72,6 @@ public class ItemDarkSteelSword extends ItemSword public static ItemDarkSteelSword create() { ItemDarkSteelSword res = new ItemDarkSteelSword(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } @@ -117,71 +116,6 @@ public class ItemDarkSteelSword extends ItemSword return false; } - @SubscribeEvent - public void onEnderTeleport(EnderTeleportEvent evt) { - if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) { - evt.setCanceled(true); - } - } - - // Set priorty to lowest in the hope any other mod adding head drops will have already added them - // by the time this is called to prevent multiple head drops - @SubscribeEvent(priority = EventPriority.LOWEST) - public void onEntityDrop(LivingDropsEvent evt) { - - if (!(evt.source.getEntity() instanceof EntityPlayer)) { - return; - } - - EntityPlayer player = (EntityPlayer) evt.source.getEntity(); - // Handle TiC weapons with beheading differently - if (handleBeheadingWeapons(player, evt)) { - return; - } - - double skullDropChance = getSkullDropChance(player, evt); - if (player instanceof FakePlayer) { - skullDropChance *= Config.fakePlayerSkullChance; - } - if (Math.random() <= skullDropChance) { - dropSkull(evt, player); - } - - // Special handling for ender pear drops - if (isEquipped(player)) { - String name = EntityList.getEntityString(evt.entityLiving); - if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { - int numPearls = 0; - if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) { - numPearls++; - } - for (int i = 0; i < evt.lootingLevel; i++) { - if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) { - numPearls++; - } - } - - int existing = 0; - for (EntityItem stack : evt.drops) { - if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) { - existing += stack.getEntityItem().stackSize; - } - } - int toDrop = numPearls - existing; - if (toDrop > 0) { - evt.drops.add( - Util.createDrop( - player.worldObj, - new ItemStack(Items.ender_pearl, toDrop, 0), - evt.entityLiving.posX, - evt.entityLiving.posY, - evt.entityLiving.posZ, - false)); - } - } - } - } - protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) { ItemStack skull = getSkullForEntity(evt.entityLiving); if (skull != null && !containsDrop(evt, skull)) { @@ -292,6 +226,7 @@ public class ItemDarkSteelSword extends ItemSword protected void init() { GameRegistry.registerItem(this, getUnlocalizedName()); + MinecraftForge.EVENT_BUS.register(new EventHandler()); } @Override @@ -437,4 +372,73 @@ public class ItemDarkSteelSword extends ItemSword return super.onItemRightClick(stack, world, player); } + + public class EventHandler { + + @SubscribeEvent + public void onEnderTeleport(EnderTeleportEvent evt) { + if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) { + evt.setCanceled(true); + } + } + + // Set priorty to lowest in the hope any other mod adding head drops will have already added them + // by the time this is called to prevent multiple head drops + @SubscribeEvent(priority = EventPriority.LOWEST) + public void onEntityDrop(LivingDropsEvent evt) { + + if (!(evt.source.getEntity() instanceof EntityPlayer)) { + return; + } + + EntityPlayer player = (EntityPlayer) evt.source.getEntity(); + // Handle TiC weapons with beheading differently + if (handleBeheadingWeapons(player, evt)) { + return; + } + + double skullDropChance = getSkullDropChance(player, evt); + if (player instanceof FakePlayer) { + skullDropChance *= Config.fakePlayerSkullChance; + } + if (Math.random() <= skullDropChance) { + dropSkull(evt, player); + } + + // Special handling for ender pear drops + if (isEquipped(player)) { + String name = EntityList.getEntityString(evt.entityLiving); + if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { + int numPearls = 0; + if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) { + numPearls++; + } + for (int i = 0; i < evt.lootingLevel; i++) { + if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) { + numPearls++; + } + } + + int existing = 0; + for (EntityItem stack : evt.drops) { + if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) { + existing += stack.getEntityItem().stackSize; + } + } + int toDrop = numPearls - existing; + if (toDrop > 0) { + evt.drops.add( + Util.createDrop( + player.worldObj, + new ItemStack(Items.ender_pearl, toDrop, 0), + evt.entityLiving.posX, + evt.entityLiving.posY, + evt.entityLiving.posZ, + false)); + } + } + } + } + + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java index 96ac7dd2..4843f853 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,7 +29,6 @@ public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem { public static ItemEndSteelAxe create() { ItemEndSteelAxe res = new ItemEndSteelAxe(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java index f055a0ec..6d658a29 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,7 +29,6 @@ public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSte public static ItemEndSteelPickaxe create() { ItemEndSteelPickaxe res = new ItemEndSteelPickaxe(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java index 1183468d..62110003 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.relauncher.Side; @@ -35,7 +34,6 @@ public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelIt public static ItemEndSteelSword create() { ItemEndSteelSword res = new ItemEndSteelSword(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java index ab5609d4..9e778b24 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,7 +29,6 @@ public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem { public static ItemStellarAxe create() { ItemStellarAxe res = new ItemStellarAxe(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java index 08ecc2df..3b921aa8 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,7 +29,6 @@ public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellar public static ItemStellarPickaxe create() { ItemStellarPickaxe res = new ItemStellarPickaxe(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java index 3e7e0e18..db922797 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java @@ -6,7 +6,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.relauncher.Side; @@ -35,7 +34,6 @@ public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem public static ItemStellarSword create() { ItemStellarSword res = new ItemStellarSword(); res.init(); - MinecraftForge.EVENT_BUS.register(res); return res; } diff --git a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java index 0231fbd6..a5fa6e11 100644 --- a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java @@ -28,9 +28,7 @@ public class BlockKillerJoe extends AbstractMachineBlock { .registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT); PacketGivePlayerXP.register(); PacketExperianceContainer.register(); - BlockKillerJoe res = new BlockKillerJoe(); - MinecraftForge.EVENT_BUS.register(res); res.init(); return res; } @@ -40,19 +38,18 @@ public class BlockKillerJoe extends AbstractMachineBlock { setStepSound(Block.soundTypeGlass); } + @Override + protected void init() { + super.init(); + MinecraftForge.EVENT_BUS.register(new EventHandler()); + } + @Override public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { return 2000; } - @SubscribeEvent - public void getKillDisplayName(PlayerEvent.NameFormat nameEvt) { - if (nameEvt.username != null && nameEvt.username.startsWith(USERNAME)) { - nameEvt.displayname = getLocalizedName(); - } - } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerKillerJoe(player.inventory, (TileKillerJoe) world.getTileEntity(x, y, z)); @@ -101,4 +98,14 @@ public class BlockKillerJoe extends AbstractMachineBlock { return 5; } } + + public class EventHandler { + + @SubscribeEvent + public void getKillDisplayName(PlayerEvent.NameFormat nameEvt) { + if (nameEvt.username != null && nameEvt.username.startsWith(USERNAME)) { + nameEvt.displayname = getLocalizedName(); + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java index 965834ca..ec0df131 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java @@ -25,7 +25,6 @@ public class BlockInhibitorObelisk extends BlockObeliskAbstract activeInhibitors = Maps.newHashMap(); - @SubscribeEvent - public void onTeleport(TeleportEntityEvent event) { - for (Entry e : activeInhibitors.entrySet()) { - BlockCoord bc = e.getKey(); - int dist = bc.getDist(new BlockCoord(event.targetX, event.targetY, event.targetZ)); - if (dist < e.getValue()) { - TileEntity te = bc.getTileEntity(event.entity.worldObj); - if (te instanceof TileInhibitorObelisk && ((TileInhibitorObelisk) te).isActive()) { - event.setCanceled(true); + public class EventHandler { + + @SubscribeEvent + public void onTeleport(TeleportEntityEvent event) { + for (Entry e : activeInhibitors.entrySet()) { + BlockCoord bc = e.getKey(); + int dist = bc.getDist(new BlockCoord(event.targetX, event.targetY, event.targetZ)); + if (dist < e.getValue()) { + TileEntity te = bc.getTileEntity(event.entity.worldObj); + if (te instanceof TileInhibitorObelisk && ((TileInhibitorObelisk) te).isActive()) { + event.setCanceled(true); + } } } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index d373eee7..f70b02d6 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -89,8 +89,6 @@ public class BlockPoweredSpawner extends AbstractMachineBlock dropCache = new HashMap(); - @SubscribeEvent - public void onBreakEvent(BlockEvent.BreakEvent evt) { - if (evt.block instanceof BlockMobSpawner) { - if (evt.getPlayer() != null && !evt.getPlayer().capabilities.isCreativeMode - && !evt.getPlayer().worldObj.isRemote - && !evt.isCanceled()) { - TileEntity tile = evt.getPlayer().worldObj.getTileEntity(evt.x, evt.y, evt.z); - if (tile instanceof TileEntityMobSpawner) { - - if (Math.random() > Config.brokenSpawnerDropChance) { - return; - } - - ItemStack equipped = evt.getPlayer().getCurrentEquippedItem(); - if (equipped != null) { - for (UniqueIdentifier uid : toolBlackList) { - Item blackListItem = GameRegistry.findItem(uid.modId, uid.name); - if (blackListItem == equipped.getItem()) { - return; - } - } - } - - TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; - MobSpawnerBaseLogic logic = spawner.func_145881_a(); - if (logic != null) { - String name = logic.getEntityNameToSpawn(); - if (name != null && !isBlackListed(name)) { - ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); - dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), drop); - - for (int i = (int) (Math.random() * 7); i > 0; i--) { - logic.spawnDelay = 0; - logic.updateSpawner(); - } - } - } - } - } else { - dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), null); - } - } - } - - @SubscribeEvent - public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent evt) { - if (!evt.isCanceled() && evt.block instanceof BlockMobSpawner) { - BlockCoord bc = new BlockCoord(evt.x, evt.y, evt.z); - if (dropCache.containsKey(bc)) { - ItemStack stack = dropCache.get(bc); - if (stack != null) { - evt.drops.add(stack); - } - } else { - // A spawner was broken---but not by a player. The TE has been - // invalidated already, but we might be able to recover it. - try { - for (Object object : evt.world.loadedTileEntityList) { - if (object instanceof TileEntityMobSpawner) { - TileEntityMobSpawner spawner = (TileEntityMobSpawner) object; - if (spawner.getWorldObj() == evt.world && spawner.xCoord == evt.x - && spawner.yCoord == evt.y - && spawner.zCoord == evt.z) { - // Bingo! - MobSpawnerBaseLogic logic = spawner.func_145881_a(); - if (logic != null) { - String name = logic.getEntityNameToSpawn(); - if (name != null && !isBlackListed(name)) { - evt.drops.add(ItemBrokenSpawner.createStackForMobType(name)); - } - } - } - } - } - } catch (Exception e) { - // Risky recovery failed. Happens. - } - } - } - } - - @SubscribeEvent - public void onServerTick(TickEvent.ServerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - dropCache.clear(); - } - } - - @SubscribeEvent - public void handleAnvilEvent(AnvilUpdateEvent evt) { - if (evt.left == null || evt.left.stackSize != 1 - || evt.left.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner) - || evt.right == null - || ItemBrokenSpawner.getMobTypeFromStack(evt.right) == null) { - return; - } - - String spawnerType = ItemBrokenSpawner.getMobTypeFromStack(evt.right); - if (isBlackListed(spawnerType)) { - return; - } - - evt.cost = Config.powerSpawnerAddSpawnerCost; - evt.output = evt.left.copy(); - if (evt.output.stackTagCompound == null) { - evt.output.stackTagCompound = new NBTTagCompound(); - } - evt.output.stackTagCompound.setBoolean("eio.abstractMachine", true); - writeMobTypeToNBT(evt.output.stackTagCompound, spawnerType); - } - - @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent livingUpdate) { - - Entity ent = livingUpdate.entityLiving; - if (!ent.getEntityData().hasKey(KEY_SPAWNED_BY_POWERED_SPAWNER)) { - return; - } - if (fieldpersistenceRequired == null) { - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - return; - } - - long spawnTime = ent.getEntityData().getLong(KEY_SPAWNED_BY_POWERED_SPAWNER); - long livedFor = livingUpdate.entity.worldObj.getTotalWorldTime() - spawnTime; - if (livedFor > Config.poweredSpawnerDespawnTimeSeconds * 20) { - try { - fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - } catch (Exception e) { - Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - } - } - } - public boolean isBlackListed(String entityId) { return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); } @@ -362,4 +232,144 @@ public class BlockPoweredSpawner extends AbstractMachineBlock Config.brokenSpawnerDropChance) { + return; + } + + ItemStack equipped = evt.getPlayer().getCurrentEquippedItem(); + if (equipped != null) { + for (UniqueIdentifier uid : toolBlackList) { + Item blackListItem = GameRegistry.findItem(uid.modId, uid.name); + if (blackListItem == equipped.getItem()) { + return; + } + } + } + + TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if (logic != null) { + String name = logic.getEntityNameToSpawn(); + if (name != null && !isBlackListed(name)) { + ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); + dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), drop); + + for (int i = (int) (Math.random() * 7); i > 0; i--) { + logic.spawnDelay = 0; + logic.updateSpawner(); + } + } + } + } + } else { + dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), null); + } + } + } + + @SubscribeEvent + public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent evt) { + if (!evt.isCanceled() && evt.block instanceof BlockMobSpawner) { + BlockCoord bc = new BlockCoord(evt.x, evt.y, evt.z); + if (dropCache.containsKey(bc)) { + ItemStack stack = dropCache.get(bc); + if (stack != null) { + evt.drops.add(stack); + } + } else { + // A spawner was broken---but not by a player. The TE has been + // invalidated already, but we might be able to recover it. + try { + for (Object object : evt.world.loadedTileEntityList) { + if (object instanceof TileEntityMobSpawner) { + TileEntityMobSpawner spawner = (TileEntityMobSpawner) object; + if (spawner.getWorldObj() == evt.world && spawner.xCoord == evt.x + && spawner.yCoord == evt.y + && spawner.zCoord == evt.z) { + // Bingo! + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if (logic != null) { + String name = logic.getEntityNameToSpawn(); + if (name != null && !isBlackListed(name)) { + evt.drops.add(ItemBrokenSpawner.createStackForMobType(name)); + } + } + } + } + } + } catch (Exception e) { + // Risky recovery failed. Happens. + } + } + } + } + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + dropCache.clear(); + } + } + + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if (evt.left == null || evt.left.stackSize != 1 + || evt.left.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner) + || evt.right == null + || ItemBrokenSpawner.getMobTypeFromStack(evt.right) == null) { + return; + } + + String spawnerType = ItemBrokenSpawner.getMobTypeFromStack(evt.right); + if (isBlackListed(spawnerType)) { + return; + } + + evt.cost = Config.powerSpawnerAddSpawnerCost; + evt.output = evt.left.copy(); + if (evt.output.stackTagCompound == null) { + evt.output.stackTagCompound = new NBTTagCompound(); + } + evt.output.stackTagCompound.setBoolean("eio.abstractMachine", true); + writeMobTypeToNBT(evt.output.stackTagCompound, spawnerType); + } + + @SubscribeEvent + public void onLivingUpdate(LivingUpdateEvent livingUpdate) { + + Entity ent = livingUpdate.entityLiving; + if (!ent.getEntityData().hasKey(KEY_SPAWNED_BY_POWERED_SPAWNER)) { + return; + } + if (fieldpersistenceRequired == null) { + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + return; + } + + long spawnTime = ent.getEntityData().getLong(KEY_SPAWNED_BY_POWERED_SPAWNER); + long livedFor = livingUpdate.entity.worldObj.getTotalWorldTime() - spawnTime; + if (livedFor > Config.poweredSpawnerDespawnTimeSeconds * 20) { + try { + fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } catch (Exception e) { + Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } + } + } + + } }