diff --git a/build.gradle b/build.gradle index 029b88844..3486ab16b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -85,10 +85,11 @@ minecraft { dependencies { deobfCompile "MCMultiPart2:MCMultiPart-exp:${config.mcmp_version}" - deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}" + deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}:api" + runtime "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}" compile "net.darkhax.tesla:Tesla:${config.tesla_version}" compile "inventory-tweaks:InventoryTweaks:${config.invtweak_version}:api" - compile "li.cil.oc:OpenComputers:MC${config.minecraft_version}-${config.opencomputers_version}:api" + compile "li.cil.oc:OpenComputers:MC1.11.2-${config.opencomputers_version}:api" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}" } diff --git a/build.properties b/build.properties index d9f5301e5..64b3a2d4a 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,8 @@ -minecraft_version=1.11.2 +minecraft_version=1.12 mappings_version=snapshot_20161220 -forge_version=13.20.0.2304 +forge_version=14.21.0.2327 mcmp_version=2.0.0_19 -jei_version=4.2.9.247 +jei_version=4.6.0.61 mod_version=9.3.2 tesla_version=1.11-1.3.0.52 invtweak_version=1.62+beta.89 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 941144813..30d399d8d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 643b83281..e18cba72f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 26 18:24:18 MST 2016 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip diff --git a/gradlew b/gradlew index 9d82f7891..91a7e269e 100644 --- a/gradlew +++ b/gradlew @@ -42,6 +42,11 @@ case "`uname`" in ;; esac +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null +cd "`dirname \"$PRG\"`/" >&- APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +cd "$SAVED" >&- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -109,7 +114,6 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/src/api/java/buildcraft/api/transport/pipe/IPipeBehaviourRenderer.java b/src/api/java/buildcraft/api/transport/pipe/IPipeBehaviourRenderer.java index f981c9ea2..390a29c19 100755 --- a/src/api/java/buildcraft/api/transport/pipe/IPipeBehaviourRenderer.java +++ b/src/api/java/buildcraft/api/transport/pipe/IPipeBehaviourRenderer.java @@ -1,11 +1,11 @@ package buildcraft.api.transport.pipe; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public interface IPipeBehaviourRenderer { - void render(B behaviour, double x, double y, double z, float partialTicks, VertexBuffer vb); + void render(B behaviour, double x, double y, double z, float partialTicks, BufferBuilder vb); } diff --git a/src/api/java/buildcraft/api/transport/pipe/IPipeFlowRenderer.java b/src/api/java/buildcraft/api/transport/pipe/IPipeFlowRenderer.java index 787f9e99d..2cbc61d75 100755 --- a/src/api/java/buildcraft/api/transport/pipe/IPipeFlowRenderer.java +++ b/src/api/java/buildcraft/api/transport/pipe/IPipeFlowRenderer.java @@ -1,6 +1,6 @@ package buildcraft.api.transport.pipe; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; public interface IPipeFlowRenderer { /** @param flow The flow to render @@ -8,5 +8,5 @@ public interface IPipeFlowRenderer { * @param y * @param z * @param vb The (optional) vertex buffer that you can render into. Note that you can still do GL stuff. */ - void render(F flow, double x, double y, double z, float partialTicks, VertexBuffer vb); + void render(F flow, double x, double y, double z, float partialTicks, BufferBuilder vb); } diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPlugDynamicRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPlugDynamicRenderer.java index 916f4fe69..0d19c0777 100755 --- a/src/api/java/buildcraft/api/transport/pluggable/IPlugDynamicRenderer.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPlugDynamicRenderer.java @@ -1,7 +1,7 @@ package buildcraft.api.transport.pluggable; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; public interface IPlugDynamicRenderer

