Fix #1382 Crash on load wood models and clean up

This commit is contained in:
Nedelosk committed 2016-08-12 21:46:41 +02:00
1 parent 36cd4663d9
commit e3cc08a624
12 files changed
+8 -28

No files matched your search

@@ -10,12 +10,8 @@ import javax.annotation.Nonnull;
import forestry.api.core.IClimateProvider;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import com.mojang.authlib.GameProfile;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorLogicSource;
import forestry.api.genetics.IHousing;
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public interface IWoodStateMapper extends IStateMapper {
ModelResourceLocation getModelResourceLocation(IBlockState state);
ModelResourceLocation getModelLocation(IBlockState state);
ModelResourceLocation getDefaultModelResourceLocation(IBlockState state);
@@ -54,9 +54,14 @@ public class WoodTypeStateMapper extends StateMapperBase implements IWoodStateMa
this.propertiesToRemove.add(property);
return this;
}
@Override
public ModelResourceLocation getModelLocation(IBlockState state) {
return getModelResourceLocation(state);
}
@Override
public ModelResourceLocation getModelResourceLocation(IBlockState state) {
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
final Map<IProperty<?>, Comparable<?>> properties;
if (propertyWoodType != null) {
properties = Maps.newLinkedHashMap(state.getProperties());
@@ -11,7 +11,6 @@
package forestry.arboriculture.genetics;
import forestry.api.core.ForestryAPI;
import forestry.core.DefaultClimateProvider;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -10,7 +10,6 @@
******************************************************************************/
package forestry.arboriculture.proxy;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import net.minecraft.block.Block;
@@ -11,7 +11,6 @@
package forestry.arboriculture.proxy;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -44,7 +43,6 @@ import forestry.api.arboriculture.IWoodType;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.PluginArboriculture;
import forestry.arboriculture.WoodAccess;
import forestry.arboriculture.blocks.BlockDecorativeLeaves;
import forestry.arboriculture.blocks.slab.BlockArbSlab;
import forestry.arboriculture.models.ModelDecorativeLeaves;
@@ -137,7 +135,7 @@ public class ProxyArboricultureClient extends ProxyArboriculture {
}
}
IModel basicModel = ModelLoaderRegistry.getModel(woodMapper.getDefaultModelResourceLocation(state));
ModelResourceLocation basicLocation = woodMapper.getModelResourceLocation(state);
ModelResourceLocation basicLocation = woodMapper.getModelLocation(state);
if(loadingExceptions.containsKey(basicLocation)){
loadingExceptions.remove(basicLocation);
}
@@ -23,8 +23,6 @@ import forestry.api.core.climate.IClimatePosition;
import forestry.api.core.climate.IClimateRegion;
import forestry.api.core.climate.IClimateSource;
import forestry.core.DefaultClimateProvider;
import forestry.core.multiblock.MultiblockRegistry;
import forestry.core.multiblock.MultiblockWorldRegistry;
public class ClimateManager implements IClimateManager{
@@ -15,7 +15,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.api.core.EnumHumidity;
import forestry.api.core.ForestryAPI;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
@@ -10,7 +10,6 @@
******************************************************************************/
package forestry.core.models;
import forestry.api.arboriculture.WoodBlockKind;
import forestry.arboriculture.IWoodTyped;
import net.minecraft.block.Block;
@@ -12,8 +12,6 @@ package forestry.greenhouse;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -17,8 +17,6 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockModelShapes;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
@@ -31,7 +29,6 @@ import forestry.api.core.ICamouflageHandler;
import forestry.api.core.ICamouflageItemHandler;
import forestry.api.core.ICamouflagedTile;
import forestry.api.core.IModelBaker;
import forestry.api.core.IModelBakerModel;
import forestry.core.CamouflageAccess;
import forestry.core.models.ModelBlockDefault;
import forestry.core.utils.CamouflageUtil;
@@ -36,14 +36,6 @@ import forestry.core.utils.ModUtil;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.oredict.OreDictionary;
@ForestryPlugin(pluginID = ForestryPluginUids.BIOMES_O_PLENTY, name = "BiomesOPlenty", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.biomesoplenty.description")
public class PluginBiomesOPlenty extends BlankForestryPlugin {