diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 25e27534c..0b94513fc 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -33,7 +33,7 @@ public class ClientConnectionHandler else { //If the client is connecting to a foreign integrated or dedicated server. try { - MekanismClient.voiceClient = new VoiceClient(((InetSocketAddress)event.manager.getSocketAddress()).getHostString()); + MekanismClient.voiceClient = new VoiceClient(((InetSocketAddress)event.manager/*TODO is this right?*/.getRemoteAddress()).getHostString()); } catch(Throwable e) { Mekanism.logger.error("Unable to establish VoiceClient on remote connection."); e.printStackTrace(); diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index fe43e5673..1bbf684c0 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -62,10 +62,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; import mekanism.client.render.RenderTickHandler; -import mekanism.client.render.block.BasicRenderingHandler; -import mekanism.client.render.block.CTMRenderingHandler; -import mekanism.client.render.block.MachineRenderingHandler; -import mekanism.client.render.block.PlasticRenderingHandler; import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; @@ -102,8 +98,6 @@ import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; import mekanism.common.base.IElectricChest; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -170,17 +164,20 @@ import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; +import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -218,16 +215,18 @@ public class ClientProxy extends CommonProxy } } +/* @Override public int getArmorIndex(String string) { return RenderingRegistry.addNewArmourRendererPrefix(string); } +*/ @Override - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) + public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.worldObj.getTileEntity(x, y, z); + TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.worldObj.getTileEntity(pos); if(id == 0) { @@ -282,15 +281,15 @@ public class ClientProxy extends CommonProxy @Override public void registerSpecialTileEntities() { - ClientRegistry.registerTileEntity(TileEntityEnrichmentChamber.class, "EnrichmentChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityOsmiumCompressor.class, "OsmiumCompressor", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityFactory.class, "SmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityAdvancedFactory.class, "AdvancedSmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityEnrichmentChamber.class, "EnrichmentChamber", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityOsmiumCompressor.class, "OsmiumCompressor", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityCombiner.class, "Combiner", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityCrusher.class, "Crusher", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityFactory.class, "SmeltingFactory", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityAdvancedFactory.class, "AdvancedSmeltingFactory", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderMetallurgicInfuser()); ClientRegistry.registerTileEntity(TileEntityObsidianTNT.class, "ObsidianTNT", new RenderObsidianTNT()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); @@ -307,10 +306,10 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); ClientRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer", new RenderChemicalOxidizer()); ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); - ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator()); ClientRegistry.registerTileEntity(TileEntitySolarEvaporationController.class, "SalinationController", new RenderSalinationController()); - ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); @@ -337,15 +336,46 @@ public class ClientProxy extends CommonProxy RenderGlowPanel.init(); //Register entity rendering handlers - RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new RenderObsidianTNTPrimed()); - RenderingRegistry.registerEntityRenderingHandler(EntityRobit.class, new RenderRobit()); - RenderingRegistry.registerEntityRenderingHandler(EntityBalloon.class, new RenderBalloon()); - RenderingRegistry.registerEntityRenderingHandler(EntityBabySkeleton.class, new RenderSkeleton()); - RenderingRegistry.registerEntityRenderingHandler(EntityFlame.class, new RenderFlame()); + RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) + { + return new RenderObsidianTNTPrimed(manager); + } + }); + RenderingRegistry.registerEntityRenderingHandler(EntityRobit.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) + { + return new RenderRobit(manager); + } + }); + RenderingRegistry.registerEntityRenderingHandler(EntityBalloon.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) + { + return new RenderBalloon(manager); + } + }); + RenderingRegistry.registerEntityRenderingHandler(EntityBabySkeleton.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) + { + return new RenderSkeleton(manager); + } + }); + RenderingRegistry.registerEntityRenderingHandler(EntityFlame.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) + { + return new RenderFlame(manager); + } + }); //Register item handler ItemRenderingHandler handler = new ItemRenderingHandler(); +/*TODO MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler); @@ -372,14 +402,15 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); RenderingRegistry.registerBlockHandler(new PlasticRenderingHandler()); RenderingRegistry.registerBlockHandler(new CTMRenderingHandler()); +*/ Mekanism.logger.info("Render registrations complete."); } @Override - public GuiScreen getClientGui(int ID, EntityPlayer player, World world, int x, int y, int z) + public GuiScreen getClientGui(int ID, EntityPlayer player, World world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); switch(ID) { @@ -431,30 +462,30 @@ public class ClientProxy extends CommonProxy case 20: return new GuiPasswordModify((TileEntityElectricChest)tileEntity); case 21: - EntityRobit robit = (EntityRobit)world.getEntityByID(x); + EntityRobit robit = (EntityRobit)world.getEntityByID(pos.getX()); if(robit != null) { return new GuiRobitMain(player.inventory, robit); } case 22: - return new GuiRobitCrafting(player.inventory, world, x); + return new GuiRobitCrafting(player.inventory, world, pos.getX()); case 23: - EntityRobit robit1 = (EntityRobit)world.getEntityByID(x); + EntityRobit robit1 = (EntityRobit)world.getEntityByID(pos.getX()); if(robit1 != null) { return new GuiRobitInventory(player.inventory, robit1); } case 24: - EntityRobit robit2 = (EntityRobit)world.getEntityByID(x); + EntityRobit robit2 = (EntityRobit)world.getEntityByID(pos.getX()); if(robit2 != null) { return new GuiRobitSmelting(player.inventory, robit2); } case 25: - return new GuiRobitRepair(player.inventory, world, x); + return new GuiRobitRepair(player.inventory, world, pos.getX()); case 29: return new GuiChemicalOxidizer(player.inventory, (TileEntityChemicalOxidizer)tileEntity); case 30: @@ -536,7 +567,7 @@ public class ClientProxy extends CommonProxy { if(Minecraft.getMinecraft().theWorld != null) { - Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(coord.xCoord, coord.yCoord, coord.zCoord, mop); + Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(coord, mop); } } @@ -631,7 +662,7 @@ public class ClientProxy extends CommonProxy } @Override - public void renderLaser(World world, Pos3D from, Pos3D to, ForgeDirection direction, double energy) + public void renderLaser(World world, Pos3D from, Pos3D to, EnumFacing direction, double energy) { Minecraft.getMinecraft().effectRenderer.addEffect(new EntityLaser(world, from, to, direction, energy)); } diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index d62563d33..4506099f6 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -104,7 +104,7 @@ public final class HolidayManager { String themedLines = getThemedLines(new EnumColor[] {EnumColor.DARK_GREEN, EnumColor.DARK_RED}, 13); player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.addChatMessage(new ChatComponentText(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getCommandSenderName() + EnumColor.RED + "!")); + player.addChatMessage(new ChatComponentText(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); player.addChatMessage(new ChatComponentText(EnumColor.RED + "May you have plenty of Christmas cheer")); player.addChatMessage(new ChatComponentText(EnumColor.RED + "and have a relaxing holiday with your")); player.addChatMessage(new ChatComponentText(EnumColor.RED + "family :)")); @@ -153,7 +153,7 @@ public final class HolidayManager { String themedLines = getThemedLines(new EnumColor[] {EnumColor.WHITE, EnumColor.YELLOW}, 13); player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getCommandSenderName() + EnumColor.RED + "!")); + player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Best wishes to you as we enter this")); player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "new and exciting year of " + calendar.get(Calendar.YEAR) + "! :)")); player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + "-aidancbrady")); diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index 36dfab718..989f08c5e 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -54,7 +54,7 @@ public abstract class MekKeyHandler for(int i = 0; i < keyBindings.length; i++) { KeyBinding keyBinding = keyBindings[i]; - boolean state = keyBinding.getIsKeyPressed(); + boolean state = keyBinding.isPressed(); if(state != keyDown[i] || (state && repeatings[i])) { diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index e8d3f0bc2..98cd1ec5a 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -20,7 +20,7 @@ public class MekanismClient extends Mekanism public static void updateKey(KeyBinding key, int type) { - boolean down = Minecraft.getMinecraft().currentScreen == null ? key.getIsKeyPressed() : false; + boolean down = Minecraft.getMinecraft().currentScreen == null && key.isPressed(); if(down != keyMap.has(Minecraft.getMinecraft().thePlayer, type)) { diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index d6e6abdec..5230ca4a4 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -7,8 +7,9 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +35,7 @@ public class SparkleAnimation try { if(general.dynamicTankEasterEgg) { - pointer.getWorldObj().playSound(pointer.xCoord, pointer.yCoord, pointer.zCoord, "mekanism:etc.cj", 1F, 1F, false); + pointer.getWorld().playSound(pointer.getPos().getX(), pointer.getPos().getY(), pointer.getPos().getZ(), "mekanism:etc.cj", 1F, 1F, false); } loop(pointer); @@ -45,18 +46,18 @@ public class SparkleAnimation @Override public void run() { - World world = pointer.getWorldObj(); + World world = pointer.getWorld(); for(Coord4D coord : iteratedNodes) { for(int i = 0; i < 6; i++) { - world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + -.01, coord.zCoord + random.nextDouble(), 0, 0, 0); - world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + 1.01, coord.zCoord + random.nextDouble(), 0, 0, 0); - world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + -.01, 0, 0, 0); - world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + 1.01, 0, 0, 0); - world.spawnParticle("reddust", coord.xCoord + -.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0); - world.spawnParticle("reddust", coord.xCoord + 1.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + -.01, coord.getZ() + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + 1.01, coord.getZ() + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + random.nextDouble(), coord.getZ() + -.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + random.nextDouble(), coord.getZ() + 1.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + -.01, coord.getY() + random.nextDouble(), coord.getZ() + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + 1.01, coord.getY() + random.nextDouble(), coord.getZ() + random.nextDouble(), 0, 0, 0); } } } @@ -68,13 +69,13 @@ public class SparkleAnimation { iteratedNodes.add(Coord4D.get(tileEntity)); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = Coord4D.get(tileEntity).offset(side); - if(coord.exists(pointer.getWorldObj())) + if(coord.exists(pointer.getWorld())) { - TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile != null && isNode(tile) && !iteratedNodes.contains(coord)) { @@ -89,8 +90,8 @@ public class SparkleAnimation return nodeChecker.isNode(tile); } - public static interface INodeChecker + public interface INodeChecker { - public boolean isNode(TileEntity tile); + boolean isNode(TileEntity tile); } } diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index cbaabf1b3..5f8db8eba 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -6,9 +6,11 @@ import mekanism.client.render.MekanismRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -18,11 +20,11 @@ import org.lwjgl.opengl.GL11; public class EntityLaser extends EntityFX { double length; - ForgeDirection direction; + EnumFacing direction; - public EntityLaser(World world, Pos3D start, Pos3D end, ForgeDirection dir, double energy) + public EntityLaser(World world, Pos3D start, Pos3D end, EnumFacing dir, double energy) { - super(world, (start.xPos + end.xPos)/2D, (start.yPos + end.yPos)/2D, (start.zPos+end.zPos)/2D); + super(world, (start.xCoord + end.xCoord)/2D, (start.yCoord + end.yCoord)/2D, (start.zCoord+end.zCoord)/2D); particleMaxAge = 5; particleRed = 1; particleGreen = 0; @@ -34,9 +36,9 @@ public class EntityLaser extends EntityFX } @Override - public void renderParticle(Tessellator tessellator, float partialTick, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY) + public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_) { - tessellator.draw(); + worldRendererIn.finishDrawing(); GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_POLYGON_BIT + GL11.GL_ENABLE_BIT); @@ -44,9 +46,9 @@ public class EntityLaser extends EntityFX MekanismRenderer.glowOn(); Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation("mekanism", "particles/laser.png")); - float newX = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTick - interpPosX); - float newY = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTick - interpPosY); - float newZ = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTick - interpPosZ); + float newX = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks - interpPosX); + float newY = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks - interpPosY); + float newZ = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks - interpPosZ); GL11.glTranslatef(newX, newY, newZ); diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index c43072b5d..28bde5faf 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -121,6 +121,6 @@ public class GuiAdvancedElectricMachine extends GuiMekanism int guiHeight = (height - ySize) / 2; mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos, gas.getGas().getIcon(), sizeX, sizeY); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, gas.getGas().getIcon(), sizeX, sizeY); } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 70768b9f7..9fb250f13 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -13,6 +13,7 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -195,18 +196,6 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper GL11.glPopAttrib(); } - @Override - public void drawTexturedRect(int x, int y, int u, int v, int w, int h) - { - drawTexturedModalRect(x, y, u, v, w, h); - } - - @Override - public void drawTexturedRectFromIcon(int x, int y, IIcon icon, int w, int h) - { - drawTexturedModelRectFromIcon(x, y, icon, w, h); - } - @Override public void displayTooltip(String s, int x, int y) { diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 9263594b8..692afb64d 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -17,37 +17,42 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderBalloon extends Render +public class RenderBalloon extends Render { private Minecraft mc = Minecraft.getMinecraft(); public ModelBalloon model = new ModelBalloon(); + public RenderBalloon(RenderManager renderManager) + { + super(renderManager); + } + @Override - protected ResourceLocation getEntityTexture(Entity entity) + protected ResourceLocation getEntityTexture(EntityBalloon entity) { return MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png"); } @Override - public void doRender(Entity entity, double x, double y, double z, float f, float partialTick) + public void doRender(EntityBalloon balloon, double x, double y, double z, float f, float partialTick) { - EntityBalloon balloon = (EntityBalloon)entity; - if(balloon.isLatchedToEntity()) { x = (balloon.latchedEntity.lastTickPosX + (balloon.latchedEntity.posX - balloon.latchedEntity.lastTickPosX)*partialTick); y = (balloon.latchedEntity.lastTickPosY + (balloon.latchedEntity.posY - balloon.latchedEntity.lastTickPosY)*partialTick); z = (balloon.latchedEntity.lastTickPosZ + (balloon.latchedEntity.posZ - balloon.latchedEntity.lastTickPosZ)*partialTick); +/*TODO x -= RenderManager.renderPosX; y -= RenderManager.renderPosY; z -= RenderManager.renderPosZ; +*/ y += balloon.getAddedHeight(); } - render(((EntityBalloon)entity).color, x, y, z); + render(balloon.color, x, y, z); } public void render(EnumColor color, double x, double y, double z) diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 5aa5d8e95..c53e5f17c 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -5,6 +5,7 @@ import mekanism.common.entity.EntityFlame; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -14,11 +15,17 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) -public class RenderFlame extends Render +public class RenderFlame extends Render { + public RenderFlame(RenderManager renderManager) + { + super(renderManager); + } + + @Override public void doRender(EntityFlame entity, double x, double y, double z, float f, float partialTick) { - float alpha = (float)(entity.ticksExisted+partialTick)/(float)EntityFlame.LIFESPAN; + float alpha = (entity.ticksExisted+partialTick)/(float)EntityFlame.LIFESPAN; float size = (float)Math.pow(2*alpha, 2); GL11.glPushMatrix(); @@ -32,7 +39,7 @@ public class RenderFlame extends Render GL11.glRotatef((entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTick) - 90F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); int i = 0; float f2 = 0.0F; @@ -50,12 +57,14 @@ public class RenderFlame extends Render { GL11.glRotatef(90F, 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); tessellator.draw(); +*/ } GL11.glDisable(GL12.GL_RESCALE_NORMAL); @@ -63,15 +72,9 @@ public class RenderFlame extends Render MekanismRenderer.blendOff(); GL11.glPopMatrix(); } - - @Override - public void doRender(Entity entity, double x, double y, double z, float f, float partialTick) - { - doRender((EntityFlame)entity, x, y, z, f, partialTick); - } @Override - protected ResourceLocation getEntityTexture(Entity entity) + protected ResourceLocation getEntityTexture(EntityFlame entity) { return new ResourceLocation("mekanism:render/Flame.png"); } diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 23f53ee7f..e90cde0fe 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -5,10 +5,9 @@ import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -16,23 +15,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderObsidianTNTPrimed extends Render +public class RenderObsidianTNTPrimed extends Render { - private RenderBlocks blockRenderer = new RenderBlocks(); private ModelObsidianTNT model = new ModelObsidianTNT(); - public RenderObsidianTNTPrimed() + public RenderObsidianTNTPrimed(RenderManager renderManager) { + super(renderManager); shadowSize = 0.5F; } @Override - public void doRender(Entity entity, double x, double y, double z, float f, float f1) - { - renderObsidianTNT((EntityObsidianTNT)entity, x, y, z, f, f1); - } - - public void renderObsidianTNT(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float f, float f1) + public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float f, float f1) { GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y+1.2F, (float)z); @@ -81,7 +75,7 @@ public class RenderObsidianTNTPrimed extends Render } @Override - protected ResourceLocation getEntityTexture(Entity entity) + protected ResourceLocation getEntityTexture(EntityObsidianTNT entity) { return TextureMap.locationBlocksTexture; } diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index de4b41033..5c54675f3 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -6,25 +6,24 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderRobit extends RenderLiving +public class RenderRobit extends RenderLiving { - public RenderRobit() + public RenderRobit(RenderManager renderManager) { - super(new ModelRobit(), 0.5F); + super(renderManager, new ModelRobit(), 0.5F); } @Override - protected ResourceLocation getEntityTexture(Entity entity) + protected ResourceLocation getEntityTexture(EntityRobit robit) { - EntityRobit robit = (EntityRobit)entity; - - if((Math.abs(entity.posX-entity.prevPosX) + Math.abs(entity.posX-entity.prevPosX)) > 0.001) + if((Math.abs(robit.posX-robit.prevPosX) + Math.abs(robit.posX-robit.prevPosX)) > 0.001) { if(robit.ticksExisted % 3 == 0) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 2724acacf..8569ae4d7 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -112,12 +112,13 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -131,10 +132,12 @@ import net.minecraftforge.fml.relauncher.FMLInjectionData; */ public class CommonProxy { +/* public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); public static int CTM_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); +*/ protected static WeakReference dummyPlayer = new WeakReference(null); @@ -199,11 +202,9 @@ public class CommonProxy * @param id - the electric chest gui ID to open * @param windowId - the container-specific window ID * @param isBlock - if the chest is a block - * @param x - x coordinate - * @param y - y coordinate - * @param z - z coordinate + * @param pos - coordinates */ - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) {} + public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {} /** * Register and load client-only render information. @@ -395,12 +396,10 @@ public class CommonProxy * @param ID - gui ID * @param player - player that opened the GUI * @param world - world the GUI was opened in - * @param x - gui's x position - * @param y - gui's y position - * @param z - gui's z position + * @param pos - gui's position * @return the GuiScreen of the GUI */ - public Object getClientGui(int ID, EntityPlayer player, World world, int x, int y, int z) + public Object getClientGui(int ID, EntityPlayer player, World world, BlockPos pos) { return null; } @@ -410,14 +409,12 @@ public class CommonProxy * @param ID - gui ID * @param player - player that opened the GUI * @param world - world the GUI was opened in - * @param x - gui's x position - * @param y - gui's y position - * @param z - gui's z position + * @param pos - gui's position * @return the Container of the GUI */ - public Container getServerGui(int ID, EntityPlayer player, World world, int x, int y, int z) + public Container getServerGui(int ID, EntityPlayer player, World world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); switch(ID) { @@ -463,7 +460,7 @@ public class CommonProxy case 18: return new ContainerDynamicTank(player.inventory, (TileEntityDynamicTank)tileEntity); case 21: - EntityRobit robit = (EntityRobit)world.getEntityByID(x); + EntityRobit robit = (EntityRobit)world.getEntityByID(pos.getX()); if(robit != null) { @@ -472,14 +469,14 @@ public class CommonProxy case 22: return new ContainerRobitCrafting(player.inventory, world); case 23: - EntityRobit robit1 = (EntityRobit)world.getEntityByID(x); + EntityRobit robit1 = (EntityRobit)world.getEntityByID(pos.getX()); if(robit1 != null) { return new ContainerRobitInventory(player.inventory, robit1); } case 24: - EntityRobit robit2 = (EntityRobit)world.getEntityByID(x); + EntityRobit robit2 = (EntityRobit)world.getEntityByID(pos.getX()); if(robit2 != null) { @@ -652,5 +649,5 @@ public class CommonProxy return context.getServerHandler().playerEntity; } - public void renderLaser(World world, Pos3D from, Pos3D to, ForgeDirection direction, double energy) {} + public void renderLaser(World world, Pos3D from, Pos3D to, EnumFacing direction, double energy) {} }