Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for updated MCP names

Browse source
This commit is contained in:
Christian 2013-09-03 15:52:19 -04:00
parent 158c79c301
commit 730a0ac4a7
36 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/builders/gui/GuiBlueprintLibrary.java
View file

@ -106,7 +106,7 @@ public class GuiBlueprintLibrary extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;

4
common/buildcraft/builders/gui/GuiBuilder.java
View file

@ -64,10 +64,10 @@ public class GuiBuilder extends GuiAdvancedInterface {
int realXSize = 0;
if (builder.isBuildingBlueprint()) {
mc.renderEngine.func_110577_a(BLUEPRINT_TEXTURE);
mc.renderEngine.bindTexture(BLUEPRINT_TEXTURE);
realXSize = 256;
} else {
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
realXSize = 176;
}

6
common/buildcraft/builders/gui/GuiFiller.java
View file

@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11;
public class GuiFiller extends GuiBuildCraft {
private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filler.png");
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture;
IInventory playerInventory;
TileFiller filler;
@ -47,12 +47,12 @@ public class GuiFiller extends GuiBuildCraft {
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
if (filler.currentPattern != null) {
mc.renderEngine.func_110577_a(BLOCK_TEXTURE);
mc.renderEngine.bindTexture(BLOCK_TEXTURE);
drawTexturedModelRectFromIcon(guiLeft + patternSymbolX, guiTop + patternSymbolY, filler.currentPattern.getTexture(), 16, 16);
}

2
common/buildcraft/builders/gui/GuiTemplate.java
View file

@ -52,7 +52,7 @@ public class GuiTemplate extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

10
common/buildcraft/core/CommandBuildCraft.java
View file

@ -46,9 +46,9 @@ public class CommandBuildCraft extends CommandBase {
commandVersion(sender, arguments);
return;
} else if (arguments[0].matches("help")) {
sender.sendChatToPlayer(ChatMessageComponent.func_111066_d("Format: '" + this.getCommandName() + " <command> <arguments>'"));
sender.sendChatToPlayer(ChatMessageComponent.func_111066_d("Available commands:"));
sender.sendChatToPlayer(ChatMessageComponent.func_111066_d("- version : Version information."));
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Format: '" + this.getCommandName() + " <command> <arguments>'"));
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Available commands:"));
sender.sendChatToPlayer(ChatMessageComponent.createFromText("- version : Version information."));
return;
}
@ -58,11 +58,11 @@ public class CommandBuildCraft extends CommandBase {
private void commandVersion(ICommandSender sender, String[] arguments) {
String colour = Version.isOutdated() ? "\u00A7c" : "\u00A7a";
sender.sendChatToPlayer(ChatMessageComponent.func_111066_d(String.format(colour + "BuildCraft %s for Minecraft %s (Latest: %s).", Version.getVersion(),
sender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format(colour + "BuildCraft %s for Minecraft %s (Latest: %s).", Version.getVersion(),
CoreProxy.proxy.getMinecraftVersion(), Version.getRecommendedVersion())));
if (Version.isOutdated()) {
for (String updateLine : Version.getChangelog()) {
sender.sendChatToPlayer(ChatMessageComponent.func_111066_d("\u00A79" + updateLine));
sender.sendChatToPlayer(ChatMessageComponent.createFromText("\u00A79" + updateLine));
}
}
}

4
common/buildcraft/core/gui/GuiAdvancedInterface.java
View file

@ -36,7 +36,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft {
}
public ResourceLocation getTexture() {
return TextureMap.field_110576_c;
return TextureMap.locationItemsTexture;
}
public ItemStack getItemStack() {
@ -54,7 +54,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft {
if (getItemStack() != null) {
drawStack(getItemStack());
} else if (getIcon() != null) {
mc.renderEngine.func_110577_a(getTexture());
mc.renderEngine.bindTexture(getTexture());
//System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y);
drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16);
}

2
common/buildcraft/core/gui/GuiBuildCraft.java
View file

@ -209,7 +209,7 @@ public abstract class GuiBuildCraft extends GuiContainer {
GL11.glColor4f(colorR, colorG, colorB, 1.0F);
mc.renderEngine.func_110577_a(LEDGER_TEXTURE);
mc.renderEngine.bindTexture(LEDGER_TEXTURE);
drawTexturedModalRect(x, y, 0, 256 - currentHeight, 4, currentHeight);
drawTexturedModalRect(x + 4, y, 256 - currentWidth + 4, 0, currentWidth - 4, 4);
// Add in top left corner again

2
common/buildcraft/core/gui/buttons/GuiBetterButton.java
View file

@ -57,7 +57,7 @@ public class GuiBetterButton extends GuiButton {
}
protected void bindButtonTextures(Minecraft minecraft) {
minecraft.renderEngine.func_110577_a(BUTTON_TEXTURES);
minecraft.renderEngine.bindTexture(BUTTON_TEXTURES);
}
@Override

2
common/buildcraft/core/proxy/CoreProxyClient.java
View file

@ -79,7 +79,7 @@ public class CoreProxyClient extends CoreProxy {
/* LOCALIZATION */
@Override
public String getCurrentLanguage() {
return Minecraft.getMinecraft().func_135016_M().func_135041_c().func_135034_a();
return Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
}
@Override

4
common/buildcraft/core/render/FluidRenderer.java
View file

@ -27,7 +27,7 @@ import org.lwjgl.opengl.GL11;
*/
public class FluidRenderer {
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture;
private static Map<Fluid, int[]> flowingRenderCache = new HashMap<Fluid, int[]>();
private static Map<Fluid, int[]> stillRenderCache = new HashMap<Fluid, int[]>();
public static final int DISPLAY_STAGES = 100;
@ -46,7 +46,7 @@ public class FluidRenderer {
}
Icon icon = flowing ? fluid.getFlowingIcon() : fluid.getStillIcon();
if (icon == null) {
icon = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(TextureMap.field_110575_b)).func_110572_b("missingno");
icon = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
}
return icon;
}

4
common/buildcraft/core/render/RenderEntityBlock.java
View file

@ -24,7 +24,7 @@ public class RenderEntityBlock extends Render {
public static RenderEntityBlock INSTANCE = new RenderEntityBlock();
@Override
protected ResourceLocation func_110775_a(Entity entity) {
protected ResourceLocation getEntityTexture(Entity entity) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -67,7 +67,7 @@ public class RenderEntityBlock extends Render {
World world = entity.worldObj;
BlockInterface util = new BlockInterface();
util.texture = entity.texture;
func_110776_a(TextureMap.field_110575_b);
bindTexture(TextureMap.locationBlocksTexture);
for (int iBase = 0; iBase < entity.iSize; ++iBase) {
for (int jBase = 0; jBase < entity.jSize; ++jBase) {

4
common/buildcraft/core/render/RenderLaser.java
View file

@ -46,7 +46,7 @@ public class RenderLaser extends Render {
GL11.glRotatef((float) laser.angleZ, 0, 1, 0);
GL11.glRotatef((float) laser.angleY, 0, 0, 1);
renderManager.renderEngine.func_110577_a(laser.getTexture());
renderManager.renderEngine.bindTexture(laser.getTexture());
float factor = (float) (1.0 / 16.0);
@ -78,7 +78,7 @@ public class RenderLaser extends Render {
}
@Override
protected ResourceLocation func_110775_a(Entity entity) {
protected ResourceLocation getEntityTexture(Entity entity) {
return ((EntityLaser) entity).getTexture();
}
}

4
common/buildcraft/core/render/RenderRobot.java
View file

@ -35,7 +35,7 @@ public class RenderRobot extends Render {
GL11.glDisable(2896 /* GL_LIGHTING */);
GL11.glTranslated(x, y, z);
renderManager.renderEngine.func_110577_a(TEXTURE);
renderManager.renderEngine.bindTexture(TEXTURE);
float factor = (float) (1.0 / 16.0);
@ -47,7 +47,7 @@ public class RenderRobot extends Render {
}
@Override
protected ResourceLocation func_110775_a(Entity entity) {
protected ResourceLocation getEntityTexture(Entity entity) {
return TEXTURE;
}
}

2
common/buildcraft/core/render/RenderVoid.java
View file

@ -22,7 +22,7 @@ public class RenderVoid extends Render {
}
@Override
protected ResourceLocation func_110775_a(Entity entity) {
protected ResourceLocation getEntityTexture(Entity entity) {
throw new UnsupportedOperationException("Not supported yet.");
}

4
common/buildcraft/core/render/RenderingEntityBlocks.java
View file

@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11;
public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler {
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture;
public static class EntityRenderIndex {
@ -96,7 +96,7 @@ public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler {
if (block.getRenderType() == BuildCraftCore.blockByEntityModel) {
// renderblocks.renderStandardBlock(block, i, j, k);
} else if (block.getRenderType() == BuildCraftCore.legacyPipeModel) {
Minecraft.getMinecraft().renderEngine.func_110577_a(BLOCK_TEXTURE);
Minecraft.getMinecraft().renderEngine.bindTexture(BLOCK_TEXTURE);
legacyPipeRender(renderer, world, x, y, z, block, modelId);
}

8
common/buildcraft/energy/gui/GuiCombustionEngine.java
View file

@ -24,7 +24,7 @@ import buildcraft.energy.TileEngineWithInventory;
public class GuiCombustionEngine extends GuiEngine {
private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png");
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
private static final ResourceLocation BLOCK_TEXTURE = TextureMap.locationBlocksTexture;
public GuiCombustionEngine(InventoryPlayer inventoryplayer, TileEngineWithInventory tileEngine) {
super(new ContainerEngine(inventoryplayer, tileEngine), tileEngine);
@ -41,7 +41,7 @@ public class GuiCombustionEngine extends GuiEngine {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);
@ -68,7 +68,7 @@ public class GuiCombustionEngine extends GuiEngine {
if (fluid != null && fluid.getStillIcon() != null) {
liquidIcon = fluid.getStillIcon();
}
mc.renderEngine.func_110577_a(BLOCK_TEXTURE);
mc.renderEngine.bindTexture(BLOCK_TEXTURE);
if (liquidIcon != null) {
while (true) {
@ -91,7 +91,7 @@ public class GuiCombustionEngine extends GuiEngine {
}
}
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
drawTexturedModalRect(j + col, k + line, 176, 0, 16, 60);
}
}

4
common/buildcraft/energy/gui/GuiEngine.java
View file

@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation;
public abstract class GuiEngine extends GuiBuildCraft {
private static final ResourceLocation ITEM_TEXTURE = TextureMap.field_110576_c;
private static final ResourceLocation ITEM_TEXTURE = TextureMap.locationItemsTexture;
protected class EngineLedger extends Ledger {
@ -35,7 +35,7 @@ public abstract class GuiEngine extends GuiBuildCraft {
drawBackground(x, y);
// Draw icon
Minecraft.getMinecraft().renderEngine.func_110577_a(ITEM_TEXTURE);
Minecraft.getMinecraft().renderEngine.bindTexture(ITEM_TEXTURE);
drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4);
if (!isFullyOpened())

2
common/buildcraft/energy/gui/GuiStoneEngine.java
View file

@ -36,7 +36,7 @@ public class GuiStoneEngine extends GuiEngine {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

6
common/buildcraft/energy/render/RenderEngine.java
View file

@ -161,7 +161,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
float factor = (float) (1.0 / 16.0);
func_110628_a(baseTexture);
bindTexture(baseTexture);
box.render(factor);
@ -169,7 +169,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
movingBox.render(factor);
GL11.glTranslatef(-translate[0] * translatefact, -translate[1] * translatefact, -translate[2] * translatefact);
func_110628_a(CHAMBER_TEXTURE);
bindTexture(CHAMBER_TEXTURE);
float chamberf = 2F / 16F;
@ -199,7 +199,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
break;
}
func_110628_a(texture);
bindTexture(texture);
trunk.render(factor);

6
common/buildcraft/factory/TileQuarry.java
View file

@ -513,7 +513,7 @@ public class TileQuarry extends TileBuildCraft implements IMachine, IPowerRecept
isAlive = false;
if (placedBy != null && CoreProxy.proxy.isSimulating(worldObj)) {
PacketDispatcher.sendPacketToPlayer(
new Packet3Chat(ChatMessageComponent.func_111066_d(String.format("[BUILDCRAFT] The quarry at %d, %d, %d will not work because there are no more chunkloaders available",
new Packet3Chat(ChatMessageComponent.createFromText(String.format("[BUILDCRAFT] The quarry at %d, %d, %d will not work because there are no more chunkloaders available",
xCoord, yCoord, zCoord))), (Player) placedBy);
}
sendNetworkUpdate();
@ -542,7 +542,7 @@ public class TileQuarry extends TileBuildCraft implements IMachine, IPowerRecept
if (xSize < 3 || zSize < 3 || ((xSize * zSize) >> 8) >= chunkTicket.getMaxChunkListDepth()) {
if (placedBy != null) {
PacketDispatcher.sendPacketToPlayer(
new Packet3Chat(ChatMessageComponent.func_111066_d(String.format("Quarry size is outside of chunkloading bounds or too small %d %d (%d)", xSize, zSize,
new Packet3Chat(ChatMessageComponent.createFromText(String.format("Quarry size is outside of chunkloading bounds or too small %d %d (%d)", xSize, zSize,
chunkTicket.getMaxChunkListDepth()))), (Player) placedBy);
}
a = new DefaultAreaProvider(xCoord, yCoord, zCoord, xCoord + 10, yCoord + 4, zCoord + 10);
@ -832,7 +832,7 @@ public class TileQuarry extends TileBuildCraft implements IMachine, IPowerRecept
}
if (placedBy != null) {
PacketDispatcher.sendPacketToPlayer(
new Packet3Chat(ChatMessageComponent.func_111066_d(String.format("[BUILDCRAFT] The quarry at %d %d %d will keep %d chunks loaded", xCoord, yCoord, zCoord, chunks.size()))),
new Packet3Chat(ChatMessageComponent.createFromText(String.format("[BUILDCRAFT] The quarry at %d %d %d will keep %d chunks loaded", xCoord, yCoord, zCoord, chunks.size()))),
(Player) placedBy);
}
sendNetworkUpdate();

2
common/buildcraft/factory/gui/GuiAutoCrafting.java
View file

@ -44,7 +44,7 @@ public class GuiAutoCrafting extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(gui);
mc.renderEngine.bindTexture(gui);
int x = (width - xSize) / 2;
int y = (height - ySize) / 2;
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);

2
common/buildcraft/factory/gui/GuiHopper.java
View file

@ -19,7 +19,7 @@ public class GuiHopper extends GuiContainer {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

2
common/buildcraft/factory/gui/GuiRefinery.java
View file

@ -56,7 +56,7 @@ public class GuiRefinery extends GuiAdvancedInterface {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

4
common/buildcraft/factory/render/RenderHopper.java
View file

@ -56,10 +56,10 @@ public class RenderHopper extends TileEntitySpecialRenderer implements IInventor
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glTranslated(x, y, z);
func_110628_a(HOPPER_TEXTURE);
bindTexture(HOPPER_TEXTURE);
top.render((float) (1.0 / 16.0));
bottom.render((float) (1.0 / 16.0));
func_110628_a(HOPPER_MIDDLE_TEXTURE);
bindTexture(HOPPER_MIDDLE_TEXTURE);
middle.render(Tessellator.instance, 1F / 16F);
GL11.glEnable(GL11.GL_LIGHTING);

8
common/buildcraft/factory/render/RenderRefinery.java
View file

@ -126,7 +126,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent
GL11.glRotatef(angle, 0, 1, 0);
func_110628_a(TEXTURE);
bindTexture(TEXTURE);
GL11.glPushMatrix();
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
@ -182,7 +182,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent
int[] list1 = FluidRenderer.getFluidDisplayLists(liquid1, tile.worldObj, false);
if (list1 != null) {
func_110628_a(FluidRenderer.getFluidSheet(liquid1));
bindTexture(FluidRenderer.getFluidSheet(liquid1));
FluidRenderer.setColorForFluidStack(liquid1);
GL11.glCallList(list1[getDisplayListIndex(tile.tank1)]);
}
@ -194,7 +194,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent
if (list2 != null) {
GL11.glPushMatrix();
GL11.glTranslatef(0, 0, 1);
func_110628_a(FluidRenderer.getFluidSheet(liquid2));
bindTexture(FluidRenderer.getFluidSheet(liquid2));
FluidRenderer.setColorForFluidStack(liquid2);
GL11.glCallList(list2[getDisplayListIndex(tile.tank2)]);
GL11.glPopMatrix();
@ -208,7 +208,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent
if (list3 != null) {
GL11.glPushMatrix();
GL11.glTranslatef(1, 0, 0.5F);
func_110628_a(FluidRenderer.getFluidSheet(liquidResult));
bindTexture(FluidRenderer.getFluidSheet(liquidResult));
FluidRenderer.setColorForFluidStack(liquidResult);
GL11.glCallList(list3[getDisplayListIndex(tile.result)]);
GL11.glPopMatrix();

2
common/buildcraft/factory/render/RenderTank.java
View file

@ -38,7 +38,7 @@ public class RenderTank extends TileEntitySpecialRenderer {
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
func_110628_a(FluidRenderer.getFluidSheet(liquid));
bindTexture(FluidRenderer.getFluidSheet(liquid));
FluidRenderer.setColorForFluidStack(liquid);
GL11.glTranslatef((float) x + 0.125F, (float) y, (float) z + 0.125F);

4
common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java
View file

@ -35,7 +35,7 @@ public class GuiAdvancedCraftingTable extends GuiBuildCraft {
drawBackground(x, y);
// Draw icon
Minecraft.getMinecraft().renderEngine.func_110577_a(TextureMap.field_110576_c);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4);
if (!isFullyOpened())
@ -76,7 +76,7 @@ public class GuiAdvancedCraftingTable extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(gui);
mc.renderEngine.bindTexture(gui);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);

4
common/buildcraft/silicon/gui/GuiAssemblyTable.java
View file

@ -50,7 +50,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
drawBackground(x, y);
// Draw icon
mc.renderEngine.func_110577_a(TextureMap.field_110576_c);
mc.renderEngine.bindTexture(TextureMap.locationItemsTexture);
drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4);
if (!isFullyOpened())
@ -141,7 +141,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);

4
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -998,7 +998,7 @@ public class BlockGenericPipe extends BlockContainer {
}
EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, 0.0D, 0.0D, 0.0D, block, sideHit, worldObj.getBlockMetadata(x, y, z));
fx.func_110125_a(icon);
fx.setParticleIcon(icon);
effectRenderer.addEffect(fx.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F));
return true;
}
@ -1035,7 +1035,7 @@ public class BlockGenericPipe extends BlockContainer {
double pz = z + (k + 0.5D) / (double) its;
int random = rand.nextInt(6);
EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, px - x - 0.5D, py - y - 0.5D, pz - z - 0.5D, BuildCraftTransport.genericPipeBlock, random, meta);
fx.func_110125_a(icon);
fx.setParticleIcon(icon);
effectRenderer.addEffect(fx.applyColourMultiplier(x, y, z));
}
}

2
common/buildcraft/transport/ItemFacade.java
View file

@ -126,7 +126,7 @@ public class ItemFacade extends ItemBuildCraft {
Set<String> names = Sets.newHashSet();
for (int meta = 0; meta <= 15; meta++) {
ItemStack is = new ItemStack(b, 1, meta);
if (!Strings.isNullOrEmpty(is.getItemName()) && names.add(is.getItemName())) {
if (!Strings.isNullOrEmpty(is.getUnlocalizedName()) && names.add(is.getUnlocalizedName())) {
ItemFacade.addFacade(is);
}
}

2
common/buildcraft/transport/gui/GuiDiamondPipe.java
View file

@ -49,7 +49,7 @@ public class GuiDiamondPipe extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

2
common/buildcraft/transport/gui/GuiEmeraldPipe.java
View file

@ -38,7 +38,7 @@ public class GuiEmeraldPipe extends GuiBuildCraft {
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int j = (width - xSize) / 2;
int k = (height - ySize) / 2;
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);

2
common/buildcraft/transport/gui/GuiFilteredBuffer.java
View file

@ -39,7 +39,7 @@ public class GuiFilteredBuffer extends GuiContainer {
protected void drawGuiContainerBackgroundLayer(float f, int x, int y) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(TEXTURE);
mc.renderEngine.bindTexture(TEXTURE);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;

8
common/buildcraft/transport/gui/GuiGateInterface.java
View file

@ -239,7 +239,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
ResourceLocation texture = _container.getGateGuiFile();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.func_110577_a(texture);
mc.renderEngine.bindTexture(texture);
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
@ -255,18 +255,18 @@ public class GuiGateInterface extends GuiAdvancedInterface {
if (_container.getGateOrdinal() >= GateKind.AND_3.ordinal()) {
if (_container.triggerState[triggerTracker++]) {
mc.renderEngine.func_110577_a(texture);
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(cornerX + slot.x + 35, cornerY + slot.y + 6, 176, 18, 18, 4);
}
if (trigger == null || !trigger.hasParameter()) {
mc.renderEngine.func_110577_a(texture);
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y - 1, 176, 0, 18, 18);
}
} else if (_container.triggerState[triggerTracker++]) {
mc.renderEngine.func_110577_a(texture);
mc.renderEngine.bindTexture(texture);
drawTexturedModalRect(cornerX + slot.x + 17, cornerY + slot.y + 6, 176, 18, 18, 4);
}

2
common/buildcraft/transport/render/PipeItemRenderer.java
View file

@ -25,7 +25,7 @@ public class PipeItemRenderer implements IItemRenderer {
Icon icon = ((ItemPipe) Item.itemsList[item.itemID]).getIconFromDamage(0);
if (icon == null)
icon = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(TextureMap.field_110575_b)).func_110572_b("missingno");
icon = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos);
block.setBlockBoundsForItemRender();

8
common/buildcraft/transport/render/RenderPipe.java
View file

@ -273,7 +273,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
GL11.glTranslatef((float) x, (float) y, (float) z);
func_110628_a(TextureMap.field_110575_b);
bindTexture(TextureMap.locationBlocksTexture);
int[] displayList = pow.overload > 0 ? displayPowerListOverload : displayPowerList;
@ -368,7 +368,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
break;
default:
}
func_110628_a(TextureMap.field_110575_b);
bindTexture(TextureMap.locationBlocksTexture);
FluidRenderer.setColorForFluidStack(fluidStack);
GL11.glCallList(list);
GL11.glPopMatrix();
@ -383,7 +383,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
if (d != null) {
int stage = (int) ((float) fluidStack.amount / (float) (trans.getCapacity()) * (LIQUID_STAGES - 1));
func_110628_a(TextureMap.field_110575_b);
bindTexture(TextureMap.locationBlocksTexture);
FluidRenderer.setColorForFluidStack(fluidStack);
if (above) {
@ -445,7 +445,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
dummyEntityItem.setEntityItemStack(itemstack);
customRenderItem.doRenderItem(dummyEntityItem, 0, 0, 0, 0, 0);
if (color != null) {
func_110628_a(TextureMap.field_110575_b);
bindTexture(TextureMap.locationBlocksTexture);
BlockInterface block = new BlockInterface();
block.texture = PipeIconProvider.TYPE.ItemBox.getIcon();