diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index 6334fc806..a850d6939 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -17,7 +17,6 @@ import forestry.api.arboriculture.IWoodItemMeshDefinition; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; -import forestry.arboriculture.models.WoodModelLoader; import forestry.core.config.Constants; import forestry.core.utils.Translator; @@ -79,9 +78,6 @@ public class WoodHelper { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if (!WoodModelLoader.INSTANCE.isEnabled) { - return new ModelResourceLocation(getDefaultModelLocation(stack), "inventory"); - } int meta = stack.getMetadata(); IWoodType woodType = wood.getWoodType(meta); WoodBlockKind blockKind = wood.getBlockKind(); diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index 6a19f92c5..573b96400 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -22,7 +22,6 @@ import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodStateMapper; import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.models.WoodModelLoader; import forestry.core.config.Constants; @SideOnly(Side.CLIENT) @@ -75,11 +74,7 @@ public class WoodTypeStateMapper extends StateMapperBase implements IWoodStateMa if (woodType instanceof EnumVanillaWoodType) { return getVanillaModelResourceLocation(block, woodType, properties); } else { - if (WoodModelLoader.INSTANCE.isEnabled) { - return getModelResourceLocation(woodType, properties, block.getRegistryName().getResourceDomain()); - } else { - return getDefaultModelResourceLocation(state); - } + return getModelResourceLocation(woodType, properties, block.getRegistryName().getResourceDomain()); } } diff --git a/src/main/java/forestry/arboriculture/models/WoodModelLoader.java b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java index b803d76ab..e48c87fa6 100644 --- a/src/main/java/forestry/arboriculture/models/WoodModelLoader.java +++ b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java @@ -13,25 +13,27 @@ package forestry.arboriculture.models; import java.util.ArrayList; import java.util.List; -import forestry.core.config.Constants; -import forestry.core.utils.ModelUtil; import net.minecraft.client.renderer.block.model.ModelBlockDefinition; import net.minecraft.client.renderer.block.model.ModelBlockDefinition.MissingVariantException; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.VariantList; import net.minecraft.client.resources.IResourceManager; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.config.Constants; +import forestry.core.utils.ModelUtil; + @SideOnly(Side.CLIENT) public enum WoodModelLoader implements ICustomModelLoader { INSTANCE; public static final List validFiles = new ArrayList<>(); - public boolean isEnabled = false; static { validFiles.add("door"); @@ -51,7 +53,7 @@ public enum WoodModelLoader implements ICustomModelLoader { @Override public boolean accepts(ResourceLocation modelLocation) { - if (!isEnabled || !(modelLocation instanceof ModelResourceLocation) + if (!(modelLocation instanceof ModelResourceLocation) || !modelLocation.getResourceDomain().equals(Constants.MOD_ID) || !modelLocation.getResourcePath().contains("arboriculture")) { return false; diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 876ef560f..d85bbe59f 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -10,12 +10,32 @@ ******************************************************************************/ package forestry.arboriculture.proxy; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; + import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.multipart.Multipart; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.registry.IRegistry; +import net.minecraft.world.ColorizerFoliage; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; + +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.IWoodItemMeshDefinition; import forestry.api.arboriculture.IWoodStateMapper; import forestry.api.arboriculture.IWoodType; @@ -35,22 +55,6 @@ import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelManager; import forestry.core.models.SimpleRetexturedModel; import forestry.core.models.WoodModelEntry; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.model.multipart.Multipart; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.registry.IRegistry; -import net.minecraft.world.ColorizerFoliage; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ProxyArboricultureClient extends ProxyArboriculture { @@ -110,7 +114,6 @@ public class ProxyArboricultureClient extends ProxyArboriculture { @SubscribeEvent public void onModelBake(ModelBakeEvent event) { - WoodModelLoader.INSTANCE.isEnabled = true; IRegistry registry = event.getModelRegistry(); for (WoodModelEntry entry : woodModelEntrys) {