Fix the woodTextures

This commit is contained in:
Nedelosk committed 2016-08-13 17:47:23 +02:00
1 parent 1497aada57
commit b056cce707
2 files changed
+7 -3

No files matched your search

@@ -70,6 +70,7 @@ import forestry.core.fluids.Fluids;
import forestry.core.genetics.alleles.AllelePlantType;
import forestry.core.items.ItemFruit.EnumFruit;
import forestry.core.network.IPacketRegistry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.RecipeUtil;
import forestry.core.render.TextureManager;
import forestry.core.utils.IMCUtil;
@@ -557,7 +558,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
@SideOnly(Side.CLIENT)
public void registerSprites(TextureStitchEvent.Pre event) {
TextureLeaves.registerAllSprites();
WoodTextures.deserializeFile();
WoodTextures.deserializeFile(Proxies.render.getSelectedTexturePack());
for (IAlleleFruit alleleFruit : AlleleFruit.getFruitAlleles()) {
alleleFruit.getProvider().registerSprites();
}
@@ -20,6 +20,9 @@ import com.google.gson.stream.JsonReader;
import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.core.render.FontColour;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourcePack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -29,9 +32,9 @@ public class WoodTextures {
public static final Gson GSON = new GsonBuilder().create();
protected static final Map<String, Texture> textures = new HashMap<>();
public static void deserializeFile(){
public static void deserializeFile(IResourceManager resourceManager){
try {
InputStream stream = FontColour.class.getResourceAsStream("/assets/forestry/textures/woodTextures.json");
InputStream stream = resourceManager.getResource(new ResourceLocation("forestry:textures/woodTextures.json")).getInputStream();
if(stream != null){
JsonReader reader = null;
try {