From 2e10010e292c5fe683848bd43833c3c45cd40689 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Wed, 2 Jul 2014 09:49:25 -0400 Subject: [PATCH] Fixes #698 --- src/main/java/com/pahimar/ee3/reference/Textures.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/reference/Textures.java b/src/main/java/com/pahimar/ee3/reference/Textures.java index 8c8c858f..cbb5072c 100644 --- a/src/main/java/com/pahimar/ee3/reference/Textures.java +++ b/src/main/java/com/pahimar/ee3/reference/Textures.java @@ -1,7 +1,6 @@ package com.pahimar.ee3.reference; import com.pahimar.ee3.util.ResourceLocationHelper; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; public class Textures @@ -10,6 +9,7 @@ public class Textures // Base file paths public static final String MODEL_TEXTURE_LOCATION = "textures/models/"; + // Model textures public static final ResourceLocation MODEL_CALCINATOR_IDLE = ResourceLocationHelper.getResourceLocation(MODEL_TEXTURE_LOCATION + "calcinator_idle.png"); public static final ResourceLocation MODEL_CALCINATOR_ACTIVE = ResourceLocationHelper.getResourceLocation(MODEL_TEXTURE_LOCATION + "calcinator_active.png"); @@ -21,6 +21,7 @@ public class Textures public static final ResourceLocation MODEL_RESEARCH_STATION = ResourceLocationHelper.getResourceLocation(MODEL_TEXTURE_LOCATION + "researchStation.png"); public static final String ARMOR_SHEET_LOCATION = "textures/armor/"; public static final String GUI_SHEET_LOCATION = "textures/gui/"; + // GUI textures public static final ResourceLocation GUI_CALCINATOR = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "calcinator.png"); public static final ResourceLocation GUI_ALUDEL = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "aludel.png"); @@ -32,10 +33,12 @@ public class Textures public static final ResourceLocation GUI_ALCHEMICAL_CHEST_LARGE = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "alchemicalChest_large.png"); public static final ResourceLocation GUI_GLASS_BELL = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "glassBell.png"); public static final String EFFECTS_LOCATION = "textures/effects/"; + // Effect textures public static final ResourceLocation EFFECT_WORLD_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(EFFECTS_LOCATION + "noise.png"); + // Item/Block sprite sheets - public static final ResourceLocation VANILLA_BLOCK_TEXTURE_SHEET = TextureMap.locationBlocksTexture; - public static final ResourceLocation VANILLA_ITEM_TEXTURE_SHEET = TextureMap.locationItemsTexture; + public static final ResourceLocation VANILLA_BLOCK_TEXTURE_SHEET = new ResourceLocation("textures/atlas/blocks.png"); + public static final ResourceLocation VANILLA_ITEM_TEXTURE_SHEET = new ResourceLocation("textures/atlas/items.png"); public static final ResourceLocation GUI_PORTABLE_CRAFTING = new ResourceLocation("textures/gui/container/crafting_table.png"); }