{ - void render(P plug, double x, double y, double z, float partialTicks, VertexBuffer vb); + void render(P plug, double x, double y, double z, float partialTicks, BufferBuilder vb); } diff --git a/src/main/java/mekanism/client/entity/ParticleLaser.java b/src/main/java/mekanism/client/entity/ParticleLaser.java index 98472efc6..7d6fa1eb8 100644 --- a/src/main/java/mekanism/client/entity/ParticleLaser.java +++ b/src/main/java/mekanism/client/entity/ParticleLaser.java @@ -5,7 +5,7 @@ import mekanism.client.render.MekanismRenderer; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; @@ -36,7 +36,7 @@ public class ParticleLaser extends Particle } @Override - public void renderParticle(VertexBuffer 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_) + public void renderParticle(BufferBuilder 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 tessellator = Tessellator.getInstance(); diff --git a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java index 5250f8a4e..45658b88c 100644 --- a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java +++ b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java @@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -186,7 +186,7 @@ public class GasStackRenderer implements IIngredientRenderer vMax = vMax - (maskTop / 16.0 * (vMax - vMin)); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexBuffer = tessellator.getBuffer(); + BufferBuilder vertexBuffer = tessellator.getBuffer(); vertexBuffer.begin(7, DefaultVertexFormats.POSITION_TEX); vertexBuffer.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 70187de84..7779be7e4 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -27,7 +27,7 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -263,9 +263,9 @@ public class MekanismRenderer return isDrawing(tess.getBuffer()); } - public static boolean isDrawing(VertexBuffer buffer) + public static boolean isDrawing(BufferBuilder buffer) { - return (boolean)ReflectionUtils.getPrivateValue(buffer, VertexBuffer.class, ObfuscatedNames.VertexBuffer_isDrawing); + return (boolean)ReflectionUtils.getPrivateValue(buffer, BufferBuilder.class, ObfuscatedNames.VertexBuffer_isDrawing); } public static class Model3D diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index db994b332..c0198ce53 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -10,7 +10,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -152,7 +152,7 @@ public class RenderResizableCuboid { manager.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Tessellator tess = Tessellator.getInstance(); - VertexBuffer wr = tess.getBuffer(); + BufferBuilder wr = tess.getBuffer(); GlStateManager.enableAlpha(); GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); @@ -171,7 +171,7 @@ public class RenderResizableCuboid { GlStateManager.enableFog(); } - private void renderCuboidFace(VertexBuffer wr, EnumFacing face, TextureAtlasSprite[] sprites, int[] flips, Vec3d textureStart, Vec3d textureSize, + private void renderCuboidFace(BufferBuilder wr, EnumFacing face, TextureAtlasSprite[] sprites, int[] flips, Vec3d textureStart, Vec3d textureSize, Vec3d size, Vec3d textureOffset, EnumShadeArgument shadeTypes, IBlockLocation locationFormula, IFacingLocation faceFormula, IBlockAccess access) { int ordinal = face.ordinal(); @@ -213,7 +213,7 @@ public class RenderResizableCuboid { else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")"); } - private void renderPoint(VertexBuffer wr, EnumFacing face, Axis u, Axis v, double other, RenderInfo ri, boolean minU, boolean minV, + private void renderPoint(BufferBuilder wr, EnumFacing face, Axis u, Axis v, double other, RenderInfo ri, boolean minU, boolean minV, IBlockLocation locationFormula, IFacingLocation faceFormula, IBlockAccess access, EnumShadeArgument shadeTypes) { int U_ARRAY = minU ? U_MIN : U_MAX; int V_ARRAY = minV ? V_MIN : V_MAX; @@ -271,7 +271,7 @@ public class RenderResizableCuboid { return faces; } - private void applyLocalAO(VertexBuffer wr, EnumFacing face, IBlockLocation locationFormula, IBlockAccess access, EnumShadeArgument shadeTypes, + private void applyLocalAO(BufferBuilder wr, EnumFacing face, IBlockLocation locationFormula, IBlockAccess access, EnumShadeArgument shadeTypes, Vec3d vertex) { // This doesn't work. At all. boolean allAround = false; @@ -337,7 +337,7 @@ public class RenderResizableCuboid { setWorldRendererRGB(wr, color); } - public static void setWorldRendererRGB(VertexBuffer wr, Vec3d color) { + public static void setWorldRendererRGB(BufferBuilder wr, Vec3d color) { wr.color((float) color.xCoord, (float) color.yCoord, (float) color.zCoord, 1f); } @@ -662,4 +662,4 @@ public class RenderResizableCuboid { return new RenderInfo(uv, xyz); } } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 681920307..3f44ababc 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -4,7 +4,7 @@ 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.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -46,7 +46,7 @@ public class RenderFlame extends Render GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer worldrenderer = tessellator.getBuffer(); + BufferBuilder worldrenderer = tessellator.getBuffer(); int i = 0; float f2 = 0.0F; @@ -85,4 +85,4 @@ public class RenderFlame extends Render { return new ResourceLocation("mekanism:render/Flame.png"); } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 8ae7b9cad..c62dfe10f 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -45,7 +45,7 @@ public class RenderObsidianTNTPrimed extends Render float f3 = (1.0F - ((entityobsidiantnt.fuse - partialTicks) + 1.0F) / 100F) * 0.8F; bindEntityTexture(entityobsidiantnt); GlStateManager.translate(-0.5F, -0.5F, 0.5F); - renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), entityobsidiantnt.getBrightness(partialTicks)); + renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), entityobsidiantnt.getBrightness()); GlStateManager.translate(0.0F, 0.0F, 1.0F); if(entityobsidiantnt.fuse / 5 % 2 == 0) diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 0355aefea..ceea1e31e 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -54,7 +54,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index 1b9e93caa..376169cbf 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -2,7 +2,7 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleFlame; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; @@ -26,7 +26,7 @@ public class EntityJetpackFlameFX extends ParticleFlame } @Override - public void renderParticle(VertexBuffer 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_) + public void renderParticle(BufferBuilder 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) { diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index ef87cf763..9102351c5 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -2,7 +2,7 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleSmokeNormal; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; @@ -26,7 +26,7 @@ public class EntityJetpackSmokeFX extends ParticleSmokeNormal } @Override - public void renderParticle(VertexBuffer 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_) + public void renderParticle(BufferBuilder 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) { diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index 074b66055..2c29e8231 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -2,7 +2,7 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleBubble; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; @@ -31,7 +31,7 @@ public class EntityScubaBubbleFX extends ParticleBubble } @Override - public void renderParticle(VertexBuffer 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_) + public void renderParticle(BufferBuilder 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) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index cbc34289c..0abaecb4c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -21,7 +21,7 @@ public class RenderBin extends TileEntitySpecialRenderer private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); @Override - public void renderTileEntityAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void func_192841_a(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_) { Coord4D obj = Coord4D.get(tileEntity).offset(tileEntity.facing); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index bce5d10ed..074ee23e3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -15,7 +15,7 @@ public class RenderChargepad extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void func_192841_a(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_) { if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index be78e70d9..243c76a17 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -45,7 +45,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer 0 ? tileEntity.valveFluid : null, x, y, z); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index bf0035742..3ccf82c28 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -10,8 +10,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class RenderGasTank extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void func_192841_a(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_) { - MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); + MekanismRenderer.machineRenderer.func_192841_a(tileEntity, x, y, z, partialTick, destroyStage, p_192841_10_); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 00c7b6543..509d9f95a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -15,7 +15,7 @@ public class RenderLogisticalSorter extends TileEntitySpecialRenderer cachedOverlays = new HashMap(); @Override - public void renderTileEntityAt(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void func_192841_a(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_) { if(tileEntity.shouldRender) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index ef8cb2a97..2bb95a9be 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -26,7 +26,7 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere private static Map> cachedCenterFluids = new HashMap>(); @Override - public void renderTileEntityAt(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void func_192841_a(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage, float p_192841_10_) { if(tileEntity.structured && tileEntity.inputTank.getFluid() != null) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 99430995f..f900eaa63 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -36,7 +36,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer ext GL11.glPopMatrix(); } - public void renderTransparency(VertexBuffer renderer, TextureAtlasSprite icon, IBakedModel cc, ColourRGBA color) + public void renderTransparency(BufferBuilder renderer, TextureAtlasSprite icon, IBakedModel cc, ColourRGBA color) { if(!MekanismRenderer.isDrawing(renderer)) { diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index 500327c58..f7cf51893 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -5,7 +5,7 @@ import mekanism.common.ColourRGBA; import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntityUniversalCable; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -18,7 +18,7 @@ public class RenderUniversalCable extends RenderTransmitterBase list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(BasicBlockType type : BasicBlockType.values()) { @@ -316,7 +316,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock { if(type == BasicBlockType.BIN || tier.isObtainable()) { - ItemStack stack = new ItemStack(item, 1, type.meta); + ItemStack stack = new ItemStack(this, 1, type.meta); ((ItemBlockBasic)stack.getItem()).setBaseTier(stack, tier); list.add(stack); } @@ -324,7 +324,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock break; default: - list.add(new ItemStack(item, 1, type.meta)); + list.add(new ItemStack(this, 1, type.meta)); } } } @@ -1044,4 +1044,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock { return BasicBlockType.get(world.getBlockState(pos)).isBeaconBase; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index b2afc4857..4ba2287b9 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -165,7 +165,7 @@ public class BlockEnergyCube extends BlockContainer @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(EnergyCubeTier tier : EnergyCubeTier.values()) { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6529f9ed9..a7d67a177 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -405,7 +405,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(MachineType type : MachineType.getValidMachines()) { @@ -418,25 +418,25 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock case ELITE_FACTORY: for(RecipeType recipe : RecipeType.values()) { - ItemStack stack = new ItemStack(item, 1, type.meta); + ItemStack stack = new ItemStack(this, 1, type.meta); ((IFactory)stack.getItem()).setRecipeType(recipe.ordinal(), stack); list.add(stack); } break; case FLUID_TANK: - ItemBlockMachine itemMachine = (ItemBlockMachine)item; + ItemBlockMachine itemMachine = (ItemBlockMachine)Item.getItemFromBlock(this); for(FluidTankTier tier : FluidTankTier.values()) { - ItemStack stack = new ItemStack(item, 1, type.meta); + ItemStack stack = new ItemStack(this, 1, type.meta); itemMachine.setBaseTier(stack, tier.getBaseTier()); list.add(stack); } break; default: - list.add(new ItemStack(item, 1, type.meta)); + list.add(new ItemStack(this, 1, type.meta)); } } } diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index da3128698..103b3bec5 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -58,11 +58,11 @@ public class BlockOre extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(EnumOreType ore : EnumOreType.values()) { - list.add(new ItemStack(item, 1, ore.ordinal())); + list.add(new ItemStack(this, 1, ore.ordinal())); } } } diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 4b10f95f4..beb358b39 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -78,11 +78,11 @@ public class BlockPlastic extends Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(int i = 0; i < EnumColor.DYES.length; i++) { - list.add(new ItemStack(item, 1, i)); + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 2d8719ab0..3a72fff15 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -47,11 +47,11 @@ public class BlockPlasticFence extends BlockFence @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(int i = 0; i < EnumColor.DYES.length; i++) { - list.add(new ItemStack(item, 1, i)); + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 7b094a3fd..e2138feed 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -263,7 +263,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(TransmitterType type : TransmitterType.values()) { diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index cab8fae5c..d1119cc65 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.util.Constants.NBT; public class FrequencyManager diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index ba99d008f..35cb70b19 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -16,6 +16,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -52,9 +53,9 @@ public class ItemAtomicDisassembler extends ItemEnergized } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add(LangUtils.localize("tooltip.mode") + ": " + EnumColor.INDIGO + getModeName(itemstack)); list.add(LangUtils.localize("tooltip.efficiency") + ": " + EnumColor.INDIGO + getEfficiency(itemstack)); diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 4ca5187e9..279c6e0bb 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -63,8 +63,9 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; for(int i = 0; i < EnumColor.DYES.length; i++) { EnumColor color = EnumColor.DYES[i]; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 77724c475..6e246f5b3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -30,6 +30,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -140,7 +141,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { BasicBlockType type = BasicBlockType.get(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 0c175ea0a..29a462c2b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -11,6 +11,7 @@ import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -46,7 +47,7 @@ public class ItemBlockCardboardBox extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.blockData") + ": " + LangUtils.transYesNo(getBlockData(itemstack) != null)); BlockData data = getBlockData(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 2fe310258..6d8d19c73 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -37,7 +37,9 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -74,7 +76,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(EnergyCubeTier.values()[getBaseTier(itemstack).ordinal()].maxEnergy)); @@ -86,7 +88,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS else { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); + list.add(SecurityUtils.getOwnerDisplay(Minecraft.getMinecraft().player, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 0464af627..6e0e85c1f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -31,7 +31,9 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -128,7 +130,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -151,7 +153,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI else { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); + list.add(SecurityUtils.getOwnerDisplay(Minecraft.getMinecraft().player, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -195,8 +197,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; for(GasTankTier tier : GasTankTier.values()) { ItemStack empty = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index d12529028..b7209e31d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -71,11 +71,12 @@ public class ItemBlockGlowPanel extends ItemBlock } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList listToAddTo) + public void getSubItems(CreativeTabs tab, NonNullList listToAddTo) { + if(!func_194125_a(tab)) return; for(EnumColor color : EnumColor.DYES) { - listToAddTo.add(new ItemStack(item, 1, color.getMetaValue())); + listToAddTo.add(new ItemStack(this, 1, color.getMetaValue())); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 7af54e59c..1005a1674 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -53,7 +53,9 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -187,7 +189,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { MachineType type = MachineType.get(itemstack); @@ -218,7 +220,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); + list.add(SecurityUtils.getOwnerDisplay(Minecraft.getMinecraft().player, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 5e53c59d0..577ffe9cf 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -9,9 +9,11 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,7 +38,7 @@ public class ItemBlockOre extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index 2dfa092cf..7670231bb 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -22,6 +22,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -71,7 +72,7 @@ public class ItemBlockTransmitter extends ItemBlock implements ITierItem @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index ef8fb12a3..a5598e210 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -28,8 +28,9 @@ public class ItemClump extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) { itemList.add(new ItemStack(this, 1, counter)); diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 802ad3489..c74375b59 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -13,6 +13,7 @@ import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -34,9 +35,9 @@ public class ItemConfigurationCard extends ItemMekanism } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index d93b7e0b9..8a83d4d52 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -25,6 +25,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -63,9 +64,9 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add(EnumColor.PINK + LangUtils.localize("gui.state") + ": " + getColor(getState(itemstack)) + getStateDisplay(getState(itemstack))); } diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index c012dd3a2..c29af6666 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -28,13 +28,14 @@ public class ItemControlCircuit extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(BaseTier tier : BaseTier.values()) { if(tier.isObtainable()) { - itemList.add(new ItemStack(item, 1, tier.ordinal())); + itemList.add(new ItemStack(this, 1, tier.ordinal())); } } } diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index 712b5bb12..e5362ebcd 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -8,6 +8,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -34,7 +35,7 @@ public class ItemCraftingFormula extends ItemMekanism @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { NonNullList inv = getInventory(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index 368d14d5d..02f32c078 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -28,11 +28,12 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 92e45eade..73d8ac7b7 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -30,11 +30,12 @@ public class ItemDirtyDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index e75d24567..4e39348e9 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -28,8 +28,9 @@ public class ItemDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) { itemList.add(new ItemStack(this, 1, counter)); diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 1cd019a0f..fbfdd6ae2 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -32,9 +33,9 @@ public class ItemElectricBow extends ItemEnergized } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add(EnumColor.PINK + LangUtils.localize("tooltip.fireMode") + ": " + EnumColor.GREY + LangUtils.transOnOff(getFireState(itemstack))); } diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index be5b11559..40deb486a 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -16,6 +16,7 @@ import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; @@ -64,7 +66,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } @@ -75,8 +77,9 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack discharged = new ItemStack(this); list.add(discharged); ItemStack charged = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index a3b39236e..4bb5cdb8b 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -10,6 +10,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; public class ItemFlamethrower extends ItemMekanism implements IGasItem { @@ -29,7 +31,7 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -153,8 +155,9 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack empty = new ItemStack(this); setGas(empty, null); list.add(empty); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 49574a28c..0af687bc6 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -19,6 +19,7 @@ import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,6 +33,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -80,7 +82,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } @@ -91,8 +93,9 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack discharged = new ItemStack(this); list.add(discharged); ItemStack charged = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 0b1d5a79e..df35361bf 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -8,6 +8,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -48,8 +49,9 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; list.add(getEmptyItem()); } @@ -88,7 +90,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); FluidStack fluidStack = FluidUtil.getFluidContained(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 4e9a0c5aa..9c063aabf 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -29,11 +29,12 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < PlasticItem.values().length; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 3dcd05bd6..58589c960 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -31,11 +31,12 @@ public class ItemIngot extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter <= 6; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 05d9efd39..17949c192 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -15,6 +15,7 @@ import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -28,6 +29,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; @@ -62,7 +64,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -210,8 +212,9 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack empty = new ItemStack(this); setGas(empty, null); list.add(empty); diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 925ef1aed..ae21ce196 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -35,8 +35,9 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < subtypes.length; counter++) { if(counter != 2) diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index bbe06930b..c575b7fe7 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -13,6 +13,8 @@ import mekanism.common.security.IOwnerItem; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,9 +32,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); + list.add(SecurityUtils.getOwnerDisplay(Minecraft.getMinecraft().player, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); if(getFrequency(itemstack) != null) { @@ -40,7 +42,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem list.add(EnumColor.INDIGO + LangUtils.localize("gui.mode") + ": " + EnumColor.GREY + LangUtils.localize("gui." + (isPrivateMode(itemstack) ? "private" : "public"))); } - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); } @Override diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 899bf3e48..98234e9d3 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -9,6 +9,7 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; @@ -30,9 +31,9 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.name") + ": " + EnumColor.GREY + getName(itemstack)); list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 84b01c6e2..a7dead443 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -14,6 +14,7 @@ import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -26,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -41,7 +43,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -221,8 +223,9 @@ public class ItemScubaTank extends ItemArmor implements IGasItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack empty = new ItemStack(this); setGas(empty, null); list.add(empty); diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index c9ee86afd..f9c63350e 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -3,7 +3,6 @@ package mekanism.common.item; import mekanism.common.Resource; import mekanism.common.base.IMetaItem; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -28,11 +27,12 @@ public class ItemShard extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(int counter = 0; counter < Resource.values().length; counter++) { - itemList.add(new ItemStack(item, 1, counter)); + itemList.add(new ItemStack(this, 1, counter)); } } diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java index c7ffec555..275603930 100644 --- a/src/main/java/mekanism/common/item/ItemTierInstaller.java +++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java @@ -73,13 +73,14 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList itemList) + public void getSubItems(CreativeTabs tabs, NonNullList itemList) { + if(!func_194125_a(tabs)) return; for(BaseTier tier : BaseTier.values()) { if(tier.isObtainable()) { - itemList.add(new ItemStack(item, 1, tier.ordinal())); + itemList.add(new ItemStack(this, 1, tier.ordinal())); } } } diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 8519cadfd..cdf9a1d2a 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -9,6 +9,7 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -35,7 +36,7 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index a839d322b..890db1626 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -8,6 +8,7 @@ import mekanism.api.EnumColor; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -28,9 +29,9 @@ public class ItemWalkieTalkie extends ItemMekanism } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { - super.addInformation(itemstack, entityplayer, list, flag); + super.addInformation(itemstack, world, list, flag); list.add((getOn(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.localize("gui." + (getOn(itemstack) ? "on" : "off"))); list.add(EnumColor.DARK_AQUA + LangUtils.localize("tooltip.channel") + ": " + EnumColor.GREY + getChannel(itemstack)); diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index a93769bae..820101983 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -8,10 +8,10 @@ import net.minecraft.block.state.pattern.BlockMatcher; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; +import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderEnd; -import net.minecraft.world.gen.ChunkProviderHell; +import net.minecraft.world.gen.ChunkGeneratorEnd; +import net.minecraft.world.gen.ChunkGeneratorHell; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraftforge.fml.common.IWorldGenerator; @@ -20,7 +20,7 @@ public class GenHandler implements IWorldGenerator @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { - if(!(chunkGenerator instanceof ChunkProviderHell) && !(chunkGenerator instanceof ChunkProviderEnd)) + if(!(chunkGenerator instanceof ChunkGeneratorHell) && !(chunkGenerator instanceof ChunkGeneratorEnd)) { for(int i = 0; i < general.osmiumPerChunk; i++) { diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 128ba444c..fe0a0e9b5 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -15,7 +15,7 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer 0) { diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index 53f2728b9..689047b61 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -15,7 +15,7 @@ public class RenderGasGenerator extends TileEntitySpecialRenderer list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(GeneratorType type : GeneratorType.values()) { if(type.isEnabled()) { - list.add(new ItemStack(i, 1, type.meta)); + list.add(new ItemStack(this, 1, type.meta)); } } } diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 00d86b305..e1aac1e3b 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -217,13 +217,13 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList list) + public void getSubBlocks(CreativeTabs creativetabs, NonNullList list) { for(BlockStateReactor.ReactorBlockType type : BlockStateReactor.ReactorBlockType.values()) { if(type.blockType == getReactorBlock()) { - list.add(new ItemStack(item, 1, type.meta)); + list.add(new ItemStack(this, 1, type.meta)); } } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 096990f2b..f77fbd59d 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -31,7 +31,9 @@ import mekanism.common.util.SecurityUtils; import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -116,7 +118,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GeneratorType type = GeneratorType.get(itemstack); @@ -131,7 +133,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); + list.add(SecurityUtils.getOwnerDisplay(Minecraft.getMinecraft().player, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index 5617af751..62e637670 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -7,9 +7,11 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.states.BlockStateReactor.ReactorBlockType; import net.minecraft.block.Block; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +42,7 @@ public class ItemBlockReactor extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { ReactorBlockType type = ReactorBlockType.get(itemstack); diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index 1760173bb..6b86422ef 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -10,13 +10,13 @@ import mekanism.common.MekanismFluids; import mekanism.common.item.ItemMekanism; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; public class ItemHohlraum extends ItemMekanism implements IGasItem { @@ -30,7 +30,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { GasStack gasStack = getGas(itemstack); @@ -154,8 +154,9 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem } @Override - public void getSubItems(Item item, CreativeTabs tabs, NonNullList list) + public void getSubItems(CreativeTabs tabs, NonNullList list) { + if(!func_194125_a(tabs)) return; ItemStack empty = new ItemStack(this); setGas(empty, null); list.add(empty); diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 549429d91..d8c15423f 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -10,6 +10,7 @@ import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import mekanism.tools.common.ToolsItems; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +18,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -29,7 +31,7 @@ public class ItemMekanismArmor extends ItemArmor } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java index 2771b026b..a5d58570c 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java @@ -6,9 +6,11 @@ import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ItemMekanismAxe extends ItemAxe { @@ -19,7 +21,7 @@ public class ItemMekanismAxe extends ItemAxe } @Override - public void addInformation(ItemStack itemstack, EntityPlayer playerIn, List list, boolean advanced) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 18ff9ce9b..f89724e66 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -8,6 +8,7 @@ import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -127,7 +128,7 @@ public class ItemMekanismHoe extends ItemMekanism } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index 70bf0cb28..ce0e35d6c 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -5,9 +5,11 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; import mekanism.common.util.StackUtils; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.world.World; public class ItemMekanismSword extends ItemSword { @@ -21,7 +23,7 @@ public class ItemMekanismSword extends ItemSword } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index d5fff20da..3d0bd0032 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -9,10 +9,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.block.Block; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; +import net.minecraft.world.World; public class ItemMekanismTool extends ItemTool { @@ -23,7 +25,7 @@ public class ItemMekanismTool extends ItemTool } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, World world, List list, ITooltipFlag flag) { list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); }