From b056cce70772face6667cb4ea704c49b6ac4c214 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 13 Aug 2016 17:47:23 +0200 Subject: [PATCH] Fix the woodTextures --- .../java/forestry/arboriculture/PluginArboriculture.java | 3 ++- .../java/forestry/arboriculture/models/WoodTextures.java | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index bf756a92e..40161b619 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -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(); } diff --git a/src/main/java/forestry/arboriculture/models/WoodTextures.java b/src/main/java/forestry/arboriculture/models/WoodTextures.java index 9b40d63b4..9a5baacd2 100644 --- a/src/main/java/forestry/arboriculture/models/WoodTextures.java +++ b/src/main/java/forestry/arboriculture/models/WoodTextures.java @@ -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 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 {