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

Merge pull request #1020 from viliml/patch-5

Browse source 
Squashed the last texture bugs
This commit is contained in:
CovertJaguar 2013-07-19 07:47:39 -07:00
commit 9c35934e46
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import buildcraft.builders.TileFiller;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.gui.GuiBuildCraft;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -18,7 +19,7 @@ import org.lwjgl.opengl.GL11;
public class GuiFiller extends GuiBuildCraft { public class GuiFiller extends GuiBuildCraft {
private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filler.png"); private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filler.png");
private static final ResourceLocation BLOCK_TEXTURE = new ResourceLocation("/terrain.png"); private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
IInventory playerInventory; IInventory playerInventory;
TileFiller filler; TileFiller filler;

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

@ -9,13 +9,14 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler { public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler {
private static final ResourceLocation BLOCK_TEXTURE = new ResourceLocation("/terrain.png"); private static final ResourceLocation BLOCK_TEXTURE = TextureMap.field_110575_b;
public static class EntityRenderIndex { public static class EntityRenderIndex {

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

@ -7,12 +7,13 @@ import buildcraft.core.gui.GuiBuildCraft;
import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.StringUtils;
import buildcraft.energy.TileEngine; import buildcraft.energy.TileEngine;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public abstract class GuiEngine extends GuiBuildCraft { public abstract class GuiEngine extends GuiBuildCraft {
private static final ResourceLocation ITEM_TEXTURE = new ResourceLocation("/gui/items.png"); private static final ResourceLocation ITEM_TEXTURE = TextureMap.field_110576_c;
protected class EngineLedger extends Ledger { protected class EngineLedger extends Ledger {