Compare commits

..
13 Commits
7 changed files with 32 additions and 27 deletions

No files matched your search

@@ -160,6 +160,7 @@ public class BlockConduitBundle extends BlockEio
BlockConduitBundle result = new BlockConduitBundle();
result.init();
MinecraftForge.EVENT_BUS.register(result.handler);
return result;
}
@@ -170,6 +171,7 @@ public class BlockConduitBundle extends BlockEio
private IIcon lastRemovedComponetIcon = null;
private final Random rand = new Random();
public EventHandler handler;
protected BlockConduitBundle() {
super(ModObject.blockConduitBundle.unlocalisedName, TileConduitBundle.class);
@@ -189,6 +191,8 @@ public class BlockConduitBundle extends BlockEio
return "EnderIO:" + soundName + ".step";
}
};
handler = new EventHandler();
}
@SideOnly(Side.CLIENT)
@@ -298,7 +302,6 @@ 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
@@ -43,6 +43,8 @@ import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil;
public class ItemDarkSteelAxe extends ItemAxe
implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
public EventHandler handler;
public static boolean isEquipped(EntityPlayer player) {
if (player == null) {
return false;
@@ -67,6 +69,7 @@ public class ItemDarkSteelAxe extends ItemAxe
public static ItemDarkSteelAxe create() {
ItemDarkSteelAxe res = new ItemDarkSteelAxe();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
@@ -77,6 +80,7 @@ public class ItemDarkSteelAxe extends ItemAxe
protected ItemDarkSteelAxe() {
this("darkSteel", ItemDarkSteelSword.MATERIAL);
handler = new EventHandler();
}
protected ItemDarkSteelAxe(String name, ToolMaterial mat) {
@@ -86,6 +90,7 @@ public class ItemDarkSteelAxe extends ItemAxe
String str = name + "_axe";
setUnlocalizedName(str);
setTextureName(EnderIO.DOMAIN + ":" + str);
handler = new EventHandler();
}
@Override
@@ -245,7 +250,6 @@ public class ItemDarkSteelAxe extends ItemAxe
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -38,6 +38,8 @@ import crazypants.enderio.machine.farm.farmers.HarvestResult;
public class ItemDarkSteelShears extends ItemShears
implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
public EventHandler handler;
public static boolean isEquipped(EntityPlayer player) {
if (player == null) {
return false;
@@ -62,12 +64,13 @@ public class ItemDarkSteelShears extends ItemShears
public static ItemDarkSteelShears create() {
ItemDarkSteelShears res = new ItemDarkSteelShears();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
private final EntityComparator entityComparator = new EntityComparator();
protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
protected final EntityComparator entityComparator = new EntityComparator();
protected String name;
protected ItemDarkSteelShears(String name) {
@@ -82,6 +85,7 @@ public class ItemDarkSteelShears extends ItemShears
protected ItemDarkSteelShears() {
this("darkSteel");
handler = new EventHandler();
}
@Override
@@ -222,7 +226,6 @@ public class ItemDarkSteelShears extends ItemShears
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -323,7 +326,7 @@ public class ItemDarkSteelShears extends ItemShears
}
}
public static class EventHandler {
public class EventHandler {
@SubscribeEvent
public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
@@ -72,12 +72,14 @@ public class ItemDarkSteelSword extends ItemSword
public static ItemDarkSteelSword create() {
ItemDarkSteelSword res = new ItemDarkSteelSword();
res.init();
MinecraftForge.EVENT_BUS.register(res.handler);
return res;
}
protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses();
protected long lastBlickTick = -1;
protected String name;
public EventHandler handler;
public ItemDarkSteelSword(String name, ToolMaterial mat) {
super(mat);
@@ -87,10 +89,12 @@ public class ItemDarkSteelSword extends ItemSword
String str = name + "_sword";
setUnlocalizedName(str);
setTextureName(EnderIO.DOMAIN + ":" + str);
handler = new EventHandler();
}
public ItemDarkSteelSword() {
this("darkSteel", MATERIAL);
handler = new EventHandler();
}
@Override
@@ -226,7 +230,6 @@ public class ItemDarkSteelSword extends ItemSword
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -22,13 +22,16 @@ import crazypants.enderio.xp.PacketGivePlayerXP;
public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
static final String USERNAME = "KillerJoe";
public EventHandler handler;
public static BlockKillerJoe create() {
PacketHandler.INSTANCE
.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT);
PacketGivePlayerXP.register();
PacketExperianceContainer.register();
BlockKillerJoe res = new BlockKillerJoe();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
@@ -36,12 +39,7 @@ public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
protected BlockKillerJoe() {
super(ModObject.blockKillerJoe, TileKillerJoe.class);
setStepSound(Block.soundTypeGlass);
}
@Override
protected void init() {
super.init();
MinecraftForge.EVENT_BUS.register(new EventHandler());
handler = new EventHandler();
}
@Override
@@ -21,21 +21,18 @@ import crazypants.enderio.machine.obelisk.BlockObeliskAbstract;
public class BlockInhibitorObelisk extends BlockObeliskAbstract<TileInhibitorObelisk> {
public static BlockInhibitorObelisk instance;
public EventHandler handler;
public static BlockInhibitorObelisk create() {
BlockInhibitorObelisk res = new BlockInhibitorObelisk();
res.init();
MinecraftForge.EVENT_BUS.register(res.handler);
return instance = res;
}
protected BlockInhibitorObelisk() {
super(ModObject.blockInhibitorObelisk, TileInhibitorObelisk.class);
}
@Override
protected void init() {
super.init();
MinecraftForge.EVENT_BUS.register(new EventHandler());
handler = new EventHandler();
}
@Override
@@ -89,6 +89,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
PoweredSpawnerConfig.getInstance();
BlockPoweredSpawner res = new BlockPoweredSpawner();
MinecraftForge.EVENT_BUS.register(res.handler);
FMLCommonHandler.instance().bus().register(res.handler);
res.init();
return res;
}
@@ -97,6 +99,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
private Field fieldpersistenceRequired;
public EventHandler handler;
protected BlockPoweredSpawner() {
super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class);
@@ -111,14 +115,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
} catch (Exception e) {
Log.error("BlockPoweredSpawner: Could not find field: persistenceRequired");
}
}
@Override
protected void init() {
super.init();
EventHandler handler = new EventHandler();
MinecraftForge.EVENT_BUS.register(handler);
FMLCommonHandler.instance().bus().register(handler);
handler = new EventHandler();
}
private final Map<BlockCoord, ItemStack> dropCache = new HashMap<BlockCoord, ItemStack>();