diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 0ce4e9221d2..896d75da2a1 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -16,12 +16,12 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderHelper; -import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -97,7 +97,7 @@ public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) } int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); MekanismRenderHelper renderHelper = new MekanismRenderHelper().color(gas); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, gas.getGas().getSprite(), sizeX, sizeY); renderHelper.cleanup(); diff --git a/src/main/java/mekanism/client/gui/GuiEmbeddedGaugeTile.java b/src/main/java/mekanism/client/gui/GuiEmbeddedGaugeTile.java index 7cdd353223e..4479817e28c 100644 --- a/src/main/java/mekanism/client/gui/GuiEmbeddedGaugeTile.java +++ b/src/main/java/mekanism/client/gui/GuiEmbeddedGaugeTile.java @@ -5,6 +5,7 @@ import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -30,7 +31,7 @@ protected void displayGauge(int xPos, int yPos, int scale, FluidStack fluid, int int start = 0; MekanismRenderHelper renderHelper = new MekanismRenderHelper().color(fluid); TextureAtlasSprite fluidTexture = MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); while (true) { int renderRemaining; if (scale > 16) { diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 29b09152f81..67e5c9a191f 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -14,7 +14,6 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderHelper; -import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.IFactory.MachineFuelType; @@ -27,6 +26,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -115,7 +115,7 @@ public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, TextureAtlasS if (icon != null) { int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, icon, sizeX, sizeY); } } diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 2cfd48b3cd1..7429e01b45d 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -10,6 +10,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public void displayGauge(int xPos, int yPos, int scale, int side /*0-left, 1-rig renderRemaining = scale; scale = 0; } - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.energyIcon, 16, renderRemaining); start += 16; if (renderRemaining == 0 || scale == 0) { diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 0a0e7317ba4..4148882e965 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -33,6 +33,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -439,7 +440,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { if (tileEntity.color != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 36db9034a24..004a4a70b23 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -16,7 +16,6 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -25,6 +24,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; @@ -80,7 +80,7 @@ protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, in int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); if (tileEntity.infuseStored.getType() != null) { - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); int displayInt = tileEntity.getScaledInfuseLevel(52); drawTexturedRectFromIcon(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.infuseStored.getType().sprite, 4, displayInt); } diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 5a7c87b3e2b..8b1af561642 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -21,6 +21,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.tileentity.TileEntity; @@ -95,7 +96,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRenderer.drawString(LangUtils.localize("gui.output"), 114, 68, 0x787878); if (configurable.getEjector().getOutputColor() != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index dc61b5efc12..d121a09e033 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -5,13 +5,13 @@ import mekanism.client.gui.GuiMekanismTile; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderHelper; -import mekanism.client.render.MekanismRenderer; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -87,7 +87,7 @@ public void renderScale(int xAxis, int yAxis, int guiWidth, int guiHeight) { scale = 0; } - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); MekanismRenderHelper renderHelper = applyRenderColor(new MekanismRenderHelper()); for (int i = 0; i < number; i++) { diff --git a/src/main/java/mekanism/client/gui/filter/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/filter/GuiTItemStackFilter.java index 00769f1307d..5f28ff484f4 100644 --- a/src/main/java/mekanism/client/gui/filter/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/filter/GuiTItemStackFilter.java @@ -20,7 +20,7 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -136,7 +136,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { } if (filter.color != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/gui/filter/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/filter/GuiTMaterialFilter.java index 9ad163bff0d..dcced47874e 100644 --- a/src/main/java/mekanism/client/gui/filter/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/filter/GuiTMaterialFilter.java @@ -17,6 +17,7 @@ import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; @@ -69,7 +70,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { } if (filter.color != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/gui/filter/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/filter/GuiTModIDFilter.java index e210d764a5e..cee70ccd9fc 100644 --- a/src/main/java/mekanism/client/gui/filter/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/filter/GuiTModIDFilter.java @@ -17,6 +17,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; @@ -57,7 +58,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { } if (filter.color != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/gui/filter/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/filter/GuiTOreDictFilter.java index 5f66fffafce..f94a75ba946 100644 --- a/src/main/java/mekanism/client/gui/filter/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/filter/GuiTOreDictFilter.java @@ -17,6 +17,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; @@ -68,7 +69,7 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { } if (filter.color != null) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true).enableLighting().enableRescaleNormal(); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexturedRectFromIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java index 29badb810e8..417cfb76275 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -4,12 +4,12 @@ import java.util.Collections; import java.util.List; import mekanism.client.jei.machine.MekanismRecipeWrapper; -import mekanism.client.render.MekanismRenderer; import mekanism.common.InfuseStorage; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.ingredients.VanillaTypes; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; public class MetallurgicInfuserRecipeWrapper extends MekanismRecipeWrapper { @@ -30,7 +30,7 @@ public void getIngredients(IIngredients ingredients) { @Override public void drawInfo(Minecraft mc, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { if (mc.currentScreen != null) { - mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); mc.currentScreen.drawTexturedModalRect(2, 2, recipe.getInput().infuse.getType().sprite, 4, 52); } } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index b499e933f7f..36aed9dacf0 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -230,11 +230,6 @@ public static float getPartialTick() { return Minecraft.getMinecraft().getRenderPartialTicks(); } - //TODO: Inline - public static ResourceLocation getBlocksTexture() { - return TextureMap.LOCATION_BLOCKS_TEXTURE; - } - @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) { for (EnumColor color : EnumColor.values()) { diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 5c09fcaf488..7dd86e1b4fa 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -10,6 +10,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; @@ -22,7 +23,7 @@ public final class MinerVisualRenderer { public static void render(TileEntityDigitalMiner miner) { MekanismRenderHelper renderHelper = new MekanismRenderHelper(true) .translate(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ())).enableBlendPreset().enableGlow().enableCull().colorAlpha(0.8F); - mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); getList(new MinerRenderData(miner)).render(); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java b/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java index b18a35e1826..16b092bee89 100644 --- a/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java +++ b/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java @@ -14,6 +14,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -38,7 +39,7 @@ public static void renderStack(@Nonnull ItemStack stack, TransformType transform MekanismRenderHelper tankRenderHelper = new MekanismRenderHelper(true); if (fluid != null && fluidScale > 0) { MekanismRenderHelper fluidRenderHelper = new MekanismRenderHelper(true).enableCull().disableLighting().enableBlendPreset(); - MekanismRenderer.bindTexture(MekanismRenderer.getBlocksTexture()); + MekanismRenderer.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); fluidRenderHelper.translateAll(-0.5).enableGlow(fluid).color(fluid); DisplayInteger[] displayList = getListAndRender(fluid); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 0b106357718..2cbcfd41e0a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -14,6 +14,7 @@ import mekanism.common.tile.component.TileComponentConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -52,7 +53,7 @@ public void render(S configurable, double x, double y, double z, float partialTi SideData data = configurable.getConfig().getOutput(type, pos.sideHit, configurable.getOrientation()); if (data != TileComponentConfig.EMPTY) { MekanismRenderHelper renderHelper = initHelper().color(data.color, 0.6F); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z); int display = getOverlayDisplay(pos.sideHit, type).display; GlStateManager.callList(display); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 18ec40a2ffb..9c548878fa8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -7,6 +7,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityDynamicTank; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,7 +27,7 @@ public void render(TileEntityDynamicTank tileEntity, double x, double y, double data.width = tileEntity.structure.volWidth; data.fluidType = tileEntity.structure.fluidStored; - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if (data.location != null && data.height >= 1) { MekanismRenderHelper renderHelper = FluidRenderer.initHelper(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 485194626ed..8c7968011b7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -9,6 +9,7 @@ import mekanism.common.tier.FluidTankTier; import mekanism.common.tile.TileEntityFluidTank; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidStack; @@ -39,7 +40,7 @@ public void render(TileEntityFluidTank tileEntity, double x, double y, double z, public void render(FluidTankTier tier, FluidStack fluid, float fluidScale, boolean active, FluidStack valveFluid, double x, double y, double z) { if (fluid != null && fluidScale > 0) { MekanismRenderHelper renderHelper = initHelper(); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z).enableGlow(fluid).color(fluid); DisplayInteger[] displayList = getListAndRender(fluid); @@ -58,7 +59,7 @@ public void render(FluidTankTier tier, FluidStack fluid, float fluidScale, boole if (valveFluid != null && !valveFluid.getFluid().isGaseous(valveFluid)) { MekanismRenderHelper renderHelper = initHelper(); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z).enableGlow(valveFluid).color(valveFluid); DisplayInteger[] valveList = getValveRender(valveFluid); valveList[Math.min(stages - 1, (int) (fluidScale * ((float) stages - 1)))].render(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 76dfaa8457d..a9e56e1694b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -13,6 +13,7 @@ import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -26,7 +27,7 @@ public void render(TileEntityTeleporter tileEntity, double x, double y, double z if (tileEntity.shouldRender) { MekanismRenderHelper renderHelper = initHelper().color(EnumColor.PURPLE, 0.75F); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z); Coord4D obj = Coord4D.get(tileEntity).offset(EnumFacing.WEST); int type = 0; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index 2f4af8f859f..b67f14c5d56 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager.DestFactor; import net.minecraft.client.renderer.GlStateManager.SourceFactor; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; @@ -35,7 +36,7 @@ public static void resetDisplayInts() { @Override public void render(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage, float alpha) { if (tileEntity.structured && tileEntity.inputTank.getFluid() != null) { - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if (tileEntity.height - 2 >= 1 && tileEntity.inputTank.getCapacity() > 0) { MekanismRenderHelper renderHelper = initHelper(); FluidRenderer.translateToOrigin(tileEntity.getRenderLocation()); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 79fcf657496..3c59b9969b9 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -11,6 +11,7 @@ import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityBoilerCasing; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -40,7 +41,7 @@ public void render(TileEntityBoilerCasing tileEntity, double x, double y, double data.width = tileEntity.structure.volWidth; data.fluidType = WATER; - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if (data.height >= 1 && tileEntity.structure.waterStored.getFluid() != null) { MekanismRenderHelper renderHelper = FluidRenderer.initHelper(); @@ -77,7 +78,7 @@ public void render(TileEntityBoilerCasing tileEntity, double x, double y, double data.width = tileEntity.structure.volWidth; data.fluidType = STEAM; - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if (data.height >= 1 && tileEntity.structure.steamStored.getFluid() != null) { MekanismRenderHelper renderHelper = FluidRenderer.initHelper(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index f5116b90d06..5430919aa2d 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -104,7 +104,7 @@ public void render(TileEntityLogisticalTransporter transporter, double x, double int mode = ((TileEntityDiversionTransporter) transporter).modes[pos.sideHit.ordinal()]; MekanismRenderHelper renderHelper = pushTransporter(); renderHelper.colorAlpha(0.8F); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z).scale(0.5).translateAll(0.5); int display = getOverlayDisplay(pos.sideHit, mode).display; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 82e7e9ddfbc..3e94d25689d 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; @@ -68,7 +69,7 @@ public void render(TileEntityMechanicalPipe pipe, double x, double y, double z, renderHelper.enableGlow(fluid).color(fluid); } - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderHelper.translate(x, y, z); boolean gas = fluid.isGaseous(); @@ -216,7 +217,7 @@ private DisplayInteger[] getListAndRender(EnumFacing side, FluidStack fluid) { public boolean renderFluidInOut(BufferBuilder renderer, EnumFacing side, TileEntityMechanicalPipe pipe) { if (pipe != null && pipe.getTransmitter() != null && pipe.getTransmitter().getTransmitterNetwork() != null) { - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); FluidNetwork fn = pipe.getTransmitter().getTransmitterNetwork(); TextureAtlasSprite tex; if (fn.buffer != null) { diff --git a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java index 03ac4d93ef9..bbf1dcbfac6 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java @@ -1,11 +1,11 @@ package mekanism.client.render.transmitter; import mekanism.api.gas.Gas; -import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; import mekanism.common.config.MekanismConfig; import mekanism.common.tile.transmitter.TileEntityPressurizedTube; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumFacing; public class RenderPressurizedTube extends RenderTransmitterSimple { @@ -21,7 +21,7 @@ public void render(TileEntityPressurizedTube tube, double x, double y, double z, @Override protected void renderSide(BufferBuilder renderer, EnumFacing side, TileEntityPressurizedTube tube) { - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Gas gas = tube.getTransmitter().getTransmitterNetwork().refGas; ColourRGBA c = new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale); c.setRGBFromInt(gas.getTint()); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java index 6943c7f81e2..90cd8976a2f 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -5,6 +5,7 @@ import mekanism.common.config.MekanismConfig; import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumFacing; public class RenderThermodynamicConductor extends RenderTransmitterSimple { @@ -19,7 +20,7 @@ public void render(TileEntityThermodynamicConductor transmitter, double x, doubl @Override public void renderSide(BufferBuilder renderer, EnumFacing side, TileEntityThermodynamicConductor cable) { - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderTransparency(renderer, MekanismRenderer.heatIcon, getModelForSide(cable, side), ColourTemperature.fromTemperature(cable.temperature, cable.getBaseColour())); } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index d5c62cfe569..b7d4d8af176 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -5,6 +5,7 @@ import mekanism.common.config.MekanismConfig; import mekanism.common.tile.transmitter.TileEntityUniversalCable; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumFacing; public class RenderUniversalCable extends RenderTransmitterSimple { @@ -19,7 +20,7 @@ public void render(TileEntityUniversalCable cable, double x, double y, double z, @Override protected void renderSide(BufferBuilder renderer, EnumFacing side, TileEntityUniversalCable cable) { - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); renderTransparency(renderer, MekanismRenderer.energyIcon, getModelForSide(cable, side), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower)); } } \ No newline at end of file diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 3e9ff66cc3a..4fad1ca86c7 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager.DestFactor; import net.minecraft.client.renderer.GlStateManager.SourceFactor; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -31,7 +32,7 @@ public void render(TileEntityBioGenerator tileEntity, double x, double y, double if (tileEntity.bioFuelSlot.fluidStored > 0) { MekanismRenderHelper renderHelper = initHelper().enableGlow(); renderHelper.translate(x, y, z); - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); getDisplayList(tileEntity.facing)[tileEntity.getScaledFuelLevel(stages - 1)].render(); renderHelper.cleanup(); } diff --git a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java index 40b8218be2d..e591463d15c 100644 --- a/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderIndustrialTurbine.java @@ -8,6 +8,7 @@ import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -52,7 +53,7 @@ public void renderAModelAt(TileEntityTurbineCasing tileEntity, double x, double data.width = tileEntity.structure.volWidth; data.fluidType = STEAM; - bindTexture(MekanismRenderer.getBlocksTexture()); + bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if (data.location != null && data.height >= 1 && tileEntity.structure.fluidStored.getFluid() != null) { MekanismRenderHelper renderHelper = FluidRenderer.initHelper();