diff --git a/src/main/java/forestry/api/apiculture/IBeeHousing.java b/src/main/java/forestry/api/apiculture/IBeeHousing.java index e1ab7184b..1379482d2 100644 --- a/src/main/java/forestry/api/apiculture/IBeeHousing.java +++ b/src/main/java/forestry/api/apiculture/IBeeHousing.java @@ -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; diff --git a/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java b/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java index ff8d7e2c6..49621ddf1 100644 --- a/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java +++ b/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java @@ -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); diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index 55d8a15f4..7b93e368e 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -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, Comparable> properties; if (propertyWoodType != null) { properties = Maps.newLinkedHashMap(state.getProperties()); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index e5a3434f3..7783d07bd 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -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; diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java index 8a7ec327f..242f9ecb3 100755 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.proxy; -import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; import net.minecraft.block.Block; diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 1a430c017..ae20f743e 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -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); } diff --git a/src/main/java/forestry/core/climate/ClimateManager.java b/src/main/java/forestry/core/climate/ClimateManager.java index eb80f934c..a519bc122 100644 --- a/src/main/java/forestry/core/climate/ClimateManager.java +++ b/src/main/java/forestry/core/climate/ClimateManager.java @@ -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{ diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index 7d11314ef..81484b46b 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -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; diff --git a/src/main/java/forestry/core/models/WoodModelEntry.java b/src/main/java/forestry/core/models/WoodModelEntry.java index d4b87addc..33a3b4612 100644 --- a/src/main/java/forestry/core/models/WoodModelEntry.java +++ b/src/main/java/forestry/core/models/WoodModelEntry.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.models; -import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; import net.minecraft.block.Block; diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java index 5dd4373fa..5965a4900 100644 --- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java +++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java @@ -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; diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java index 2c6491937..ad4b2e095 100644 --- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java +++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java @@ -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; diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 02fb36428..935639fb5 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -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 {