diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 448b94ad2..9d5cca93a 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -6,7 +6,7 @@ import java.util.HashSet; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent; @@ -37,7 +37,7 @@ public class TransmitterNetworkRegistry { loaderRegistered = true; - FMLCommonHandler.instance().bus().register(INSTANCE); + MinecraftForge.EVENT_BUS.register(INSTANCE); } } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 87ff93617..c5827080b 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -322,7 +322,7 @@ public class ClientTickHandler } else if(jetpack.getMode(mc.thePlayer.getEquipmentInSlot(3)) == JetpackMode.HOVER) { - if((!mc.gameSettings.keyBindJump.isPressed() && !mc.gameSettings.keyBindSneak.isPressed()) || (mc.gameSettings.keyBindJump.isPressed() && mc.gameSettings.keyBindSneak.isPressed()) || mc.currentScreen != null) + if((!mc.gameSettings.keyBindJump.isKeyDown() && !mc.gameSettings.keyBindSneak.isKeyDown()) || (mc.gameSettings.keyBindJump.isKeyDown() && mc.gameSettings.keyBindSneak.isKeyDown()) || mc.currentScreen != null) { if(mc.thePlayer.motionY > 0) { @@ -337,11 +337,11 @@ public class ClientTickHandler } } else { - if(mc.gameSettings.keyBindJump.isPressed() && mc.currentScreen == null) + if(mc.gameSettings.keyBindJump.isKeyDown() && mc.currentScreen == null) { mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0.2D); } - else if(mc.gameSettings.keyBindSneak.isPressed() && mc.currentScreen == null) + else if(mc.gameSettings.keyBindSneak.isKeyDown() && mc.currentScreen == null) { if(!CommonPlayerTickHandler.isOnGround(mc.thePlayer)) { @@ -429,17 +429,17 @@ public class ClientTickHandler if(jetpack.getGas(stack) != null) { - if((mc.gameSettings.keyBindJump.isPressed() && jetpack.getMode(stack) == JetpackMode.NORMAL) && mc.currentScreen == null) + if((mc.gameSettings.keyBindJump.isKeyDown() && jetpack.getMode(stack) == JetpackMode.NORMAL) && mc.currentScreen == null) { return true; } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { - if((!mc.gameSettings.keyBindJump.isPressed() && !mc.gameSettings.keyBindSneak.isPressed()) || (mc.gameSettings.keyBindJump.isPressed() && mc.gameSettings.keyBindSneak.isPressed()) || mc.currentScreen != null) + if((!mc.gameSettings.keyBindJump.isKeyDown() && !mc.gameSettings.keyBindSneak.isKeyDown()) || (mc.gameSettings.keyBindJump.isKeyDown() && mc.gameSettings.keyBindSneak.isKeyDown()) || mc.currentScreen != null) { return !player.onGround; } - else if(mc.gameSettings.keyBindSneak.isPressed() && mc.currentScreen == null) + else if(mc.gameSettings.keyBindSneak.isKeyDown() && mc.currentScreen == null) { return !player.onGround; } @@ -491,7 +491,7 @@ public class ClientTickHandler if(hasFlamethrower(player)) { - if(mc.gameSettings.keyBindUseItem.isPressed()) + if(mc.gameSettings.keyBindUseItem.isKeyDown()) { return true; } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 6e3b327fd..2fd5e249f 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -30,9 +30,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.relauncher.Side; @@ -58,7 +58,7 @@ public class MekanismKeyHandler extends MekKeyHandler ClientRegistry.registerKeyBinding(armorModeSwitchKey); ClientRegistry.registerKeyBinding(voiceKey); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index cae943174..8609d478e 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -1,6 +1,5 @@ package mekanism.client.render; -import java.util.List; import java.util.Random; import mekanism.api.Coord4D; @@ -22,9 +21,7 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; @@ -117,36 +114,34 @@ public class RenderTickHandler if(p != mc.thePlayer) { - playerPos.translate(0, 1.7, 0); + playerPos = playerPos.translate(0, 1.7, 0); } float random = (rand.nextFloat() - 0.5F) * 0.1F; Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); - Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); - Pos3D vCenter = new Pos3D((rand.nextFloat() - 0.5F) * 0.4F, -0.86, -0.30).rotatePitch(p.isSneaking() ? 25 : 0).rotateYaw(p.renderYawOffset); Pos3D rLeft = vLeft.scale(random); - Pos3D rRight = vRight.clone().scale(random); + Pos3D rRight = vRight.scale(random); - Pos3D mLeft = vLeft.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - Pos3D mRight = vRight.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - Pos3D mCenter = vCenter.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D mLeft = vLeft.scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D mRight = vRight.scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D mCenter = vCenter.scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - mLeft.translate(rLeft); - mRight.translate(rRight); + mLeft = mLeft.translate(rLeft); + mRight = mRight.translate(rRight); - Pos3D v = playerPos.clone().translate(vLeft); + Pos3D v = playerPos.translate(vLeft); spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord); spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord); - v = playerPos.clone().translate(vRight); + v = playerPos.translate(vRight); spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord); spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord); - v = playerPos.clone().translate(vCenter); + v = playerPos.translate(vCenter); spawnAndSetParticle(EnumParticleTypes.FLAME, world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord); spawnAndSetParticle(EnumParticleTypes.SMOKE_NORMAL, world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord); } @@ -169,16 +164,16 @@ public class RenderTickHandler if(p != mc.thePlayer) { - playerPos.translate(0, 1.7, 0); + playerPos = playerPos.translate(0, 1.7, 0); } float xRand = (rand.nextFloat() - 0.5F) * 0.08F; float yRand = (rand.nextFloat() - 0.5F) * 0.05F; Pos3D vec = new Pos3D(0.4, 0.4, 0.4).multiply(new Pos3D(p.getLook(90))).translate(0, -0.2, 0); - Pos3D motion = vec.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + Pos3D motion = vec.scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); - Pos3D v = playerPos.clone().translate(vec); + Pos3D v = playerPos.translate(vec); spawnAndSetParticle(EnumParticleTypes.WATER_BUBBLE, world, v.xCoord, v.yCoord, v.zCoord, motion.xCoord, motion.yCoord + 0.2, motion.zCoord); } } diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index bb9615b07..5040280ef 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -2,18 +2,19 @@ package mekanism.client.render.entity; import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class RenderFlame extends Render { @@ -40,6 +41,7 @@ public class RenderFlame extends Render GL11.glRotatef(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); int i = 0; float f2 = 0.0F; @@ -55,16 +57,15 @@ public class RenderFlame extends Render for(int j = 0; j < 4; j++) { - GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GL11.glNormal3f(0.0F, 0.0F, scale); -/*TODO - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-8D, -2D, 0.0D, f2, f4); - tessellator.addVertexWithUV(8D, -2D, 0.0D, f3, f4); - tessellator.addVertexWithUV(8D, 2D, 0.0D, f3, f5); - tessellator.addVertexWithUV(-8D, 2D, 0.0D, f2, f5); + + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)f2, (double)f4).endVertex(); + worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)f3, (double)f4).endVertex(); + worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)f3, (double)f5).endVertex(); + worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex((double)f2, (double)f5).endVertex(); tessellator.draw(); -*/ } GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 90d7c576a..bb600f912 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -14,8 +14,8 @@ import mekanism.api.util.UnitDisplayUtils.TempType; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.base.IGuiProvider; import mekanism.common.base.IUpgradeTile; -import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChanceMachine; @@ -98,13 +98,11 @@ import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; -import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMultiblock; -import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; @@ -133,9 +131,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.FMLInjectionData; @@ -399,7 +397,7 @@ public class CommonProxy implements IGuiProvider */ public void loadUtilities() { - FMLCommonHandler.instance().bus().register(Mekanism.worldTickHandler); + MinecraftForge.EVENT_BUS.register(Mekanism.worldTickHandler); } /** diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 29b03e066..a6352fa8e 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1308,8 +1308,8 @@ public class Mekanism NetworkRegistry.INSTANCE.registerGuiHandler(this, new CoreGuiHandler()); //Register player tracker - FMLCommonHandler.instance().bus().register(new CommonPlayerTracker()); - FMLCommonHandler.instance().bus().register(new CommonPlayerTickHandler()); + MinecraftForge.EVENT_BUS.register(new CommonPlayerTracker()); + MinecraftForge.EVENT_BUS.register(new CommonPlayerTickHandler()); //Initialization notification logger.info("Version " + versionNumber + " initializing..."); @@ -1321,7 +1321,6 @@ public class Mekanism ForgeChunkManager.setForcedChunkLoadingCallback(this, new ChunkManager()); //Register to receive subscribed events - FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); //Register this module's GUI handler in the simple packet protocol diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 33b3b1395..c0b22aa78 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1156,6 +1156,12 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } + @Override + public boolean isFullCube() + { + return false; + } + @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 1657e5928..877724af3 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -24,10 +24,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; public class EntityFlame extends Entity implements IEntityAdditionalSpawnData @@ -52,14 +51,12 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData Pos3D playerPos = new Pos3D(player).translate(0, 1.6, 0); Pos3D flameVec = new Pos3D(1, 1, 1); - flameVec.multiply(new Pos3D(player.getLook(90))); - flameVec.rotateYaw(6); + flameVec = flameVec.multiply(new Pos3D(player.getLookVec())).rotateYaw(6); - Pos3D mergedVec = playerPos.clone().translate(flameVec); + Pos3D mergedVec = playerPos.translate(flameVec); setPosition(mergedVec.xCoord, mergedVec.yCoord, mergedVec.zCoord); - Pos3D motion = new Pos3D(0.4, 0.4, 0.4); - motion.multiply(new Pos3D(player.getLookVec())); + Pos3D motion = new Pos3D(0.4, 0.4, 0.4).multiply(new Pos3D(player.getLookVec())); setHeading(motion); @@ -167,7 +164,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData if(mop != null) { - if(mop.entityHit != null && !mop.entityHit.isImmuneToFire()) + if(mop.typeOfHit == MovingObjectType.ENTITY && mop.entityHit != null && !mop.entityHit.isImmuneToFire()) { if(mop.entityHit instanceof EntityItem && mode != ItemFlamethrower.FlamethrowerMode.COMBAT) { @@ -183,7 +180,8 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData burn(mop.entityHit); } } - else { + else if(mop.typeOfHit == MovingObjectType.BLOCK) + { IBlockState state = worldObj.getBlockState(mop.getBlockPos()); Block block = state.getBlock(); boolean fluid = MekanismUtils.isFluid(worldObj, new Coord4D(mop)) || MekanismUtils.isDeadFluid(worldObj, new Coord4D(mop)); @@ -241,15 +239,15 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData ItemStack result = FurnaceRecipes.instance().getSmeltingResult(block.getStack(worldObj)); - if(result != null) + if(result != null && result.getItem() != null) { if(!worldObj.isRemote) { IBlockState state = block.getBlockState(worldObj); Block b = state.getBlock(); + Block newBlock = Block.getBlockFromItem(result.getItem()); - - if(Block.getBlockFromItem(result.getItem()) != Blocks.air) + if(newBlock != null && newBlock != Blocks.air) { worldObj.setBlockState(block, Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 3); } diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 660726b4a..176e682c9 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -14,8 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemFlamethrower extends ItemMekanism implements IGasItem { @@ -43,12 +41,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem list.add(EnumColor.GREY + LangUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName()); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ - public void useGas(ItemStack stack) { setGas(stack, new GasStack(getGas(stack).getGas(), getGas(stack).amount - 1)); diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index a1f4d5931..aa3ba0505 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; @@ -22,7 +22,7 @@ public class BinRecipe implements IRecipe { if(!registered) { - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); registered = true; } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 4d6522e3e..309aac8d8 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -75,7 +75,7 @@ public class MekanismGenerators implements IModule //Set up the GUI handler NetworkRegistry.INSTANCE.registerGuiHandler(this, new GeneratorsGuiHandler()); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); //Load the proxy proxy.loadConfiguration();