diff --git a/src/main/java/mekanism/client/render/CTM.java b/src/main/java/mekanism/client/render/CTM.java index ee2a1e6f3..2143c763b 100644 --- a/src/main/java/mekanism/client/render/CTM.java +++ b/src/main/java/mekanism/client/render/CTM.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map.Entry; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; /** @@ -357,11 +359,14 @@ public class CTM break; } - Block block1 = world.getBlock(x, y, z); - Block block2 = world.getBlock(x2, y2, z2); + IBlockState s1 = world.getBlockState(new BlockPos(x, y, z)); + IBlockState s2 = world.getBlockState(new BlockPos(x2, y2, z2)); - int meta1 = world.getBlockMetadata(x, y, z); - int meta2 = world.getBlockMetadata(x2, y2, z2); + Block block1 = s1.getBlock(); + Block block2 = s2.getBlock(); + + int meta1 = block1.getMetaFromState(s1); + int meta2 = block2.getMetaFromState(s2); boolean validBlockMeta1 = false; boolean invalidBlockMeta2 = true; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 49b72abce..281326ea1 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -22,16 +22,14 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.ResourceLocation; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Timer; import net.minecraftforge.client.event.TextureStitchEvent; @@ -52,12 +50,12 @@ public class MekanismRenderer { private static RenderBlocks renderBlocks = new RenderBlocks(); - public static IIcon[] colors = new IIcon[256]; + public static ResourceLocation[] colors = new ResourceLocation[256]; - public static IIcon energyIcon; - public static IIcon heatIcon; + public static ResourceLocation energyIcon; + public static ResourceLocation heatIcon; - public static Map overlays = new HashMap(); + public static Map overlays = new HashMap(); private static float lightmapLastX; private static float lightmapLastY; @@ -77,16 +75,16 @@ public class MekanismRenderer @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) + if(event.map.getGlTextureId()/*TODO Is this right?*/ == 0) { for(EnumColor color : EnumColor.values()) { - colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/overlay_" + color.unlocalizedName); + colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:overlay/overlay_" + color.unlocalizedName)); } for(TransmissionType type : TransmissionType.values()) { - overlays.put(type, event.map.registerIcon("mekanism:overlay/" + type.getTransmission() + "Overlay")); + overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:overlay/" + type.getTransmission() + "Overlay"))); } energyIcon = event.map.registerIcon("mekanism:LiquidEnergy"); @@ -152,7 +150,7 @@ public class MekanismRenderer } } - public static void loadDynamicTextures(IIconRegister register, String name, IIcon[] textures, DefIcon... defaults) + public static void loadDynamicTextures(ResourceLocationRegister register, String name, ResourceLocation[] textures, DefIcon... defaults) { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { @@ -204,11 +202,11 @@ public class MekanismRenderer public static class DefIcon { - public IIcon defIcon; + public ResourceLocation defIcon; public List icons = new ArrayList(); - public DefIcon(IIcon icon, int... is) + public DefIcon(ResourceLocation icon, int... is) { defIcon = icon; @@ -218,12 +216,12 @@ public class MekanismRenderer } } - public static DefIcon getAll(IIcon icon) + public static DefIcon getAll(ResourceLocation icon) { return new DefIcon(icon, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); } - public static DefIcon getActivePair(IIcon icon, int... is) + public static DefIcon getActivePair(ResourceLocation icon, int... is) { DefIcon ret = new DefIcon(icon, is); @@ -245,7 +243,7 @@ public class MekanismRenderer public double maxY; public double maxZ; - public IIcon[] textures = new IIcon[6]; + public ResourceLocation[] textures = new ResourceLocation[6]; public boolean[] renderSides = new boolean[] {true, true, true, true, true, true, false}; @@ -271,17 +269,17 @@ public class MekanismRenderer return renderSides[side.ordinal()]; } - public IIcon getBlockTextureFromSide(int i) + public ResourceLocation getBlockTextureFromSide(int i) { return textures[i]; } - public void setTexture(IIcon tex) + public void setTexture(ResourceLocation tex) { Arrays.fill(textures, tex); } - public void setTextures(IIcon down, IIcon up, IIcon north, IIcon south, IIcon west, IIcon east) + public void setTextures(ResourceLocation down, ResourceLocation up, ResourceLocation north, ResourceLocation south, ResourceLocation west, ResourceLocation east) { textures[0] = down; textures[1] = up; @@ -363,7 +361,7 @@ public class MekanismRenderer GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } - public static IIcon getColorIcon(EnumColor color) + public static ResourceLocation getColorIcon(EnumColor color) { return colors[color.ordinal()]; } @@ -440,7 +438,7 @@ public class MekanismRenderer */ public static void renderItem(ItemStack item) { - IIcon icon = item.getItem().getIconIndex(item); + ResourceLocation icon = item.getItem().getIconIndex(item); TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); if(icon == null) @@ -689,6 +687,6 @@ public class MekanismRenderer public static interface ICustomBlockIcon { - public IIcon getIcon(ItemStack stack, int side); + public ResourceLocation getIcon(ItemStack stack, int side); } } diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index f8790d135..fd9d235d5 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -28,7 +28,7 @@ public final class MinerVisualRenderer public static void render(TileEntityDigitalMiner miner) { GL11.glPushMatrix(); - GL11.glTranslated(getX(miner.xCoord), getY(miner.yCoord), getZ(miner.zCoord)); + GL11.glTranslated(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ())); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); GL11.glEnable(GL11.GL_CULL_FACE); @@ -60,7 +60,7 @@ public final class MinerVisualRenderer { if(x == -data.radius || x == data.radius || y == data.minY-data.yCoord || y == data.maxY-data.yCoord || z == -data.radius || z == data.radius) { - models.add(createModel(new Coord4D(x, y, z, mc.theWorld.provider.dimensionId))); + models.add(createModel(new Coord4D(x, y, z, mc.theWorld.provider.getDimensionId()))); } } } @@ -80,7 +80,7 @@ public final class MinerVisualRenderer { Model3D toReturn = new Model3D(); - toReturn.setBlockBounds(rel.xCoord + 0.4, rel.yCoord + 0.4, rel.zCoord + 0.4, rel.xCoord + 0.6, rel.yCoord + 0.6, rel.zCoord + 0.6); + toReturn.setBlockBounds(rel.getX() + 0.4, rel.getY() + 0.4, rel.getZ() + 0.4, rel.getX() + 0.6, rel.getY() + 0.6, rel.getZ() + 0.6); toReturn.baseBlock = Blocks.water; toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); @@ -119,9 +119,9 @@ public final class MinerVisualRenderer public MinerRenderData(TileEntityDigitalMiner miner) { - this(miner.minY, miner.maxY, miner.radius, miner.yCoord); + this(miner.minY, miner.maxY, miner.radius, miner.getPos().getY()); } - + @Override public boolean equals(Object data) { diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index 9f57b860b..2ada1da3c 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -41,18 +41,17 @@ public class ModelCustomArmor extends ModelBiped resetPart(bipedLeftLeg, 0, 0, 0); bipedHeadwear.cubeList.clear(); - bipedEars.cubeList.clear(); - bipedCloak.cubeList.clear(); } public void init(Entity entity, float f, float f1, float f2, float f3, float f4, float size) { reset(); + isSneak = entity.isSneaking(); + isRiding = entity.isRiding(); + if(entity instanceof EntityLivingBase) { - isSneak = ((EntityLivingBase)entity).isSneaking(); - isRiding = ((EntityLivingBase)entity).isRiding(); isChild = ((EntityLivingBase)entity).isChild(); } @@ -246,10 +245,11 @@ public class ModelCustomArmor extends ModelBiped @Override public void render(Entity entity, float par2, float par3, float par4, float par5, float par6, float par7) { + isSneak = entity.isSneaking(); + isRiding = entity.isRiding(); + if(entity instanceof EntityLivingBase) { - isSneak = ((EntityLivingBase)entity).isSneaking(); - isRiding = ((EntityLivingBase)entity).isRiding(); isChild = ((EntityLivingBase)entity).isChild(); } diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index 51d7a0196..9bbdb9ad1 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -1,5 +1,6 @@ package mekanism.client.render; +/* import java.util.Map; import mekanism.api.EnumColor; @@ -21,9 +22,11 @@ import codechicken.lib.render.TextureUtils.IIconSelfRegister; import codechicken.lib.render.uv.IconTransformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; +*/ -public class RenderGlowPanel implements IIconSelfRegister +public class RenderGlowPanel//TODO implements IIconSelfRegister { +/*TODO public static RenderGlowPanel INSTANCE; public static CCModel[] frameModels; @@ -100,4 +103,5 @@ public class RenderGlowPanel implements IIconSelfRegister { return 0; } +*/ } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 932b78cee..c7c767314 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -1,5 +1,6 @@ package mekanism.client.render; +/* import java.util.HashMap; import java.util.Map; @@ -57,10 +58,12 @@ import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +*/ -@SideOnly(Side.CLIENT) -public class RenderPartTransmitter implements IIconSelfRegister +//@SideOnly(Side.CLIENT) +public class RenderPartTransmitter //TODO implements IIconSelfRegister { +/* public static RenderPartTransmitter INSTANCE; public static Map small_models; @@ -814,4 +817,5 @@ public class RenderPartTransmitter implements IIconSelfRegister cachedLiquids.clear(); cachedOverlays.clear(); } +*/ } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 0c4fc5e82..a1285d860 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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; @@ -29,6 +30,8 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javafx.geometry.Pos; + @SideOnly(Side.CLIENT) public class RenderTickHandler { @@ -45,17 +48,13 @@ public class RenderTickHandler EntityPlayer player = mc.thePlayer; World world = mc.thePlayer.worldObj; - FontRenderer font = mc.fontRenderer; + FontRenderer font = mc.fontRendererObj; MovingObjectPosition pos = player.rayTrace(40.0D, 1.0F); if(pos != null) - { - int x = MathHelper.floor_double(pos.blockX); - int y = MathHelper.floor_double(pos.blockY); - int z = MathHelper.floor_double(pos.blockZ); - - Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); + { + Coord4D obj = new Coord4D(pos.getBlockPos(), world.provider.getDimensionId()); if(MekanismAPI.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) { @@ -81,7 +80,7 @@ public class RenderTickHandler { ItemStack stack = player.getEquipmentInSlot(3); - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc); int x = scaledresolution.getScaledWidth(); int y = scaledresolution.getScaledHeight(); @@ -123,25 +122,13 @@ public class RenderTickHandler float random = (rand.nextFloat() - 0.5F) * 0.1F; - Pos3D vLeft = new Pos3D(); - vLeft.xPos -= 0.43; - vLeft.yPos -= 0.55; - vLeft.zPos -= 0.54; - vLeft.rotateYaw(p.renderYawOffset); + Pos3D vLeft = new Pos3D(-0.43, -0.55, -0.54).rotateYaw(p.renderYawOffset); - Pos3D vRight = new Pos3D(); - vRight.xPos += 0.43; - vRight.yPos -= 0.55; - vRight.zPos -= 0.54; - vRight.rotateYaw(p.renderYawOffset); + Pos3D vRight = new Pos3D(0.43, -0.55, -0.54).rotateYaw(p.renderYawOffset); - Pos3D vCenter = new Pos3D(); - vCenter.xPos = (rand.nextFloat() - 0.5F) * 0.4F; - vCenter.yPos -= 0.86; - vCenter.zPos -= 0.30; - vCenter.rotateYaw(p.renderYawOffset); + Pos3D vCenter = new Pos3D((rand.nextFloat() - 0.5F) * 0.4F, -0.86, -0.30).rotateYaw(p.renderYawOffset); - Pos3D rLeft = vLeft.clone().scale(random); + Pos3D rLeft = vLeft.scale(random); Pos3D rRight = vRight.clone().scale(random); Pos3D mLeft = vLeft.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); @@ -152,64 +139,65 @@ public class RenderTickHandler mRight.translate(rRight); Pos3D v = playerPos.clone().translate(vLeft); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mLeft.xPos, mLeft.yPos, mLeft.zPos); + spawnAndSetParticle("flame", world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord); + spawnAndSetParticle("smoke", world, v.xCoord, v.yCoord, v.zCoord, mLeft.xCoord, mLeft.yCoord, mLeft.zCoord); v = playerPos.clone().translate(vRight); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mRight.xPos, mRight.yPos, mRight.zPos); + spawnAndSetParticle("flame", world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord); + spawnAndSetParticle("smoke", world, v.xCoord, v.yCoord, v.zCoord, mRight.xCoord, mRight.yCoord, mRight.zCoord); v = playerPos.clone().translate(vCenter); - spawnAndSetParticle("flame", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); - spawnAndSetParticle("smoke", world, v.xPos, v.yPos, v.zPos, mCenter.xPos, mCenter.yPos, mCenter.zPos); + spawnAndSetParticle("flame", world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord); + spawnAndSetParticle("smoke", world, v.xCoord, v.yCoord, v.zCoord, mCenter.xCoord, mCenter.yCoord, mCenter.zCoord); } } if(world.getWorldTime() % 4 == 0) { - for(EntityPlayer p : (List)world.playerEntities) + for(EntityPlayer p : world.playerEntities) { - if(!Mekanism.flamethrowerActive.contains(p.getCommandSenderName()) && !p.isSwingInProgress && p.getCurrentEquippedItem() != null && p.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower) + if(!Mekanism.flamethrowerActive.contains(p.getName()) && !p.isSwingInProgress && p.getCurrentEquippedItem() != null && p.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower) { if(((ItemFlamethrower)p.getCurrentEquippedItem().getItem()).getGas(p.getCurrentEquippedItem()) != null) { Pos3D playerPos = new Pos3D(p); - Pos3D flameVec = new Pos3D(); + Pos3D flameVec; + + double flameXCoord = 0; + double flameYCoord = 0; + double flameZCoord = 0; if(p.isSneaking()) { - flameVec.yPos -= 0.35F; - flameVec.zPos -= 0.15F; + flameYCoord -= 0.35F; + flameZCoord -= 0.15F; } Pos3D flameMotion = new Pos3D(p.motionX, p.onGround ? 0 : p.motionY, p.motionZ); if(player == p && mc.gameSettings.thirdPersonView == 0) { - flameVec = new Pos3D(0.8, 0.8, 0.8); - - flameVec.multiply(new Pos3D(p.getLook(90))); - flameVec.rotateYaw(15); + flameVec = new Pos3D(0.8, 0.8, 0.8).multiply(new Pos3D(p.getLook(90))).rotateYaw(15); } else { - flameVec.xPos -= 0.45F; + flameXCoord -= 0.45F; if(player == p) { - flameVec.yPos -= 0.5F; + flameYCoord -= 0.5F; } else { - flameVec.yPos += 1F; + flameYCoord += 1F; } - flameVec.zPos += 1.05F; + flameZCoord += 1.05F; - flameVec.rotateYaw(p.renderYawOffset); + flameVec = new Pos3D(flameXCoord, flameYCoord, flameZCoord).rotateYaw(p.renderYawOffset); } - Pos3D mergedVec = playerPos.clone().translate(flameVec); + Pos3D mergedVec = playerPos.translate(flameVec); - spawnAndSetParticle("flame", world, mergedVec.xPos, mergedVec.yPos, mergedVec.zPos, flameMotion.xPos, flameMotion.yPos, flameMotion.zPos); + spawnAndSetParticle("flame", world, mergedVec.xCoord, mergedVec.yCoord, mergedVec.zCoord, flameMotion.xCoord, flameMotion.yCoord, flameMotion.zCoord); } } } diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index b9d50b8cb..6690b9da2 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -3,6 +3,8 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFlameFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; @@ -27,11 +29,11 @@ public class EntityJetpackFlameFX extends EntityFlameFX } @Override - public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) + 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_) { if(particleAge > 0) { - super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + super.renderParticle(worldRendererIn, entityIn, partialTicks, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_); } } } diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index bcf428949..dfb8e63f3 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -3,6 +3,8 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; @@ -15,7 +17,7 @@ public class EntityJetpackSmokeFX extends EntitySmokeFX public EntityJetpackSmokeFX(World world, double posX, double posY, double posZ, double velX, double velY, double velZ) { - super(world, posX, posY, posZ, velX, velY, velZ); + super(world, posX, posY, posZ, velX, velY, velZ, 1.0F); noClip = false; } @@ -27,11 +29,11 @@ public class EntityJetpackSmokeFX extends EntitySmokeFX } @Override - public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) + 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_) { if(particleAge > 0) { - super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + super.renderParticle(worldRendererIn, entityIn, partialTicks, p_180434_4_, p_180434_5_, p_180434_6_, p_180434_7_, p_180434_8_); } } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 4c18376bc..5d923776d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -6,15 +6,12 @@ import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,87 +20,82 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { - private final RenderBlocks renderBlocks = new RenderBlocks(); - private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); + private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override public void renderTileEntityAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - if(tileEntity instanceof TileEntityBin) + String amount = ""; + ItemStack itemStack = tileEntity.itemType; + + if(itemStack != null) { - String amount = ""; - ItemStack itemStack = tileEntity.itemType; - - if(itemStack != null) - { - amount = Integer.toString(tileEntity.clientAmount); - } - - Coord4D obj = Coord4D.get(tileEntity).offset(ForgeDirection.getOrientation(tileEntity.facing)); - - if(tileEntity.getWorldObj().getBlock(obj.xCoord, obj.yCoord, obj.zCoord).isSideSolid(tileEntity.getWorldObj(), obj.xCoord, obj.yCoord, obj.zCoord, ForgeDirection.getOrientation(tileEntity.facing).getOpposite())) - { - return; - } - - doLight(tileEntity.getWorldObj(), obj); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - - if(itemStack != null) - { - GL11.glPushMatrix(); - - switch(ForgeDirection.getOrientation(tileEntity.facing)) - { - case NORTH: - GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01); - break; - case SOUTH: - GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01); - GL11.glRotatef(180, 0, 1, 0); - break; - case WEST: - GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27); - GL11.glRotatef(90, 0, 1, 0); - break; - case EAST: - GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73); - GL11.glRotatef(-90, 0, 1, 0); - break; - } - - float scale = 0.03125F; - float scaler = 0.9F; - - GL11.glScalef(scale*scaler, scale*scaler, 0); - GL11.glRotatef(180, 0, 0, 1); - - TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; - - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - - renderItem.renderItemAndEffectIntoGUI(func_147498_b()/*getFontRenderer()*/, renderEngine, itemStack, 0, 0); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); - } - - if(amount != "") - { - renderText(amount, ForgeDirection.getOrientation(tileEntity.facing), 0.02F, x, y - 0.31F, z); - } + amount = Integer.toString(tileEntity.clientAmount); } - } - private void doLight(World world, Coord4D obj) - { - if(world.getBlock(obj.xCoord, obj.yCoord, obj.zCoord).isOpaqueCube()) + Coord4D obj = Coord4D.get(tileEntity).offset(EnumFacing.getFront(tileEntity.facing)); + + if(tileEntity.getWorld().getBlockState(obj).getBlock().isSideSolid(tileEntity.getWorld(), obj, EnumFacing.getFront(tileEntity.facing).getOpposite())) { return; } - int brightness = world.getLightBrightnessForSkyBlocks(obj.xCoord, obj.yCoord, obj.zCoord, 0); + doLight(tileEntity.getWorld(), obj); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + + if(itemStack != null) + { + GL11.glPushMatrix(); + + switch(EnumFacing.getFront(tileEntity.facing)) + { + case NORTH: + GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01); + break; + case SOUTH: + GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01); + GL11.glRotatef(180, 0, 1, 0); + break; + case WEST: + GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27); + GL11.glRotatef(90, 0, 1, 0); + break; + case EAST: + GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73); + GL11.glRotatef(-90, 0, 1, 0); + break; + } + + float scale = 0.03125F; + float scaler = 0.9F; + + GL11.glScalef(scale*scaler, scale*scaler, 0); + GL11.glRotatef(180, 0, 0, 1); + + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + + renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } + + if(!amount.equals("")) + { + renderText(amount, EnumFacing.getFront(tileEntity.facing), 0.02F, x, y - 0.31F, z); + } + + } + + private void doLight(World world, Coord4D obj) + { + if(world.getBlockState(obj).getBlock().isOpaqueCube()) + { + return; + } + + int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj); int lightX = brightness % 65536; int lightY = brightness / 65536; float scale = 0.6F; @@ -112,7 +104,7 @@ public class RenderBin extends TileEntitySpecialRenderer } @SuppressWarnings("incomplete-switch") - private void renderText(String text, ForgeDirection side, float maxScale, double x, double y, double z) + private void renderText(String text, EnumFacing side, float maxScale, double x, double y, double z) { GL11.glPushMatrix(); @@ -150,7 +142,7 @@ public class RenderBin extends TileEntitySpecialRenderer GL11.glTranslatef(displayWidth / 2, 1F, displayHeight / 2); GL11.glRotatef(-90, 1, 0, 0); - FontRenderer fontRenderer = func_147498_b();//getFontRenderer(); + FontRenderer fontRenderer = getFontRenderer(); int requiredWidth = Math.max(fontRenderer.getStringWidth(text), 1); int lineHeight = fontRenderer.FONT_HEIGHT + 2; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index e9c72c165..43aca0590 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -47,6 +47,6 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer> cachedGasses = new HashMap>(); + private Map> cachedGasses = new HashMap>(); @Override public void renderTileEntityAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) @@ -39,7 +38,7 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer> cachedGasses = new HashMap>(); + private Map> cachedGasses = new HashMap>(); @Override public void renderTileEntityAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick, int destroyStage) @@ -39,7 +38,7 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer> cachedOverlays = new HashMap>(); + private HashMap> cachedOverlays = new HashMap>(); public RenderConfigurableMachine() { - field_147501_a = TileEntityRendererDispatcher.instance; + rendererDispatcher = TileEntityRendererDispatcher.instance; } @Override @@ -46,24 +44,20 @@ public class RenderConfigurableMachine map = getMap(name); IResettableSound sound = map.get(channel.getName()); @@ -72,7 +72,7 @@ public class SoundHandler public static void addSound(EntityPlayer player, Channel channel, boolean replace) { - String name = player.getCommandSenderName(); + String name = player.getName(); Map map = getMap(name); IResettableSound sound = map.get(channel.getName()); @@ -85,7 +85,7 @@ public class SoundHandler public static boolean playSound(EntityPlayer player, Channel channel) { - String name = player.getCommandSenderName(); + String name = player.getName(); Map map = getMap(name); IResettableSound sound = map.get(channel.getName()); @@ -147,7 +147,7 @@ public class SoundHandler public static void playSound(String sound) { - playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation(sound), 1.0F)); + playSound(PositionedSoundRecord.create(new ResourceLocation(sound), 1.0F)); } public static void playSound(ISound sound) diff --git a/src/main/java/mekanism/client/sound/TileSound.java b/src/main/java/mekanism/client/sound/TileSound.java index d7916ad11..78536dc1e 100644 --- a/src/main/java/mekanism/client/sound/TileSound.java +++ b/src/main/java/mekanism/client/sound/TileSound.java @@ -24,12 +24,12 @@ public class TileSound extends Sound implements IResettableSound public TileSound(IHasSound source, ISoundSource values) { - this(source, values.getSoundLocation(), values.getVolume(), values.getPitch(), values.shouldRepeat(), values.getRepeatDelay(), values.getSoundPosition().xPos, values.getSoundPosition().yPos, values.getSoundPosition().zPos); + this(source, values.getSoundLocation(), values.getVolume(), values.getPitch(), values.shouldRepeat(), values.getRepeatDelay(), values.getSoundPosition().xCoord, values.getSoundPosition().yCoord, values.getSoundPosition().zCoord); } public TileSound(IHasSound source, ISoundSource values, ResourceLocation location) { - this(source, location, values.getVolume(), values.getPitch(), values.shouldRepeat(), values.getRepeatDelay(), values.getSoundPosition().xPos, values.getSoundPosition().yPos, values.getSoundPosition().zPos); + this(source, location, values.getVolume(), values.getPitch(), values.shouldRepeat(), values.getRepeatDelay(), values.getSoundPosition().xCoord, values.getSoundPosition().yCoord, values.getSoundPosition().zCoord); } public TileSound(IHasSound source, String sound, float volume, float pitch, boolean repeat, int repeatDelay, double x, double y, double z)