diff --git a/build.gradle b/build.gradle index 6a5522352..d97766012 100755 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url = "http://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -26,8 +26,8 @@ ext.dirDest = './build/dist' ext.dirLang = "./lang" // java version -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 minecraft { version = mcversion + "-" + forgeversion @@ -60,7 +60,7 @@ repositories { } dependencies { - deobfCompile "net.darkhax.tesla:Tesla:${tesla_version}" + deobfCompile "net.darkhax.tesla:Tesla-${mcversion}:${tesla_version}" deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api" runtime "mezz.jei:jei_${mcversion}:${jei_version}" deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api" diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index 8f91af824..10ca8e7f9 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -mcversion=1.11.2 -forgeversion=13.20.0.2296 -mcp_mappings=snapshot_20161220 +mcversion=1.12 +forgeversion=14.21.0.2363 +mcp_mappings=snapshot_20170624 -tesla_version=1.11-1.3.0.52 -jei_version=4.5.0.286 +tesla_version=1.0.60 +jei_version=4.7.0.67 ic2_version=2.7.30-ex111 version_major=5 -version_minor=3 -version_patch=4 +version_minor=4 +version_patch=0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848f1..f68571bac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +#Sat Jun 24 19:47:39 PDT 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java old mode 100644 new mode 100755 index c81c1193b..aa2be0bc9 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -10,10 +10,28 @@ ******************************************************************************/ package forestry; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.io.File; -import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.item.Item; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; + import forestry.api.core.ForestryAPI; import forestry.core.EventHandlerCore; import forestry.core.climate.ClimateEventHandler; @@ -30,19 +48,6 @@ import forestry.core.utils.MigrationHelper; import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; import forestry.plugins.compat.PluginIC2; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; /** * Forestry Minecraft Mod @@ -54,9 +59,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; name = Constants.MOD_NAME, version = Constants.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - acceptedMinecraftVersions = "[1.11]", - dependencies = "required-after:forge@[13.20.0.2270,);" - + "after:JEI@[4.5.0,);" + acceptedMinecraftVersions = "[1.12]", + dependencies = "required-after:forge@[14.21.0.2363,);" + + "after:JEI@[4.7.0,);" + "after:" + PluginIC2.modId + ";") public class Forestry { @@ -148,7 +153,12 @@ public class Forestry { } @EventHandler - public void onMissingMappings(FMLMissingMappingsEvent event) { - MigrationHelper.onMissingMappings(event); + public void onMissingBlockMappings(RegistryEvent.MissingMappings event) { + MigrationHelper.onMissingBlockMappings(event); + } + + @EventHandler + public void onMissingItemMappings(RegistryEvent.MissingMappings event) { + MigrationHelper.onMissingItemMappings(event); } } diff --git a/src/main/java/forestry/api/arboriculture/WoodBlockKind.java b/src/main/java/forestry/api/arboriculture/WoodBlockKind.java old mode 100644 new mode 100755 index 1def858e3..402a3857f --- a/src/main/java/forestry/api/arboriculture/WoodBlockKind.java +++ b/src/main/java/forestry/api/arboriculture/WoodBlockKind.java @@ -1,12 +1,12 @@ package forestry.api.arboriculture; +import com.google.common.collect.ImmutableMap; + import java.util.HashMap; import java.util.Locale; import java.util.Map; -import com.google.common.collect.ImmutableMap; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ModelProcessingHelper; public enum WoodBlockKind { LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR; @@ -57,6 +57,6 @@ public enum WoodBlockKind { break; } textures.putAll(customTextures); - return ModelProcessingHelper.retexture(model, new ImmutableMap.Builder().putAll(textures).build()); + return model.retexture(new ImmutableMap.Builder().putAll(textures).build()); } } diff --git a/src/main/java/forestry/api/core/IModelBakerModel.java b/src/main/java/forestry/api/core/IModelBakerModel.java old mode 100644 new mode 100755 index 00cd64966..310800e8e --- a/src/main/java/forestry/api/core/IModelBakerModel.java +++ b/src/main/java/forestry/api/core/IModelBakerModel.java @@ -8,14 +8,15 @@ package forestry.api.core; import javax.annotation.Nullable; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IPerspectiveAwareModel; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public interface IModelBakerModel extends IPerspectiveAwareModel { +public interface IModelBakerModel extends IBakedModel { void setGui3d(boolean gui3d); diff --git a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java old mode 100644 new mode 100755 index 9c413d07a..36798e709 --- a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java +++ b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java @@ -30,7 +30,7 @@ public interface IDescriptiveRecipe { * @return array of all the ingredients in the crafting table. * Each inner list represents one slot's accepted ItemStacks */ - NonNullList> getIngredients(); + NonNullList> getRawIngredients(); NonNullList getOreDicts(); diff --git a/src/main/java/forestry/api/storage/IBackpackInterface.java b/src/main/java/forestry/api/storage/IBackpackInterface.java old mode 100644 new mode 100755 index 3683b90e8..cccc6c87b --- a/src/main/java/forestry/api/storage/IBackpackInterface.java +++ b/src/main/java/forestry/api/storage/IBackpackInterface.java @@ -8,12 +8,14 @@ package forestry.api.storage; import javax.annotation.Nullable; import java.util.function.Predicate; -import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.registries.IForgeRegistryEntry; + +import forestry.api.genetics.ISpeciesRoot; /** * The Backpack Interface allows you to add items to Forestry backpacks or create your own backpacks. diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java old mode 100644 new mode 100755 index 4f55b647c..e71a9d068 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.apiculture; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; + import javax.annotation.Nullable; import java.io.File; import java.util.ArrayList; @@ -18,8 +21,40 @@ import java.util.Objects; import java.util.Random; import java.util.Set; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.init.PotionTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionUtils; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.IChunkGenerator; +import net.minecraft.world.storage.loot.LootTableList; + +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.registries.IForgeRegistry; + import forestry.Forestry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; @@ -96,36 +131,6 @@ import forestry.food.items.ItemRegistryFood; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.init.PotionTypes; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionUtils; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.storage.loot.LootTableList; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.brewing.BrewingRecipeRegistry; -import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.VillagerRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description") public class PluginApiculture extends BlankForestryPlugin { @@ -306,7 +311,8 @@ public class PluginApiculture extends BlankForestryPlugin { villagerRegistry.registerVillageCreationHandler(villageHandler); villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER, Constants.TEXTURE_SKIN_ZOMBIE_BEEKPEEPER); - villagerRegistry.register(villagerApiarist); + IForgeRegistry villagerProfessions = ForgeRegistries.VILLAGER_PROFESSIONS; + villagerProfessions.register(villagerApiarist); ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1); ItemStack wildcardDrone = new ItemStack(items.beeDroneGE, 1); diff --git a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java index 0215099ae..f5a9a06dd 100755 --- a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.apiculture; +import net.minecraft.world.World; + import forestry.api.apiculture.BeeManager; import forestry.core.ISaveEventHandler; -import net.minecraft.world.World; public class SaveEventHandlerApiculture implements ISaveEventHandler { diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java old mode 100644 new mode 100755 index e537a8fdc..9305072d5 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -10,12 +10,34 @@ ******************************************************************************/ package forestry.apiculture.blocks; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Locale; import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; @@ -36,25 +58,6 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockAlveary extends BlockStructure implements IStateMapperRegister { private static final PropertyEnum STATE = PropertyEnum.create("state", State.class); @@ -259,7 +262,7 @@ public abstract class BlockAlveary extends BlockStructure implements IStateMappe @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { tooltip.add(Translator.translateToLocal("tile.for.alveary.tooltip")); } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java old mode 100644 new mode 100755 index 005ff3aa4..d28b23b5f --- a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java @@ -16,20 +16,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IHiveDrop; -import forestry.api.apiculture.IHiveTile; -import forestry.api.apiculture.hives.IHiveRegistry.HiveType; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.apiculture.MaterialBeehive; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.tiles.TileHive; -import forestry.core.blocks.IBlockWithMeta; -import forestry.core.tiles.TileUtil; import net.minecraft.block.BlockContainer; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -44,9 +30,25 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IHiveDrop; +import forestry.api.apiculture.IHiveTile; +import forestry.api.apiculture.hives.IHiveRegistry.HiveType; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.apiculture.MaterialBeehive; +import forestry.apiculture.PluginApiculture; +import forestry.apiculture.tiles.TileHive; +import forestry.core.blocks.IBlockWithMeta; +import forestry.core.tiles.TileUtil; + public class BlockBeeHives extends BlockContainer implements IItemModelRegister, IBlockWithMeta { private static final PropertyEnum HIVE_TYPES = PropertyEnum.create("hive", HiveType.class); @@ -173,7 +175,7 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (IBlockState blockState : getBlockState().getValidStates()) { if (getHiveType(blockState) != HiveType.SWARM) { int meta = getMetaFromState(blockState); diff --git a/src/main/java/forestry/apiculture/blocks/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java old mode 100644 new mode 100755 index e3ed0a2ad..be1a9a620 --- a/src/main/java/forestry/apiculture/blocks/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.blocks; +import com.google.common.collect.ImmutableMap; + import javax.annotation.Nullable; import java.awt.Color; import java.util.ArrayList; @@ -20,14 +22,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import com.google.common.collect.ImmutableMap; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.apiculture.tiles.TileCandle; -import forestry.core.blocks.IColoredBlock; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.ItemStackUtil; import net.minecraft.block.BlockTorch; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.SoundType; @@ -51,10 +45,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.apiculture.tiles.TileCandle; +import forestry.core.blocks.IColoredBlock; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.ItemStackUtil; + public class BlockCandle extends BlockTorch implements IItemModelRegister, ITileEntityProvider, IColoredBlock { private static final ImmutableMap colours; @@ -148,7 +151,7 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { list.add(new ItemStack(this, 1, 0)); } @@ -200,9 +203,9 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile if (toggleLitState) { tileCandle.setLit(!isLit); worldIn.markBlockRangeForRenderUpdate(pos, pos); - worldIn.theProfiler.startSection("checkLight"); + worldIn.profiler.startSection("checkLight"); worldIn.checkLight(pos); - worldIn.theProfiler.endSection(); + worldIn.profiler.endSection(); flag = true; } return flag; @@ -287,9 +290,9 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister, ITile tileCandle.setColour(colour); tileCandle.setLit(isLit); if (tileCandle.isLit()) { - world.theProfiler.startSection("checkLight"); + world.profiler.startSection("checkLight"); world.checkLight(pos); - world.theProfiler.endSection(); + world.profiler.endSection(); } } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java b/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java old mode 100644 new mode 100755 index 198abea1a..1ac3fe54d --- a/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java +++ b/src/main/java/forestry/apiculture/blocks/BlockHoneyComb.java @@ -1,18 +1,9 @@ package forestry.apiculture.blocks; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.Tabs; -import forestry.apiculture.items.EnumHoneyComb; -import forestry.core.blocks.IBlockWithMeta; -import forestry.core.blocks.IColoredBlock; -import forestry.core.config.Config; -import forestry.core.config.Constants; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -27,10 +18,21 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.apiculture.items.EnumHoneyComb; +import forestry.core.blocks.IBlockWithMeta; +import forestry.core.blocks.IColoredBlock; +import forestry.core.config.Config; +import forestry.core.config.Constants; + public abstract class BlockHoneyComb extends Block implements IItemModelRegister, IBlockWithMeta, IColoredBlock, IStateMapperRegister { public final int minMeta; @@ -75,7 +77,7 @@ public abstract class BlockHoneyComb extends Block implements IItemModelRegister } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (EnumHoneyComb honeyComb : getVariant().getAllowedValues()) { if(!honeyComb.isSecret() || Config.isDebug){ list.add(get(honeyComb)); diff --git a/src/main/java/forestry/apiculture/blocks/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java old mode 100644 new mode 100755 index a9a959250..1d1668cdf --- a/src/main/java/forestry/apiculture/blocks/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -12,12 +12,6 @@ package forestry.apiculture.blocks; import java.util.Random; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.tiles.TileCandle; -import forestry.core.config.Constants; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.block.SoundType; @@ -31,9 +25,17 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.apiculture.PluginApiculture; +import forestry.apiculture.tiles.TileCandle; +import forestry.core.config.Constants; + public class BlockStump extends BlockTorch implements IItemModelRegister { public BlockStump() { @@ -49,7 +51,7 @@ public class BlockStump extends BlockTorch implements IItemModelRegister { } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { list.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java old mode 100644 new mode 100755 index 17aff290f..f4c4eaeec --- a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java @@ -63,17 +63,17 @@ public class AIAvoidPlayers extends EntityAIBase { if (randomTarget == null) { return false; } - - if (player.getDistanceSq(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord) < player.getDistanceSqToEntity(mob)) { + + if (player.getDistanceSq(randomTarget.x, randomTarget.y, randomTarget.z) < player.getDistanceSqToEntity(mob)) { return false; } - - path = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord); + + path = pathNavigator.getPathToXYZ(randomTarget.x, randomTarget.y, randomTarget.z); return path != null; } @Override - public boolean continueExecuting() { + public boolean shouldContinueExecuting() { return !this.pathNavigator.noPath(); } diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java old mode 100644 new mode 100755 index 5e5d130be..bcc132c9d --- a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java @@ -10,19 +10,20 @@ ******************************************************************************/ package forestry.apiculture.entities; -import forestry.apiculture.PluginApiculture; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import forestry.apiculture.PluginApiculture; + public class ParticleBeeExplore extends Particle { private final Vec3d origin; public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) { - super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); + super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); setParticleTexture(PluginApiculture.getBeeSprite()); this.origin = origin; @@ -54,9 +55,9 @@ public class ParticleBeeExplore extends Particle { this.move(this.motionX, this.motionY, this.motionZ); if (this.particleAge == this.particleMaxAge / 2) { - this.motionX = (origin.xCoord - this.posX) * 0.03; - this.motionY = (origin.yCoord - this.posY) * 0.03; - this.motionZ = (origin.zCoord - this.posZ) * 0.03; + this.motionX = (origin.x - this.posX) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; + this.motionZ = (origin.z - this.posZ) * 0.03; } if (this.particleAge < this.particleMaxAge * 0.25) { @@ -72,15 +73,15 @@ public class ParticleBeeExplore extends Particle { } else if (this.particleAge < this.particleMaxAge * 0.75) { // venture back this.motionX *= 0.95; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; this.motionZ *= 0.95; } else { // get to origin - this.motionX = (origin.xCoord - this.posX) * 0.03; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionX = (origin.x - this.posX) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; - this.motionZ = (origin.zCoord - this.posZ) * 0.03; + this.motionZ = (origin.z - this.posZ) * 0.03; } if (this.particleAge++ >= this.particleMaxAge) { @@ -89,7 +90,7 @@ public class ParticleBeeExplore extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float minU = 0; float maxU = 1; float minV = 0; @@ -110,10 +111,10 @@ public class ParticleBeeExplore extends Particle { int i = this.getBrightnessForRender(partialTicks); int j = i >> 16 & 65535; int k = i & 65535; - worldRendererIn.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); } // avoid calculating lighting for bees, it is too much processing diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java old mode 100644 new mode 100755 index 58b042476..073e2b2a4 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java @@ -10,20 +10,21 @@ ******************************************************************************/ package forestry.apiculture.entities; -import forestry.apiculture.PluginApiculture; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import forestry.apiculture.PluginApiculture; + public class ParticleBeeRoundTrip extends Particle { private final Vec3d origin; private final BlockPos destination; public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) { - super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); + super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); setParticleTexture(PluginApiculture.getBeeSprite()); this.origin = origin; @@ -56,9 +57,9 @@ public class ParticleBeeRoundTrip extends Particle { this.move(this.motionX, this.motionY, this.motionZ); if (this.particleAge == this.particleMaxAge / 2) { - this.motionX = (origin.xCoord - this.posX) * 0.03 + 0.1 * rand.nextFloat(); - this.motionY = (origin.yCoord - this.posY) * 0.03 + 0.1 * rand.nextFloat(); - this.motionZ = (origin.zCoord - this.posZ) * 0.03 + 0.1 * rand.nextFloat(); + this.motionX = (origin.x - this.posX) * 0.03 + 0.1 * rand.nextFloat(); + this.motionY = (origin.y - this.posY) * 0.03 + 0.1 * rand.nextFloat(); + this.motionZ = (origin.z - this.posZ) * 0.03 + 0.1 * rand.nextFloat(); } if (this.particleAge < this.particleMaxAge * 0.25) { @@ -75,15 +76,15 @@ public class ParticleBeeRoundTrip extends Particle { } else if (this.particleAge < this.particleMaxAge * 0.75) { // venture back this.motionX *= 0.95; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; this.motionZ *= 0.95; } else { // get to origin - this.motionX = (origin.xCoord - this.posX) * 0.03; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionX = (origin.x - this.posX) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; - this.motionZ = (origin.zCoord - this.posZ) * 0.03; + this.motionZ = (origin.z - this.posZ) * 0.03; } if (this.particleAge++ >= this.particleMaxAge) { @@ -92,7 +93,7 @@ public class ParticleBeeRoundTrip extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float minU = 0; float maxU = 1; float minV = 0; @@ -113,10 +114,10 @@ public class ParticleBeeRoundTrip extends Particle { int i = this.getBrightnessForRender(partialTicks); int j = i >> 16 & 65535; int k = i & 65535; - worldRendererIn.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); } // avoid calculating lighting for bees, it is too much processing diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java old mode 100644 new mode 100755 index 416e616d2..338ff891e --- a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java @@ -10,19 +10,20 @@ ******************************************************************************/ package forestry.apiculture.entities; -import forestry.apiculture.PluginApiculture; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import forestry.apiculture.PluginApiculture; + public class ParticleBeeTargetEntity extends Particle { private final Vec3d origin; private final Entity entity; public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) { - super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); + super(world, origin.x, origin.y, origin.z, 0.0D, 0.0D, 0.0D); setParticleTexture(PluginApiculture.getBeeSprite()); this.origin = origin; @@ -56,9 +57,9 @@ public class ParticleBeeTargetEntity extends Particle { this.move(this.motionX, this.motionY, this.motionZ); if (this.particleAge == this.particleMaxAge / 2) { - this.motionX = (origin.xCoord - this.posX) * 0.03; - this.motionY = (origin.yCoord - this.posY) * 0.03; - this.motionZ = (origin.zCoord - this.posZ) * 0.03; + this.motionX = (origin.x - this.posX) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; + this.motionZ = (origin.z - this.posZ) * 0.03; } if (this.particleAge < this.particleMaxAge * 0.5) { @@ -72,15 +73,15 @@ public class ParticleBeeTargetEntity extends Particle { } else if (this.particleAge < this.particleMaxAge * 0.75) { // venture back this.motionX *= 0.95; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; this.motionZ *= 0.95; } else { // get to origin - this.motionX = (origin.xCoord - this.posX) * 0.03; - this.motionY = (origin.yCoord - this.posY) * 0.03; + this.motionX = (origin.x - this.posX) * 0.03; + this.motionY = (origin.y - this.posY) * 0.03; this.motionY = (this.motionY + 0.2 * (-0.5 + rand.nextFloat())) / 2; - this.motionZ = (origin.zCoord - this.posZ) * 0.03; + this.motionZ = (origin.z - this.posZ) * 0.03; } if (this.particleAge++ >= this.particleMaxAge) { @@ -89,7 +90,7 @@ public class ParticleBeeTargetEntity extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float minU = 0; float maxU = 1; float minV = 0; @@ -110,10 +111,10 @@ public class ParticleBeeTargetEntity extends Particle { int i = this.getBrightnessForRender(partialTicks); int j = i >> 16 & 65535; int k = i & 65535; - worldRendererIn.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); - worldRendererIn.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 - rotationYZ * f10 - rotationXZ * f10).tex(maxU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 - rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 - rotationYZ * f10 + rotationXZ * f10).tex(maxU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 + rotationXY * f10, f12 + rotationZ * f10, f13 + rotationYZ * f10 + rotationXZ * f10).tex(minU, minV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); + buffer.pos(f11 + rotationX * f10 - rotationXY * f10, f12 - rotationZ * f10, f13 + rotationYZ * f10 - rotationXZ * f10).tex(minU, maxV).color(particleRed, particleGreen, particleBlue, 1.0F).lightmap(j, k).endVertex(); } // avoid calculating lighting for bees, it is too much processing diff --git a/src/main/java/forestry/apiculture/flowers/Flower.java b/src/main/java/forestry/apiculture/flowers/Flower.java old mode 100644 new mode 100755 index ecec90a50..4683d3674 --- a/src/main/java/forestry/apiculture/flowers/Flower.java +++ b/src/main/java/forestry/apiculture/flowers/Flower.java @@ -10,7 +10,9 @@ ******************************************************************************/ package forestry.apiculture.flowers; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; + import net.minecraft.block.state.IBlockState; public final class Flower { @@ -57,7 +59,7 @@ public final class Flower { @Override public String toString() { - return Objects.toStringHelper(this).add("blockState", blockState).add("weight", weight).toString(); + return MoreObjects.toStringHelper(this).add("blockState", blockState).add("weight", weight).toString(); } } diff --git a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java index 5808b073c..bcc146e9a 100755 --- a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java +++ b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IApiaristTracker; @@ -18,8 +21,6 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.apiculture.PluginApiculture; import forestry.core.genetics.BreedingTracker; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; public class ApiaristTracker extends BreedingTracker implements IApiaristTracker { diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java old mode 100644 new mode 100755 index 5e051b576..9c76c0370 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -19,7 +19,21 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.FlowerManager; @@ -56,17 +70,6 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.Translator; import forestry.core.utils.VectUtil; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Bee extends IndividualLiving implements IBee { @@ -269,7 +272,7 @@ public class Bee extends IndividualLiving implements IBee { } // / Check for the sky, except if in hell - if (!world.provider.hasNoSky()) { + if (!world.provider.isNether()) { if (!housing.canBlockSeeTheSky() && !canWorkUnderground(beeModifier)) { errorStates.add(EnumErrorCode.NO_SKY); } diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index c4d98a704..39d719196 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -10,12 +10,17 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.concurrent.TimeUnit; - import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; + +import java.util.concurrent.TimeUnit; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.Vec3i; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; @@ -33,9 +38,6 @@ import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AlleleArea; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleTolerance; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.Vec3i; public class BeeGenome extends Genome implements IBeeGenome { /** diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index 61b41fb25..e3d89d97e 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -16,6 +16,9 @@ import java.util.List; import java.util.Locale; import java.util.Random; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IBee; @@ -23,8 +26,6 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingMode; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class BeekeepingMode implements IBeekeepingMode { diff --git a/src/main/java/forestry/apiculture/genetics/HiveDrop.java b/src/main/java/forestry/apiculture/genetics/HiveDrop.java index e6328d35a..18a806c78 100755 --- a/src/main/java/forestry/apiculture/genetics/HiveDrop.java +++ b/src/main/java/forestry/apiculture/genetics/HiveDrop.java @@ -12,13 +12,14 @@ package forestry.apiculture.genetics; import java.util.Collections; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IHiveDrop; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IHiveDrop; + public class HiveDrop implements IHiveDrop { private final IBeeDefinition beeTemplate; diff --git a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java index 872f0582b..bb8277784 100755 --- a/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java +++ b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java @@ -12,11 +12,12 @@ package forestry.apiculture.genetics; import java.util.List; +import net.minecraft.entity.EntityLiving; + import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.apiculture.genetics.alleles.AlleleEffect; -import net.minecraft.entity.EntityLiving; /** * Hermits will not produce if there are any other living creatures nearby. diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java old mode 100644 new mode 100755 index f6be69d49..b2fe67ed1 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectIgnition.java @@ -12,16 +12,18 @@ package forestry.apiculture.genetics.alleles; import java.util.List; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; import forestry.core.render.ParticleRender; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class AlleleEffectIgnition extends AlleleEffectThrottled { private static final int ignitionChance = 50; @@ -72,7 +74,7 @@ public class AlleleEffectIgnition extends AlleleEffectThrottled { super.doFX(genome, storedData, housing); } else { Vec3d beeFXCoordinates = housing.getBeeFXCoordinates(); - ParticleRender.addEntityIgnitionFX(world, beeFXCoordinates.xCoord, beeFXCoordinates.yCoord + 0.5, beeFXCoordinates.zCoord); + ParticleRender.addEntityIgnitionFX(world, beeFXCoordinates.x, beeFXCoordinates.y + 0.5, beeFXCoordinates.z); } return storedData; } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java old mode 100644 new mode 100755 index efaf2ae8e..f15a580b6 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectPotion.java @@ -14,11 +14,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IEffectData; -import forestry.core.render.ParticleRender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.potion.Potion; @@ -26,9 +21,16 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionUtils; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; +import forestry.core.render.ParticleRender; + public class AlleleEffectPotion extends AlleleEffectThrottled { private final Potion potion; @@ -93,7 +95,7 @@ public class AlleleEffectPotion extends AlleleEffectThrottled { super.doFX(genome, storedData, housing); } else { Vec3d beeFXCoordinates = housing.getBeeFXCoordinates(); - ParticleRender.addEntityPotionFX(world, beeFXCoordinates.xCoord, beeFXCoordinates.yCoord + 0.5, beeFXCoordinates.zCoord, potionFXColor); + ParticleRender.addEntityPotionFX(world, beeFXCoordinates.x, beeFXCoordinates.y + 0.5, beeFXCoordinates.z, potionFXColor); } return storedData; } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java old mode 100644 new mode 100755 index 25a649540..55ae6fde7 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectResurrection.java @@ -14,11 +14,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IEffectData; -import forestry.core.utils.EntityUtil; -import forestry.core.utils.ItemStackUtil; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.item.EntityItem; @@ -34,6 +29,12 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; +import forestry.core.utils.EntityUtil; +import forestry.core.utils.ItemStackUtil; + public class AlleleEffectResurrection extends AlleleEffectThrottled { public static class Resurrectable { @@ -97,7 +98,7 @@ public class AlleleEffectResurrection extends AlleleEffectThrottled { if (entity.isDead) { return false; } - ItemStack contained = entity.getEntityItem(); + ItemStack contained = entity.getItem(); for (Resurrectable entry : resurrectables) { if (ItemStackUtil.isIdenticalItem(entry.res, contained)) { EntityUtil.spawnEntity(entity.world, entry.risen, entity.posX, entity.posY, entity.posZ); diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java index 6b9fbdaf0..31a86432b 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.TileAlveary; import forestry.core.gui.ContainerTile; import forestry.core.network.IForestryPacketClient; import forestry.core.network.packets.PacketGuiUpdate; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerAlveary extends ContainerTile { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java index 295398031..87d639bdc 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.inventory.InventoryHygroregulator; import forestry.apiculture.multiblock.TileAlvearyHygroregulator; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerAlvearyHygroregulator extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java index d91d6f7d2..eab1b48d1 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.inventory.InventoryAlvearySieve; import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.inventory.watchers.ISlotPickupWatcher; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerAlvearySieve extends ContainerTile { diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java index 3bdaa2273..469256b11 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerAlvearySwarmer extends ContainerTile { diff --git a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java index e83f5fbdf..a5a57de0a 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.EntityPlayer; + import forestry.apiculture.inventory.ItemInventoryHabitatLocator; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; -import net.minecraft.entity.player.EntityPlayer; public class ContainerHabitatLocator extends ContainerItemInventory { diff --git a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java index cdb6c1e30..85f58593d 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerImprinter.java +++ b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.inventory.ItemInventoryImprinter; import forestry.apiculture.network.packets.PacketImprintSelectionResponse; import forestry.core.gui.ContainerItemInventory; @@ -17,8 +20,6 @@ import forestry.core.gui.IGuiSelectable; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.utils.NetworkUtil; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerImprinter extends ContainerItemInventory implements IGuiSelectable { diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index 5528e17a9..8f601dbeb 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.IAlvearyControllerInternal; import forestry.apiculture.multiblock.TileAlveary; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.render.EnumTankLevel; -import net.minecraft.entity.player.InventoryPlayer; public class GuiAlveary extends GuiForestryTitled { private final TileAlveary tile; diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java index 7d132e13d..32236d334 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.TileAlvearyHygroregulator; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearyHygroregulator extends GuiForestryTitled { private final TileAlvearyHygroregulator tile; diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java index 10a0e212a..a218d061d 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; -import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearySieve extends GuiForestryTitled { private final TileAlvearySieve tile; diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java index c8baeafce..4531be9ad 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.apiculture.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; -import net.minecraft.entity.player.InventoryPlayer; public class GuiAlvearySwarmer extends GuiForestryTitled { private final TileAlvearySwarmer tile; diff --git a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java index 97eeb4a81..d52d78cd1 100755 --- a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.gui; +import com.google.common.collect.LinkedListMultimap; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -17,16 +19,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.google.common.collect.LinkedListMultimap; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.BiomeDictionary; + import forestry.apiculture.inventory.ItemInventoryHabitatLocator; import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.BiomeDictionary; public class GuiHabitatLocator extends GuiForestry { private static final LinkedListMultimap habitats = LinkedListMultimap.create(); @@ -83,7 +86,7 @@ public class GuiHabitatLocator extends GuiForestry { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); String str = Translator.translateToLocal("item.for.habitatLocator.name").toUpperCase(); - fontRendererObj.drawString(str, startX + 8 + textLayout.getCenteredOffset(str, 138), startY + 16, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(str, startX + 8 + textLayout.getCenteredOffset(str, 138), startY + 16, ColourProperties.INSTANCE.get("gui.screen")); // Set active according to valid biomes. Set activeBiomeTypes = new HashSet<>(); diff --git a/src/main/java/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java index aab75ee4f..772109c29 100755 --- a/src/main/java/forestry/apiculture/gui/GuiImprinter.java +++ b/src/main/java/forestry/apiculture/gui/GuiImprinter.java @@ -14,6 +14,10 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.apiculture.PluginApiculture; import forestry.apiculture.genetics.BeeGenome; @@ -25,9 +29,6 @@ import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.render.ColourProperties; import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; public class GuiImprinter extends GuiForestry { private final ItemInventoryImprinter itemInventory; @@ -56,21 +57,21 @@ public class GuiImprinter extends GuiForestry { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - int offset = (138 - fontRendererObj.getStringWidth(Translator.translateToLocal("for.gui.imprinter.name"))) / 2; - fontRendererObj.drawString(Translator.translateToLocal("for.gui.imprinter.name"), startX + 8 + offset, startY + 16, ColourProperties.INSTANCE.get("gui.screen")); + + int offset = (138 - fontRenderer.getStringWidth(Translator.translateToLocal("for.gui.imprinter.name"))) / 2; + fontRenderer.drawString(Translator.translateToLocal("for.gui.imprinter.name"), startX + 8 + offset, startY + 16, ColourProperties.INSTANCE.get("gui.screen")); IAlleleBeeSpecies primary = itemInventory.getPrimary(); drawBeeSpeciesIcon(primary, startX + 12, startY + 32); - fontRendererObj.drawString(primary.getAlleleName(), startX + 32, startY + 36, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(primary.getAlleleName(), startX + 32, startY + 36, ColourProperties.INSTANCE.get("gui.screen")); IAlleleBeeSpecies secondary = itemInventory.getSecondary(); drawBeeSpeciesIcon(secondary, startX + 12, startY + 52); - fontRendererObj.drawString(secondary.getAlleleName(), startX + 32, startY + 56, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(secondary.getAlleleName(), startX + 32, startY + 56, ColourProperties.INSTANCE.get("gui.screen")); String youCheater = Translator.translateToLocal("for.gui.imprinter.cheater"); - offset = (138 - fontRendererObj.getStringWidth(youCheater)) / 2; - fontRendererObj.drawString(youCheater, startX + 8 + offset, startY + 76, ColourProperties.INSTANCE.get("gui.screen")); + offset = (138 - fontRenderer.getStringWidth(youCheater)) / 2; + fontRenderer.drawString(youCheater, startX + 8 + offset, startY + 76, ColourProperties.INSTANCE.get("gui.screen")); } diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index 2a8cba56f..802ffb110 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -12,13 +12,6 @@ package forestry.apiculture.items; import javax.annotation.Nullable; -import forestry.api.apiculture.ApicultureCapabilities; -import forestry.api.arboriculture.ArboricultureCapabilities; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.apiculture.PluginApiculture; -import forestry.core.config.Constants; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; @@ -26,11 +19,20 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.apiculture.ApicultureCapabilities; +import forestry.api.arboriculture.ArboricultureCapabilities; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.apiculture.PluginApiculture; +import forestry.core.config.Constants; + public class ItemArmorApiarist extends ItemArmor implements IItemModelRegister { public ItemArmorApiarist(EntityEquipmentSlot equipmentSlotIn) { diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 8d8973a8d..28b1e7d49 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -13,6 +13,19 @@ package forestry.apiculture.items; import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -28,16 +41,6 @@ import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import forestry.core.items.IColoredItem; import forestry.core.utils.Translator; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBeeGE extends ItemGE implements IColoredItem { @@ -81,7 +84,7 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { if (itemstack.getTagCompound() == null) { return; } @@ -94,12 +97,12 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { list.add(TextFormatting.YELLOW + Translator.translateToLocal("for.bees.stock.ignoble")); } } - - super.addInformation(itemstack, player, list, flag); + + super.addInformation(itemstack, world, list, flag); } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { addCreativeItems(subItems, true); } diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java old mode 100644 new mode 100755 index 4e0a04d26..688284533 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -10,8 +10,24 @@ ******************************************************************************/ package forestry.apiculture.items; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ISpriteRegister; @@ -25,17 +41,6 @@ import forestry.apiculture.render.TextureHabitatLocator; import forestry.core.items.ItemWithGui; import forestry.core.utils.ClimateUtil; import forestry.core.utils.Translator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister { private static final String iconName = "forestry:items/biomefinder"; @@ -69,18 +74,22 @@ public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); - - Biome currentBiome = player.world.getBiome(player.getPosition()); - - float temperatureValue = ClimateUtil.getTemperature(player.world, player.getPosition()); - EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue); - EnumHumidity humidity = EnumHumidity.getFromValue(ClimateUtil.getHumidity(player.world, player.getPosition())); - - list.add(Translator.translateToLocal("for.gui.currentBiome") + ": " + currentBiome.getBiomeName()); - list.add(Translator.translateToLocal("for.gui.temperature") + ": " + AlleleManager.climateHelper.toDisplay(temperature)); - list.add(Translator.translateToLocal("for.gui.humidity") + ": " + AlleleManager.climateHelper.toDisplay(humidity)); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); + + Minecraft minecraft = Minecraft.getMinecraft(); + if (world != null && minecraft.player != null) { + EntityPlayerSP player = minecraft.player; + Biome currentBiome = player.world.getBiome(player.getPosition()); + + float temperatureValue = ClimateUtil.getTemperature(world, player.getPosition()); + EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue); + EnumHumidity humidity = EnumHumidity.getFromValue(ClimateUtil.getHumidity(world, player.getPosition())); + + list.add(Translator.translateToLocal("for.gui.currentBiome") + ": " + currentBiome.getBiomeName()); + list.add(Translator.translateToLocal("for.gui.temperature") + ": " + AlleleManager.climateHelper.toDisplay(temperature)); + list.add(Translator.translateToLocal("for.gui.humidity") + ": " + AlleleManager.climateHelper.toDisplay(humidity)); + } } @Override diff --git a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java index b191b74cc..c88089b3b 100755 --- a/src/main/java/forestry/apiculture/items/ItemHiveFrame.java +++ b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java @@ -10,8 +10,16 @@ ******************************************************************************/ package forestry.apiculture.items; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -21,10 +29,6 @@ import forestry.api.apiculture.IHiveFrame; import forestry.api.core.Tabs; import forestry.core.items.ItemForestry; import forestry.core.utils.Translator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHiveFrame extends ItemForestry implements IHiveFrame { @@ -55,9 +59,9 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); - beeModifier.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { + super.addInformation(stack, world, tooltip, advanced); + beeModifier.addInformation(stack, world, tooltip, advanced); if (!stack.isItemDamaged()) { tooltip.add(Translator.translateToLocalFormatted("item.for.durability", stack.getMaxDamage())); } @@ -82,7 +86,7 @@ public class ItemHiveFrame extends ItemForestry implements IHiveFrame { } @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { tooltip.add(Translator.translateToLocalFormatted("item.for.bee.modifier.production", production)); tooltip.add(Translator.translateToLocalFormatted("item.for.bee.modifier.genetic.decay", geneticDecay)); } diff --git a/src/main/java/forestry/apiculture/items/ItemHoneyComb.java b/src/main/java/forestry/apiculture/items/ItemHoneyComb.java index ab3690e62..6df677657 100755 --- a/src/main/java/forestry/apiculture/items/ItemHoneyComb.java +++ b/src/main/java/forestry/apiculture/items/ItemHoneyComb.java @@ -15,17 +15,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.core.config.Config; import forestry.core.items.IColoredItem; import forestry.core.items.ItemForestry; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHoneyComb extends ItemForestry implements IColoredItem { public ItemHoneyComb() { @@ -59,7 +61,7 @@ public class ItemHoneyComb extends ItemForestry implements IColoredItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < EnumHoneyComb.VALUES.length; i++) { EnumHoneyComb honeyComb = EnumHoneyComb.get(i); if (!honeyComb.isSecret() || Config.isDebug) { diff --git a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java old mode 100644 new mode 100755 index 393eda088..feed5f00c --- a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.apiculture.items; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.apiculture.entities.EntityMinecartApiary; -import forestry.apiculture.entities.EntityMinecartBeeHousingBase; -import forestry.apiculture.entities.EntityMinecartBeehouse; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.creativetab.CreativeTabs; @@ -30,9 +25,16 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.apiculture.entities.EntityMinecartApiary; +import forestry.apiculture.entities.EntityMinecartBeeHousingBase; +import forestry.apiculture.entities.EntityMinecartBeehouse; + public class ItemMinecartBeehouse extends ItemMinecart implements IItemModelRegister { private final String[] definition = new String[]{"cart.beehouse", "cart.apiary"}; @@ -94,7 +96,7 @@ public class ItemMinecartBeehouse extends ItemMinecart implements IItemModelRegi } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < definition.length; i++) { subItems.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/apiculture/items/ItemSmoker.java b/src/main/java/forestry/apiculture/items/ItemSmoker.java old mode 100644 new mode 100755 index 8de1b2b28..95c6a3628 --- a/src/main/java/forestry/apiculture/items/ItemSmoker.java +++ b/src/main/java/forestry/apiculture/items/ItemSmoker.java @@ -2,12 +2,6 @@ package forestry.apiculture.items; import javax.annotation.Nullable; -import forestry.api.apiculture.ApicultureCapabilities; -import forestry.api.apiculture.IHiveTile; -import forestry.api.core.Tabs; -import forestry.core.items.ItemForestry; -import forestry.core.render.ParticleRender; -import forestry.core.tiles.TileUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -21,9 +15,17 @@ import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import forestry.api.apiculture.ApicultureCapabilities; +import forestry.api.apiculture.IHiveTile; +import forestry.api.core.Tabs; +import forestry.core.items.ItemForestry; +import forestry.core.render.ParticleRender; +import forestry.core.tiles.TileUtil; + public class ItemSmoker extends ItemForestry { public ItemSmoker() { super(Tabs.tabApiculture); @@ -72,16 +74,16 @@ public class ItemSmoker extends ItemForestry { } else { handOffset = look.crossProduct(new Vec3d(0, -1, 0)); } - - Vec3d lookDistance = new Vec3d(look.xCoord * distance, look.yCoord * distance, look.zCoord * distance); + + Vec3d lookDistance = new Vec3d(look.x * distance, look.y * distance, look.z * distance); Vec3d scaledOffset = handOffset.scale(1.0 / distance); Vec3d smokePos = lookDistance.add(entity.getPositionVector()).add(scaledOffset); if (world.isRemote) { - ParticleRender.addEntitySmokeFX(world, smokePos.xCoord, smokePos.yCoord + 1, smokePos.zCoord); + ParticleRender.addEntitySmokeFX(world, smokePos.x, smokePos.y + 1, smokePos.z); } - - BlockPos blockPos = new BlockPos(smokePos.xCoord, smokePos.yCoord + 1, smokePos.zCoord); + + BlockPos blockPos = new BlockPos(smokePos.x, smokePos.y + 1, smokePos.z); TileUtil.actOnTile(world, blockPos, IHiveTile.class, IHiveTile::calmBees); } diff --git a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java index 71ab6353b..aa36ca7e9 100755 --- a/src/main/java/forestry/apiculture/render/ModelAnalyzer.java +++ b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture.render; -import forestry.core.render.ForestryResource; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -18,9 +17,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.render.ForestryResource; + @SideOnly(Side.CLIENT) public class ModelAnalyzer extends ModelBase { diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index e285fdb5a..81dfa6715 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -14,21 +14,23 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; +import net.minecraftforge.event.terraingen.TerrainGen; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.apiculture.PluginApiculture; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.utils.Log; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; -import net.minecraftforge.event.terraingen.TerrainGen; public abstract class HiveDecorator { diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java old mode 100644 new mode 100755 index 95c9374bb..1d87fc85d --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -15,6 +15,28 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTorch; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.structure.StructureBoundingBox; +import net.minecraft.world.gen.structure.StructureComponent; +import net.minecraft.world.gen.structure.StructureVillagePieces; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.registries.ForgeRegistry; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -41,25 +63,6 @@ import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; import forestry.plugins.ForestryPluginUids; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoor; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.BlockLog; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockTorch; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; -import net.minecraft.world.gen.structure.StructureVillagePieces; -import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; -import net.minecraftforge.fml.common.registry.VillagerRegistry; public class VillageApiaristHouse extends StructureVillagePieces.House1 { @@ -372,12 +375,12 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { @Override protected int chooseProfession(int villagerCount, int currentVillagerProfession) { - FMLControlledNamespacedRegistry registry = (FMLControlledNamespacedRegistry) VillagerRegistry.instance().getRegistry(); + ForgeRegistry registry = (ForgeRegistry) ForgeRegistries.VILLAGER_PROFESSIONS; if (villagerCount <= 0) { - return registry.getId(PluginApiculture.villagerApiarist); + return registry.getID(PluginApiculture.villagerApiarist); } else if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { - return registry.getId(PluginArboriculture.villagerArborist); + return registry.getID(PluginArboriculture.villagerArborist); } else { return currentVillagerProfession; } diff --git a/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java b/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java old mode 100644 new mode 100755 index 81a49cb11..58f26e35e --- a/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java +++ b/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java @@ -11,11 +11,9 @@ package forestry.arboriculture; import com.google.common.base.Preconditions; -import forestry.api.core.CamouflageManager; -import forestry.api.core.ICamouflageHandler; -import forestry.api.core.ICamouflageItemHandler; -import forestry.api.core.ICamouflagedTile; -import forestry.arboriculture.items.ItemBlockWoodDoor; + +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.BlockDoor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -24,9 +22,15 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; + +import forestry.api.core.CamouflageManager; +import forestry.api.core.ICamouflageHandler; +import forestry.api.core.ICamouflageItemHandler; +import forestry.api.core.ICamouflagedTile; +import forestry.arboriculture.items.ItemBlockWoodDoor; public class CamouflageHandlerArbDoor implements ICamouflageItemHandler { @@ -57,8 +61,8 @@ public class CamouflageHandlerArbDoor implements ICamouflageItemHandler { IBlockState currentState = blockState.getActualState(world, pos); ItemBlockWoodDoor itemDoor = (ItemBlockWoodDoor) stack.getItem(); - - IBlockState doorState = itemDoor.block.getDefaultState() + + IBlockState doorState = itemDoor.getBlock().getDefaultState() .withProperty(BlockDoor.FACING, currentState.getValue(BlockDoor.FACING)) .withProperty(BlockDoor.HINGE, currentState.getValue(BlockDoor.HINGE)) .withProperty(BlockDoor.OPEN, currentState.getValue(BlockDoor.OPEN)) diff --git a/src/main/java/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java index b0c092027..aa98b2568 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderNone.java +++ b/src/main/java/forestry/arboriculture/FruitProviderNone.java @@ -16,11 +16,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.genetics.IFruitFamily; -import forestry.core.config.Constants; -import forestry.core.utils.Translator; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; @@ -29,9 +24,16 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.IFruitFamily; +import forestry.core.config.Constants; +import forestry.core.utils.Translator; + public class FruitProviderNone implements IFruitProvider { private static class OverlayType { diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 3c415db79..dd2ba1856 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -17,21 +17,23 @@ import java.util.Locale; import java.util.Map; import java.util.Random; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.IFruitFamily; -import forestry.core.utils.BlockUtil; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IFruitFamily; +import forestry.core.utils.BlockUtil; + public class FruitProviderPod extends FruitProviderNone { public enum EnumPodType { diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index 81fd22f27..34acd6865 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -15,15 +15,16 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.IFruitFamily; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IFruitFamily; + /** * Simple fruit provider which drops from any leaf block according to yield and either marks all leave blocks as fruit leaves or none. */ diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index 005532c75..c5f8847a0 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -15,15 +15,16 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.IFruitFamily; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IFruitFamily; + public class FruitProviderRipening extends FruitProviderNone { private final Map products = new HashMap<>(); private int colourCallow = 0xffffff; diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java old mode 100644 new mode 100755 index ed2505eeb..4615cd21b --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -27,14 +27,12 @@ import net.minecraft.block.BlockNewLeaf; import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -43,19 +41,17 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.oredict.OreDictionary; - import net.minecraftforge.fml.common.IFuelHandler; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.VillagerRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumGermlingType; @@ -79,7 +75,6 @@ import forestry.arboriculture.blocks.BlockArbLog; import forestry.arboriculture.blocks.BlockArbSlab; import forestry.arboriculture.blocks.BlockDefaultLeaves; import forestry.arboriculture.blocks.BlockForestryLeaves; -import forestry.arboriculture.blocks.BlockForestryLog; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.capabilities.ArmorNaturalist; import forestry.arboriculture.charcoal.CharcoalPileWall; @@ -262,7 +257,7 @@ public class PluginArboriculture extends BlankForestryPlugin { if (Config.enableVillagers) { villagerArborist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_ARBORIST, Constants.TEXTURE_SKIN_LUMBERJACK, Constants.TEXTURE_SKIN_ZOMBIE_LUMBERJACK); - VillagerRegistry.instance().register(villagerArborist); + ForgeRegistries.VILLAGER_PROFESSIONS.register(villagerArborist); VillagerRegistry.VillagerCareer arboristCareer = new VillagerRegistry.VillagerCareer(villagerArborist, "arborist"); arboristCareer.addTrade(1, @@ -336,7 +331,7 @@ public class PluginArboriculture extends BlankForestryPlugin { slabs.setCount(6); planks.setCount(1); - RecipeUtil.addPriorityRecipe(slabs.copy(), "###", '#', planks.copy()); + RecipeUtil.addRecipe(slabs.copy(), "###", '#', planks.copy()); fences.setCount(3); planks.setCount(1); @@ -354,7 +349,7 @@ public class PluginArboriculture extends BlankForestryPlugin { stairs.setCount(4); planks.setCount(1); - RecipeUtil.addPriorityRecipe(stairs.copy(), + RecipeUtil.addRecipe(stairs.copy(), "# ", "## ", "###", @@ -362,7 +357,7 @@ public class PluginArboriculture extends BlankForestryPlugin { doors.setCount(3); planks.setCount(1); - RecipeUtil.addPriorityRecipe(doors.copy(), + RecipeUtil.addRecipe(doors.copy(), "## ", "## ", "## ", @@ -375,7 +370,7 @@ public class PluginArboriculture extends BlankForestryPlugin { fireproofSlabs.setCount(6); fireproofPlanks.setCount(1); - RecipeUtil.addPriorityRecipe(fireproofSlabs.copy(), + RecipeUtil.addRecipe(fireproofSlabs.copy(), "###", '#', fireproofPlanks.copy()); @@ -395,7 +390,7 @@ public class PluginArboriculture extends BlankForestryPlugin { fireproofStairs.setCount(4); fireproofPlanks.setCount(1); - RecipeUtil.addPriorityRecipe(fireproofStairs.copy(), + RecipeUtil.addRecipe(fireproofStairs.copy(), "# ", "## ", "###", @@ -403,7 +398,7 @@ public class PluginArboriculture extends BlankForestryPlugin { doors.setCount(3); fireproofPlanks.setCount(1); - RecipeUtil.addPriorityRecipe(doors.copy(), + RecipeUtil.addRecipe(doors.copy(), "## ", "## ", "## ", @@ -682,20 +677,4 @@ public class PluginArboriculture extends BlankForestryPlugin { } } } - - @SubscribeEvent(priority = EventPriority.HIGH) - public void handleItemPickup(EntityItemPickupEvent event) { - if (event.isCanceled()) { - return; - } - EntityItem pickedUp = event.getItem(); - ItemStack stack = pickedUp.getEntityItem(); - if(!stack.isEmpty()){ - Block block = Block.getBlockFromItem(stack.getItem()); - if(block != null && block instanceof BlockForestryLog){ - EntityPlayer player = event.getEntityPlayer(); - player.addStat(AchievementList.MINE_WOOD); - } - } - } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockAbstractLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockAbstractLeaves.java old mode 100644 new mode 100755 index 644cf8e45..95196e0cc --- a/src/main/java/forestry/arboriculture/blocks/BlockAbstractLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockAbstractLeaves.java @@ -5,18 +5,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.IToolGrafter; -import forestry.api.arboriculture.ITree; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.Tabs; -import forestry.arboriculture.LeafDecayHelper; -import forestry.arboriculture.genetics.TreeDefinition; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.blocks.IColoredBlock; -import forestry.core.proxy.Proxies; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.BlockUtil; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockPlanks; import net.minecraft.block.state.IBlockState; @@ -36,9 +24,21 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.mojang.authlib.GameProfile; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IToolGrafter; +import forestry.api.arboriculture.ITree; +import forestry.api.core.IItemModelRegister; +import forestry.arboriculture.LeafDecayHelper; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.core.blocks.IColoredBlock; +import forestry.core.proxy.Proxies; +import forestry.core.utils.BlockUtil; + /** * Parent class for shared behavior between {@link BlockDefaultLeaves} and {@link BlockForestryLeaves} */ @@ -56,7 +56,7 @@ public abstract class BlockAbstractLeaves extends BlockLeaves implements IItemMo public abstract IBlockState getStateFromMeta(int meta); @Override - public final void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public final void getSubBlocks(CreativeTabs tab, NonNullList list) { // creative menu shows BlockDecorativeLeaves instead of these } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java old mode 100644 new mode 100755 index d90ecf484..98cfa0d92 --- a/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockDecorativeLeaves.java @@ -5,14 +5,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.arboriculture.genetics.TreeDefinition; -import forestry.core.blocks.IColoredBlock; -import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -32,11 +24,21 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.arboriculture.genetics.TreeDefinition; +import forestry.core.blocks.IColoredBlock; +import forestry.core.proxy.Proxies; + public abstract class BlockDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable { private static final int VARIANTS_PER_BLOCK = 16; @@ -79,10 +81,10 @@ public abstract class BlockDecorativeLeaves extends Block implements IItemModelR } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (IBlockState state : getBlockState().getValidStates()) { int meta = getMetaFromState(state); - ItemStack itemStack = new ItemStack(itemIn, 1, meta); + ItemStack itemStack = new ItemStack(this, 1, meta); list.add(itemStack); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryFence.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFence.java old mode 100644 new mode 100755 index 908b030f2..04d5aa46b --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFence.java @@ -2,6 +2,27 @@ package forestry.arboriculture.blocks; import java.util.Collection; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; @@ -10,31 +31,8 @@ import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.WoodHelper; import forestry.arboriculture.proxy.ProxyArboricultureClient; -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockForestryFence & IWoodType> extends BlockFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { protected static final int VARIANTS_PER_BLOCK = 16; @@ -74,26 +72,6 @@ public abstract class BlockForestryFence & IWoodType> extends return blockNumber; } - @Override - public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { - IBlockState blockState = worldIn.getBlockState(pos); - Block block = blockState.getBlock(); - if (PluginArboriculture.validFences.contains(block)) { - return true; - } - - if (block != Blocks.BARRIER) { - Material blockMaterial = blockState.getMaterial(); - if (block instanceof BlockFence || block instanceof BlockFenceGate) { - return blockMaterial == this.blockMaterial; - } - if (blockMaterial.isOpaque() && blockState.isFullCube() && blockMaterial != Material.GOURD) { - return true; - } - } - return false; - } - /* Models */ @SideOnly(Side.CLIENT) @Override @@ -166,7 +144,7 @@ public abstract class BlockForestryFence & IWoodType> extends } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (T woodType : getVariant().getAllowedValues()) { list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java old mode 100644 new mode 100755 index 6ab2d66fe..420c7c349 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java @@ -13,17 +13,6 @@ package forestry.arboriculture.blocks; import java.util.Collection; import java.util.Collections; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.WoodHelper.WoodMeshDefinition; -import forestry.arboriculture.proxy.ProxyArboricultureClient; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks.EnumType; import net.minecraft.block.SoundType; @@ -37,9 +26,22 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodHelper; +import forestry.arboriculture.WoodHelper.WoodMeshDefinition; +import forestry.arboriculture.proxy.ProxyArboricultureClient; + public class BlockForestryFenceGate & IWoodType> extends BlockFenceGate implements IWoodTyped, IItemModelRegister, IStateMapperRegister { private final boolean fireproof; @@ -99,7 +101,7 @@ public class BlockForestryFenceGate & IWoodType> extends Block } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java old mode 100644 new mode 100755 index 6366289fe..a40cf354f --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLog.java @@ -2,16 +2,6 @@ package forestry.arboriculture.blocks; import java.util.Collection; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.proxy.ProxyArboricultureClient; import net.minecraft.block.BlockLog; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -25,9 +15,21 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodHelper; +import forestry.arboriculture.proxy.ProxyArboricultureClient; + public abstract class BlockForestryLog & IWoodType> extends BlockLog implements IWoodTyped, IStateMapperRegister, IItemModelRegister { protected static final int VARIANTS_PER_BLOCK = 4; @@ -127,7 +129,7 @@ public abstract class BlockForestryLog & IWoodType> extends Bl } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (T woodType : getVariant().getAllowedValues()) { list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryPlanks.java old mode 100644 new mode 100755 index 80865e87e..bff9c0d0b --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryPlanks.java @@ -2,16 +2,6 @@ package forestry.arboriculture.blocks; import java.util.Collection; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.Tabs; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.proxy.ProxyArboricultureClient; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -28,9 +18,21 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.WoodHelper; +import forestry.arboriculture.proxy.ProxyArboricultureClient; + public abstract class BlockForestryPlanks & IWoodType> extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { protected static final int VARIANTS_PER_BLOCK = 16; @@ -103,7 +105,7 @@ public abstract class BlockForestryPlanks & IWoodType> extends } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (T woodType : getVariant().getAllowedValues()) { list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestrySlab.java b/src/main/java/forestry/arboriculture/blocks/BlockForestrySlab.java old mode 100644 new mode 100755 index 1a15a53ef..b548465d1 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestrySlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestrySlab.java @@ -138,7 +138,7 @@ public abstract class BlockForestrySlab & IWoodType> extends B } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { if (!isDouble()) { for (T woodType : getVariant().getAllowedValues()) { list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); diff --git a/src/main/java/forestry/arboriculture/blocks/PropertyTree.java b/src/main/java/forestry/arboriculture/blocks/PropertyTree.java old mode 100644 new mode 100755 index b81f07330..f542be262 --- a/src/main/java/forestry/arboriculture/blocks/PropertyTree.java +++ b/src/main/java/forestry/arboriculture/blocks/PropertyTree.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.blocks; +import com.google.common.base.MoreObjects; + import java.util.ArrayList; import java.util.List; import java.util.Locale; -import com.google.common.base.Objects; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -34,7 +35,7 @@ public class PropertyTree extends PropertyAllele { @Override public String toString() { - return Objects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleTreeSpecies.class).add("values", this.getAllowedValues()).toString(); + return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleTreeSpecies.class).add("values", this.getAllowedValues()).toString(); } @Override diff --git a/src/main/java/forestry/arboriculture/commands/ForestSpawner.java b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java old mode 100644 new mode 100755 index 51bc35298..b1b2da102 --- a/src/main/java/forestry/arboriculture/commands/ForestSpawner.java +++ b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java @@ -10,23 +10,24 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import forestry.core.commands.SpeciesNotFoundException; -import forestry.core.commands.TemplateNotFoundException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.gen.feature.WorldGenerator; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; + public class ForestSpawner implements ITreeSpawner { @Override public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) throws SpeciesNotFoundException, TemplateNotFoundException { Vec3d look = player.getLookVec(); - - int x = (int) Math.round(player.posX + 16 * look.xCoord); + + int x = (int) Math.round(player.posX + 16 * look.x); int y = (int) Math.round(player.posY); - int z = (int) Math.round(player.posZ + 16 * look.zCoord); + int z = (int) Math.round(player.posZ + 16 * look.z); for (int i = 0; i < 16; i++) { int spawnX = x + player.world.rand.nextInt(32) - 16; diff --git a/src/main/java/forestry/arboriculture/commands/TreeSpawner.java b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java old mode 100644 new mode 100755 index 0cf1f9ed6..d127cb099 --- a/src/main/java/forestry/arboriculture/commands/TreeSpawner.java +++ b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java @@ -10,23 +10,24 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import forestry.core.commands.SpeciesNotFoundException; -import forestry.core.commands.TemplateNotFoundException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.gen.feature.WorldGenerator; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; + public class TreeSpawner implements ITreeSpawner { @Override public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) throws SpeciesNotFoundException, TemplateNotFoundException { Vec3d look = player.getLookVec(); - - int x = (int) Math.round(player.posX + 3 * look.xCoord); + + int x = (int) Math.round(player.posX + 3 * look.x); int y = (int) Math.round(player.posY); - int z = (int) Math.round(player.posZ + 3 * look.zCoord); + int z = (int) Math.round(player.posZ + 3 * look.z); BlockPos pos = new BlockPos(x, y, z); WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, pos); diff --git a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java index 83067cf43..ae22c92e4 100755 --- a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java +++ b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.arboriculture.IArboristTracker; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.arboriculture.PluginArboriculture; import forestry.core.genetics.BreedingTracker; -import net.minecraft.entity.player.EntityPlayer; public class ArboristTracker extends BreedingTracker implements IArboristTracker { diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 702625135..0fa2df545 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -17,7 +17,25 @@ import java.util.List; import java.util.Map; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -38,21 +56,6 @@ import forestry.core.config.Config; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; import forestry.core.utils.Translator; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class Tree extends Individual implements ITree, IPlantable { private final ITreeGenome genome; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java old mode 100644 new mode 100755 index ea9e8f840..91a0aac5b --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -15,7 +15,19 @@ import java.awt.Color; import java.util.Arrays; import java.util.Locale; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.MinecraftForge; + import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; @@ -83,16 +95,6 @@ import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.tiles.TileUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.MinecraftForge; public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSerializable { Oak(TreeBranchDefinition.QUERCUS, "appleOak", "robur", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), EnumVanillaWoodType.OAK) { @@ -1054,6 +1056,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe public final String getUID() { return species.getUID(); } + + public final String getUnlocalizedName() { + return species.getUnlocalizedName(); + } @Override public final ITreeGenome getGenome() { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index af6f09381..306b3a0d3 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -10,9 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleLeafEffect; @@ -27,8 +31,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class TreeGenome extends Genome implements ITreeGenome { @Nullable diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 7b402f0d5..c1af4e382 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; @@ -19,8 +22,6 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class TreeMutation extends Mutation implements ITreeMutation, ITreeMutationBuilder { diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java b/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java old mode 100644 new mode 100755 index 50d1fb74d..71ba62ade --- a/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockDecorativeLeaves.java @@ -1,15 +1,17 @@ package forestry.arboriculture.items; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; import forestry.arboriculture.blocks.BlockDecorativeLeaves; import forestry.arboriculture.genetics.TreeDefinition; import forestry.core.items.IColoredItem; import forestry.core.items.ItemBlockForestry; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBlockDecorativeLeaves extends ItemBlockForestry implements IColoredItem { public ItemBlockDecorativeLeaves(Block block) { @@ -21,8 +23,7 @@ public class ItemBlockDecorativeLeaves extends ItemBlockForestry subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { addCreativeItems(subItems, true); } diff --git a/src/main/java/forestry/arboriculture/items/ItemGrafter.java b/src/main/java/forestry/arboriculture/items/ItemGrafter.java index 6c85cbb84..853e51620 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGrafter.java +++ b/src/main/java/forestry/arboriculture/items/ItemGrafter.java @@ -10,24 +10,28 @@ ******************************************************************************/ package forestry.arboriculture.items; +import javax.annotation.Nullable; import java.util.List; -import forestry.api.arboriculture.IToolGrafter; -import forestry.api.core.Tabs; -import forestry.core.items.ItemForestryTool; -import forestry.core.utils.Translator; import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IToolGrafter; +import forestry.api.core.Tabs; +import forestry.core.items.ItemForestryTool; +import forestry.core.utils.Translator; + public class ItemGrafter extends ItemForestryTool implements IToolGrafter { public ItemGrafter(int maxDamage) { super(ItemStack.EMPTY); @@ -40,8 +44,8 @@ public class ItemGrafter extends ItemForestryTool implements IToolGrafter { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { + super.addInformation(stack, world, tooltip, advanced); if (!stack.isItemDamaged()) { tooltip.add(Translator.translateToLocalFormatted("item.for.uses", stack.getMaxDamage() + 1)); } diff --git a/src/main/java/forestry/arboriculture/models/MultipartModel.java b/src/main/java/forestry/arboriculture/models/MultipartModel.java old mode 100644 new mode 100755 index f1003d7ee..a896b4838 --- a/src/main/java/forestry/arboriculture/models/MultipartModel.java +++ b/src/main/java/forestry/arboriculture/models/MultipartModel.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.models; -import java.util.Collection; - -import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + +import java.util.Collection; +import java.util.function.Function; + import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.MultipartBakedModel; import net.minecraft.client.renderer.block.model.multipart.Multipart; @@ -22,16 +23,15 @@ import net.minecraft.client.renderer.block.model.multipart.Selector; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IRetexturableModel; -import net.minecraftforge.client.model.ModelProcessingHelper; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class MultipartModel implements IRetexturableModel { +public class MultipartModel implements IModel { private final ResourceLocation location; private final Multipart multipart; @@ -65,8 +65,7 @@ public class MultipartModel implements IRetexturableModel { } @Override - public IBakedModel bake(IModelState state, VertexFormat format, - Function bakedTextureGetter) { + public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { MultipartBakedModel.Builder builder = new MultipartBakedModel.Builder(); for (Selector selector : multipart.getSelectors()) { @@ -84,7 +83,7 @@ public class MultipartModel implements IRetexturableModel { ImmutableMap.Builder builder = ImmutableMap.builder(); for (Selector selector : multipart.getSelectors()) { IModel model = new SimpleModel(location, selector.getVariantList()); - model = ModelProcessingHelper.retexture(model, textures); + model = model.retexture(textures); builder.put(selector, model); } return new MultipartModel(location, multipart, builder.build()); diff --git a/src/main/java/forestry/arboriculture/models/SimpleModel.java b/src/main/java/forestry/arboriculture/models/SimpleModel.java old mode 100644 new mode 100755 index c62cd311d..9e66996a9 --- a/src/main/java/forestry/arboriculture/models/SimpleModel.java +++ b/src/main/java/forestry/arboriculture/models/SimpleModel.java @@ -10,17 +10,20 @@ ******************************************************************************/ package forestry.arboriculture.models; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import java.util.function.Function; + +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.Variant; @@ -29,19 +32,17 @@ import net.minecraft.client.renderer.block.model.WeightedBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IRetexturableModel; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.ModelProcessingHelper; import net.minecraftforge.client.model.MultiModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; @SideOnly(Side.CLIENT) -public class SimpleModel implements IRetexturableModel { +public class SimpleModel implements IModel { private static final ModelResourceLocation MISSING = new ModelResourceLocation("builtin/missing", "missing"); @@ -104,10 +105,9 @@ public class SimpleModel implements IRetexturableModel { public Collection getTextures() { return ImmutableSet.copyOf(textures); } - + @Override - public IBakedModel bake(IModelState state, VertexFormat format, - Function bakedTextureGetter) { + public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { if (variants.size() == 1) { IModel model = models.get(0); return model.bake(MultiModelState.getPartState(state, model, 0), format, bakedTextureGetter); @@ -150,7 +150,7 @@ public class SimpleModel implements IRetexturableModel { for (ResourceLocation location : model.getDependencies()) { ModelLoaderRegistry.getModelOrMissing(location); } - model = ModelProcessingHelper.retexture(model, textures); + model = model.retexture(textures); models.add(model); builder.add(Pair.of(model, variant.getState())); diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java index 270e4d745..88a9d5233 100755 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.proxy; -import forestry.arboriculture.IWoodTyped; import net.minecraft.block.Block; +import forestry.arboriculture.IWoodTyped; + public class ProxyArboriculture { public void initializeModels() { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java index 3431a1fb0..7c6a7c2c2 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenAcacia extends WorldGenTree { public WorldGenAcacia(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 1718df052..30c5d2b00 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -16,16 +16,19 @@ import java.util.List; import java.util.Random; import java.util.Set; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.event.terraingen.TerrainGen; + import forestry.api.world.ITreeGenData; import forestry.arboriculture.blocks.BlockSapling; import forestry.arboriculture.tiles.TileTreeContainer; import forestry.core.tiles.TileUtil; import forestry.core.utils.TopDownBlockPosComparator; import forestry.core.worldgen.WorldGenBase; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.event.terraingen.TerrainGen; public abstract class WorldGenArboriculture extends WorldGenBase { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java index 034591dd4..3a7f4e97f 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java @@ -13,12 +13,13 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenBalsa extends WorldGenTree { public WorldGenBalsa(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java index 01d5d4057..d90d10159 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java @@ -14,11 +14,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenBaobab extends WorldGenTree { public WorldGenBaobab(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java index ff42aa05c..868722684 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenCherry extends WorldGenTree { public WorldGenCherry(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java index 1041bf3f1..19dd0a315 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java @@ -14,11 +14,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenChestnut extends WorldGenTree { public WorldGenChestnut(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java index 2f321a9c2..9a8891a9e 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java @@ -13,11 +13,12 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenDate extends WorldGenTree { public WorldGenDate(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java index 819770e95..2ced0bae0 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenEbony extends WorldGenTree { public WorldGenEbony(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java index af5d8686e..0139351df 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenGreenheart extends WorldGenTree { public WorldGenGreenheart(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java index 3a19445a2..3cfaed687 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + /** * This is a dummy and needs to be replaced with something proper. */ diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java index 235eaa46e..a33cbf10b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenKapok extends WorldGenTree { public WorldGenKapok(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java index 90429c765..998d27508 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java @@ -13,11 +13,12 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenLarch extends WorldGenTree { public WorldGenLarch(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java index 26d684121..b4561f26b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java @@ -13,11 +13,12 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenLemon extends WorldGenTree { public WorldGenLemon(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java index 5d8e798c5..34b7d06c7 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenMahoe extends WorldGenTree { public WorldGenMahoe(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java index 458acf641..4349cca82 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenMahogany extends WorldGenTree { public WorldGenMahogany(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java index 178a369d8..8903b90e6 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenMaple extends WorldGenTree { public WorldGenMaple(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java index e286cdd8f..1e72b9e4c 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java @@ -14,11 +14,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenPapaya extends WorldGenTree { public WorldGenPapaya(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java index a4a57be57..c0540c21b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenPine extends WorldGenTree { public WorldGenPine(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java index 55d63ad6a..b7c521d3a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java @@ -13,11 +13,12 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenPlum extends WorldGenTree { public WorldGenPlum(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java index d563fca52..d9cf9fba1 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java @@ -13,11 +13,12 @@ package forestry.arboriculture.worldgen; import java.util.List; import java.util.Random; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenPoplar extends WorldGenTree { public WorldGenPoplar(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java index 0bf84095a..6d02d49f3 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenSequoia extends WorldGenTree { public WorldGenSequoia(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java index f1835c80f..c488c8ad8 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenSpruce extends WorldGenTree { public WorldGenSpruce(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java index b39606d18..5d3ab9238 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java @@ -14,11 +14,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenTeak extends WorldGenTree { public WorldGenTeak(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java index b49595878..95af9c16f 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java @@ -16,12 +16,13 @@ import java.util.List; import java.util.Random; import java.util.Set; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.TreeManager; import forestry.api.world.ITreeGenData; import forestry.core.worldgen.WorldGenHelper; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public abstract class WorldGenTree extends WorldGenArboriculture { private static final int minHeight = 4; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java index 70449c7e4..ef82df270 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenWalnut extends WorldGenTree { public WorldGenWalnut(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java index 0aa6b94ab..28e986335 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenWenge extends WorldGenTree { public WorldGenWenge(ITreeGenData tree) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java index 8e347c6bd..9d69cbdc8 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java @@ -15,11 +15,12 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.world.ITreeGenData; -import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; +import forestry.core.worldgen.WorldGenHelper; + public class WorldGenWillow extends WorldGenTree { public WorldGenWillow(ITreeGenData tree) { diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index eed760dba..56605785c 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -10,6 +10,13 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.arboriculture.EnumGermlingType; @@ -26,11 +33,6 @@ import forestry.core.config.Constants; import forestry.lepidopterology.genetics.Butterfly; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.plugins.ForestryPluginUids; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; public class CreativeTabForestry extends CreativeTabs { diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 96994dc6d..79dd3d3a2 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -13,20 +13,12 @@ package forestry.core; import java.net.URL; import java.util.Collection; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.Constants; -import forestry.core.errors.ErrorStateRegistry; -import forestry.core.models.ModelBlockCached; -import forestry.core.render.TextureManagerForestry; -import forestry.plugins.PluginManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.LootTable; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; @@ -37,6 +29,16 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.config.Constants; +import forestry.core.errors.ErrorStateRegistry; +import forestry.core.models.ModelBlockCached; +import forestry.core.render.TextureManagerForestry; +import forestry.plugins.PluginManager; + public class EventHandlerCore { public EventHandlerCore() { diff --git a/src/main/java/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java index 9595715a1..2911b7098 100755 --- a/src/main/java/forestry/core/PickupHandlerCore.java +++ b/src/main/java/forestry/core/PickupHandlerCore.java @@ -10,19 +10,20 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class PickupHandlerCore implements IPickupHandler { @Override public boolean onItemPickup(EntityPlayer entityPlayer, EntityItem entityitem) { - ItemStack itemstack = entityitem.getEntityItem(); + ItemStack itemstack = entityitem.getItem(); if (itemstack.isEmpty()) { return false; } diff --git a/src/main/java/forestry/core/PluginFluids.java b/src/main/java/forestry/core/PluginFluids.java old mode 100644 new mode 100755 index 5b9278789..275aec529 --- a/src/main/java/forestry/core/PluginFluids.java +++ b/src/main/java/forestry/core/PluginFluids.java @@ -10,9 +10,19 @@ ******************************************************************************/ package forestry.core; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; @@ -27,14 +37,6 @@ import forestry.core.utils.Log; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.common.registry.GameRegistry; @ForestryPlugin(pluginID = ForestryPluginUids.FLUIDS, name = "Fluids", author = "mezz", url = Constants.URL, unlocalizedDescription = "for.plugin.fluids.description") public class PluginFluids extends BlankForestryPlugin { @@ -68,11 +70,11 @@ public class PluginFluids extends BlankForestryPlugin { String name = "fluid." + forestryFluid.getTag(); fluidBlock.setUnlocalizedName("forestry." + name); fluidBlock.setRegistryName(name); - GameRegistry.register(fluidBlock); + ForgeRegistries.BLOCKS.register(fluidBlock); ItemBlock itemBlock = new ItemBlock(fluidBlock); itemBlock.setRegistryName(name); - GameRegistry.register(itemBlock); + ForgeRegistries.ITEMS.register(itemBlock); Proxies.render.registerFluidStateMapper(fluidBlock, forestryFluid); if (forestryFluid.getOtherContainers().isEmpty()) { diff --git a/src/main/java/forestry/core/TickHandlerCoreClient.java b/src/main/java/forestry/core/TickHandlerCoreClient.java index 3ed970777..af9d76215 100755 --- a/src/main/java/forestry/core/TickHandlerCoreClient.java +++ b/src/main/java/forestry/core/TickHandlerCoreClient.java @@ -10,16 +10,18 @@ ******************************************************************************/ package forestry.core; -import forestry.core.utils.GeneticsUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.entity.player.EntityPlayer; + import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.utils.GeneticsUtil; + @SideOnly(Side.CLIENT) public class TickHandlerCoreClient { diff --git a/src/main/java/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java index 45bc6d98f..8490e396a 100755 --- a/src/main/java/forestry/core/TickHandlerCoreServer.java +++ b/src/main/java/forestry/core/TickHandlerCoreServer.java @@ -10,23 +10,26 @@ ******************************************************************************/ package forestry.core; +import com.google.common.collect.LinkedListMultimap; + import java.util.List; import java.util.Random; -import com.google.common.collect.LinkedListMultimap; -import forestry.core.config.Config; -import forestry.core.config.Constants; -import forestry.core.worldgen.WorldGenerator; -import forestry.plugins.PluginManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; +import forestry.core.config.Config; +import forestry.core.config.Constants; +import forestry.core.worldgen.WorldGenerator; +import forestry.plugins.PluginManager; + public class TickHandlerCoreServer { private final WorldGenerator worldGenerator; @@ -65,9 +68,9 @@ public class TickHandlerCoreServer { Random random = new Random(worldSeed); long xSeed = random.nextLong() >> 2 + 1L; long zSeed = random.nextLong() >> 2 + 1L; - random.setSeed(xSeed * coords.xCoord + zSeed * coords.zCoord ^ worldSeed); - - worldGenerator.retroGen(random, coords.xCoord, coords.zCoord, world); + random.setSeed(xSeed * coords.x + zSeed * coords.z ^ worldSeed); + + worldGenerator.retroGen(random, coords.x, coords.z, world); } } } @@ -98,13 +101,13 @@ public class TickHandlerCoreServer { private static class ChunkCoords { public final int dimension; - public final int xCoord; - public final int zCoord; + public final int x; + public final int z; public ChunkCoords(Chunk chunk) { this.dimension = chunk.getWorld().provider.getDimension(); - this.xCoord = chunk.xPosition; - this.zCoord = chunk.zPosition; + this.x = chunk.x; + this.z = chunk.z; } } diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java old mode 100644 new mode 100755 index 96bd67502..366c5fba2 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -12,19 +12,6 @@ package forestry.core.blocks; import javax.annotation.Nullable; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.ITextureManager; -import forestry.core.circuits.ISocketable; -import forestry.core.render.MachineParticleCallback; -import forestry.core.render.MachineStateMapper; -import forestry.core.render.ParticleHelper; -import forestry.core.tiles.TileBase; -import forestry.core.tiles.TileForestry; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.InventoryUtil; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -52,14 +39,26 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.ISpriteRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.ITextureManager; +import forestry.core.circuits.ISocketable; +import forestry.core.render.MachineParticleCallback; +import forestry.core.render.MachineStateMapper; +import forestry.core.render.ParticleHelper; +import forestry.core.tiles.TileBase; +import forestry.core.tiles.TileForestry; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.InventoryUtil; + public class BlockBase

& IBlockType & IStringSerializable> extends BlockForestry implements IItemModelRegister, ISpriteRegister, IStateMapperRegister, IBlockRotatable { /** * use this instead of {@link BlockHorizontal#FACING} so the blocks rotate in a circle instead of NSWE order. @@ -156,13 +155,8 @@ public class BlockBase

& IBlockType & IStringSerializable> ext ItemStack heldItem = playerIn.getHeldItem(hand); if (!playerIn.isSneaking()) { - if (tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing)) { - IFluidHandler tileFluidHandler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing); - FluidActionResult fluidActionResult = FluidUtil.interactWithFluidHandler(heldItem, tileFluidHandler, playerIn); - if (fluidActionResult.isSuccess()) { - playerIn.setHeldItem(hand, fluidActionResult.getResult()); - return true; - } + if (FluidUtil.interactWithFluidHandler(playerIn, hand, worldIn, pos, facing)) { + return true; } } diff --git a/src/main/java/forestry/core/blocks/BlockBogEarth.java b/src/main/java/forestry/core/blocks/BlockBogEarth.java old mode 100644 new mode 100755 index 2d6a61240..bcc5a421f --- a/src/main/java/forestry/core/blocks/BlockBogEarth.java +++ b/src/main/java/forestry/core/blocks/BlockBogEarth.java @@ -14,11 +14,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; -import forestry.core.PluginCore; -import forestry.core.config.Constants; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -36,10 +31,17 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.PluginCore; +import forestry.core.config.Constants; + /** * bog earth, which becomes peat */ @@ -163,7 +165,7 @@ public class BlockBogEarth extends Block implements IItemModelRegister, IBlockWi } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { list.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/forestry/core/blocks/BlockHumus.java b/src/main/java/forestry/core/blocks/BlockHumus.java old mode 100644 new mode 100755 index 02b6d2dc1..b8b7f0d1e --- a/src/main/java/forestry/core/blocks/BlockHumus.java +++ b/src/main/java/forestry/core/blocks/BlockHumus.java @@ -4,11 +4,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; -import forestry.core.config.Config; -import forestry.core.config.Constants; import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.block.IGrowable; @@ -27,11 +22,18 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.config.Config; +import forestry.core.config.Constants; + public class BlockHumus extends Block implements IItemModelRegister { private static final int degradeDelimiter = Config.humusDegradeDelimiter; public static final PropertyInteger DEGRADE = PropertyInteger.create("degrade", 0, degradeDelimiter); // degradation level of humus @@ -134,7 +136,7 @@ public class BlockHumus extends Block implements IItemModelRegister { } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { list.add(new ItemStack(this)); } diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java old mode 100644 new mode 100755 index ec8a444a3..2c2048c33 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -11,18 +11,19 @@ package forestry.core.blocks; import javax.annotation.Nullable; - import java.util.Locale; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.oredict.OreDictionary; + import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; import forestry.plugins.PluginManager; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; public abstract class BlockRegistry { protected void registerBlock(T block, @Nullable ItemBlock itemBlock, String name) { @@ -36,14 +37,14 @@ public abstract class BlockRegistry { block.setUnlocalizedName("for." + name); block.setRegistryName(name); - GameRegistry.register(block); + ForgeRegistries.BLOCKS.register(block); Proxies.common.registerBlock(block); MigrationHelper.addBlockName(name); if (itemBlock != null) { itemBlock.setRegistryName(name); - GameRegistry.register(itemBlock); + ForgeRegistries.ITEMS.register(itemBlock); Proxies.common.registerItem(itemBlock); MigrationHelper.addItemName(name); } diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java old mode 100644 new mode 100755 index 3aeedf823..dca02f842 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -13,10 +13,6 @@ package forestry.core.blocks; import java.util.ArrayList; import java.util.List; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; -import forestry.core.PluginCore; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -30,9 +26,15 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.PluginCore; + public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta { public static final PropertyEnum ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, input -> input != null && input.hasOre()); @@ -104,7 +106,7 @@ public class BlockResourceOre extends Block implements IItemModelRegister, IBloc } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (EnumResourceType resourceType : ORE_RESOURCES.getAllowedValues()) { list.add(get(resourceType, 1)); } diff --git a/src/main/java/forestry/core/blocks/BlockResourceStorage.java b/src/main/java/forestry/core/blocks/BlockResourceStorage.java old mode 100644 new mode 100755 index 84293d18e..4a245f831 --- a/src/main/java/forestry/core/blocks/BlockResourceStorage.java +++ b/src/main/java/forestry/core/blocks/BlockResourceStorage.java @@ -1,8 +1,5 @@ package forestry.core.blocks; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -12,9 +9,14 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; + public class BlockResourceStorage extends Block implements IItemModelRegister, IBlockWithMeta { public static final PropertyEnum STORAGE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class); @@ -42,7 +44,7 @@ public class BlockResourceStorage extends Block implements IItemModelRegister, I } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (EnumResourceType resourceType : EnumResourceType.VALUES) { list.add(get(resourceType)); } diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 9d60fb058..e2a929f17 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -14,6 +14,13 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuit; @@ -21,11 +28,6 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class CircuitBoard implements ICircuitBoard { diff --git a/src/main/java/forestry/core/circuits/CircuitLibrary.java b/src/main/java/forestry/core/circuits/CircuitLibrary.java index 3b95e0295..5212582b0 100755 --- a/src/main/java/forestry/core/circuits/CircuitLibrary.java +++ b/src/main/java/forestry/core/circuits/CircuitLibrary.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.core.circuits; -import forestry.api.circuits.ICircuitLibrary; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.WorldSavedData; + +import forestry.api.circuits.ICircuitLibrary; public class CircuitLibrary extends WorldSavedData implements ICircuitLibrary { diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index c6a3cf9a2..a559ef87c 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -14,6 +14,10 @@ import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; @@ -21,9 +25,6 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; import forestry.core.PluginCore; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class CircuitRegistry implements ICircuitRegistry { diff --git a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java index 6e91a1f45..ed5c3e20a 100755 --- a/src/main/java/forestry/core/circuits/ContainerSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java @@ -10,6 +10,12 @@ ******************************************************************************/ package forestry.core.circuits; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.circuits.ICircuitLayout; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.IGuiSelectable; @@ -21,10 +27,6 @@ import forestry.core.network.IForestryPacketServer; import forestry.core.network.packets.PacketGuiLayoutSelect; import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.utils.NetworkUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerSolderingIron extends ContainerItemInventory implements IGuiSelectable { diff --git a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java index fd0a6171a..db29eb0c9 100755 --- a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java +++ b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.core.circuits; -import forestry.core.render.ColourProperties; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.render.ColourProperties; + public enum EnumCircuitBoardType { BASIC(1), ENHANCED(2), diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index 3005827b7..049346ef6 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -13,6 +13,10 @@ package forestry.core.circuits; import java.io.IOException; import java.util.Locale; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; @@ -22,9 +26,6 @@ import forestry.core.gui.GuiForestry; import forestry.core.inventory.ItemInventorySolderingIron; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class GuiSolderingIron extends GuiForestry { private final ItemInventorySolderingIron itemInventory; @@ -43,7 +44,7 @@ public class GuiSolderingIron extends GuiForestry { ICircuitLayout layout = ((ContainerSolderingIron) inventorySlots).getLayout(); String title = layout.getName(); - fontRendererObj.drawString(title, guiLeft + 8 + textLayout.getCenteredOffset(title, 138), guiTop + 16, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(title, guiLeft + 8 + textLayout.getCenteredOffset(title, 138), guiTop + 16, ColourProperties.INSTANCE.get("gui.screen")); for (int i = 0; i < 4; i++) { String description; @@ -56,7 +57,7 @@ public class GuiSolderingIron extends GuiForestry { } int row = i * 20; - fontRendererObj.drawString(description, guiLeft + 32, guiTop + 36 + row, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(description, guiLeft + 32, guiTop + 36 + row, ColourProperties.INSTANCE.get("gui.screen")); if (tube.isEmpty()) { ICircuitSocketType socketType = layout.getSocketType(); @@ -64,7 +65,7 @@ public class GuiSolderingIron extends GuiForestry { FarmDirection farmDirection = FarmDirection.values()[i]; String farmDirectionString = farmDirection.toString().toLowerCase(Locale.ENGLISH); String localizedDirection = Translator.translateToLocal("for.gui.solder." + farmDirectionString); - fontRendererObj.drawString(localizedDirection, guiLeft + 17, guiTop + 36 + row, ColourProperties.INSTANCE.get("gui.screen")); + fontRenderer.drawString(localizedDirection, guiLeft + 17, guiTop + 36 + row, ColourProperties.INSTANCE.get("gui.screen")); } } } diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index b64ed3c37..a249946a3 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -14,6 +14,17 @@ import javax.annotation.Nullable; import java.util.List; import java.util.Locale; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; @@ -22,14 +33,6 @@ import forestry.api.core.IModelManager; import forestry.core.PluginCore; import forestry.core.items.IColoredItem; import forestry.core.items.ItemForestry; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCircuitBoard extends ItemForestry implements IColoredItem { @@ -38,7 +41,7 @@ public class ItemCircuitBoard extends ItemForestry implements IColoredItem { } @Override - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { subItems.add(createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{})); subItems.add(createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{})); subItems.add(createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{})); @@ -81,8 +84,8 @@ public class ItemCircuitBoard extends ItemForestry implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); ICircuitBoard circuitboard = ChipsetManager.circuitRegistry.getCircuitBoard(itemstack); if (circuitboard != null) { circuitboard.addTooltip(list); diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index 9449bda26..4ce247750 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -26,7 +26,6 @@ import java.util.Properties; import java.util.Set; import net.minecraftforge.common.config.Property; - import net.minecraftforge.fml.relauncher.Side; import forestry.Forestry; diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java old mode 100644 new mode 100755 index 15fb000d1..c9bd5dd3d --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.core.entities; -import forestry.core.gui.GuiHandler; -import forestry.core.gui.IGuiHandlerEntity; -import forestry.core.tiles.ITitled; -import forestry.core.utils.Translator; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; @@ -22,9 +18,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraft.world.World; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; +import forestry.core.gui.GuiHandler; +import forestry.core.gui.IGuiHandlerEntity; +import forestry.core.tiles.ITitled; +import forestry.core.utils.Translator; + public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IGuiHandlerEntity { @SuppressWarnings("unused") @@ -85,7 +87,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I // fix cart contents rendering as black in the End dimension @Override - public float getBrightness(float p_70013_1_) { + public float getBrightness() { return 1.0f; } diff --git a/src/main/java/forestry/core/entities/ParticleIgnition.java b/src/main/java/forestry/core/entities/ParticleIgnition.java old mode 100644 new mode 100755 index 97ef80eb7..b5a595559 --- a/src/main/java/forestry/core/entities/ParticleIgnition.java +++ b/src/main/java/forestry/core/entities/ParticleIgnition.java @@ -11,10 +11,11 @@ package forestry.core.entities; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -44,10 +45,10 @@ public class ParticleIgnition extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); - super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); + super.renderParticle(buffer, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); } /** diff --git a/src/main/java/forestry/core/entities/ParticleSmoke.java b/src/main/java/forestry/core/entities/ParticleSmoke.java old mode 100644 new mode 100755 index 26a2d9852..1803afc9c --- a/src/main/java/forestry/core/entities/ParticleSmoke.java +++ b/src/main/java/forestry/core/entities/ParticleSmoke.java @@ -11,10 +11,11 @@ package forestry.core.entities; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.entity.Entity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,10 +44,10 @@ public class ParticleSmoke extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); - super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); + super.renderParticle(buffer, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); } /** diff --git a/src/main/java/forestry/core/entities/ParticleSnow.java b/src/main/java/forestry/core/entities/ParticleSnow.java old mode 100644 new mode 100755 index 9eb6240be..6e67d0b84 --- a/src/main/java/forestry/core/entities/ParticleSnow.java +++ b/src/main/java/forestry/core/entities/ParticleSnow.java @@ -11,7 +11,7 @@ package forestry.core.entities; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.world.World; @@ -37,7 +37,7 @@ public class ParticleSnow extends Particle { } @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { double x = this.prevPosX + (this.posX - this.prevPosX) * partialTicks - interpPosX; double y = this.prevPosY + (this.posY - this.prevPosY) * partialTicks - interpPosY; double z = this.prevPosZ + (this.posZ - this.prevPosZ) * partialTicks - interpPosZ; @@ -56,17 +56,17 @@ public class ParticleSnow extends Particle { } for (int i = 0; i < 5; i++) { - renderParticle(worldRendererIn, x, y, z, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY, minU, maxU, minV, maxV, scale, partialTicks); + renderParticle(buffer, x, y, z, rotationX, rotationXZ, rotationZ, rotationYZ, rotationXY, minU, maxU, minV, maxV, scale, partialTicks); } } - - private void renderParticle(VertexBuffer worldRendererIn, double x, double y, double z, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY, float minU, float maxU, float minV, float maxV, float scale, float timeStep) { + + private void renderParticle(BufferBuilder buffer, double x, double y, double z, float rotationX, float rotationXZ, float rotationZ, float rotationYZ, float rotationXY, float minU, float maxU, float minV, float maxV, float scale, float timeStep) { int i = this.getBrightnessForRender(timeStep); int j = i >> 16 & 65535; int k = i & 65535; - worldRendererIn.pos(x - rotationX * scale - rotationYZ * scale, y - rotationXZ * scale, z - rotationZ * scale - rotationXY * scale).tex(maxU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); - worldRendererIn.pos(x - rotationX * scale + rotationYZ * scale, y + rotationXZ * scale, z - rotationZ * scale + rotationXY * scale).tex(maxU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); - worldRendererIn.pos(x + rotationX * scale + rotationYZ * scale, y + rotationXZ * scale, z + rotationZ * scale + rotationXY * scale).tex(minU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); - worldRendererIn.pos(x + rotationX * scale - rotationYZ * scale, y - rotationXZ * scale, z + rotationZ * scale - rotationXY * scale).tex(minU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + buffer.pos(x - rotationX * scale - rotationYZ * scale, y - rotationXZ * scale, z - rotationZ * scale - rotationXY * scale).tex(maxU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + buffer.pos(x - rotationX * scale + rotationYZ * scale, y + rotationXZ * scale, z - rotationZ * scale + rotationXY * scale).tex(maxU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + buffer.pos(x + rotationX * scale + rotationYZ * scale, y + rotationXZ * scale, z + rotationZ * scale + rotationXY * scale).tex(minU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); + buffer.pos(x + rotationX * scale - rotationYZ * scale, y - rotationXZ * scale, z + rotationZ * scale - rotationXY * scale).tex(minU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha).lightmap(j, k).endVertex(); } } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index 90a79005a..6fed56c36 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -17,7 +17,17 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.storage.WorldSavedData; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; + import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; @@ -27,13 +37,6 @@ import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.network.packets.PacketGenomeTrackerSync; import forestry.core.utils.NetworkUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayer; public abstract class BreedingTracker extends WorldSavedData implements IBreedingTracker { diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 9cc846e5b..fa6f0fb84 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -13,12 +13,13 @@ package forestry.core.genetics; import javax.annotation.Nullable; import java.util.Random; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; public class Chromosome implements IChromosome { private static final String UID0_TAG = "UID0"; diff --git a/src/main/java/forestry/core/genetics/EffectData.java b/src/main/java/forestry/core/genetics/EffectData.java index 9bc4f2882..b6c0e02cb 100755 --- a/src/main/java/forestry/core/genetics/EffectData.java +++ b/src/main/java/forestry/core/genetics/EffectData.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.core.genetics; -import forestry.api.genetics.IEffectData; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.genetics.IEffectData; + public class EffectData implements IEffectData { private final int[] intData; diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index cf9c26827..4ba96db6a 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -10,20 +10,22 @@ ******************************************************************************/ package forestry.core.genetics; +import com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.Arrays; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public abstract class Genome implements IGenome { private static final String SLOT_TAG = "Slot"; @@ -244,7 +246,7 @@ public abstract class Genome implements IGenome { @Override public String toString() { - Objects.ToStringHelper toStringHelper = Objects.toStringHelper(this); + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); int i = 0; for (IChromosome chromosome : chromosomes) { toStringHelper.add(String.valueOf(i++), chromosome); diff --git a/src/main/java/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java index 8ffe21b69..3453fe2c7 100755 --- a/src/main/java/forestry/core/genetics/Individual.java +++ b/src/main/java/forestry/core/genetics/Individual.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.core.genetics; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; -import net.minecraft.nbt.NBTTagCompound; public abstract class Individual implements IIndividual { protected boolean isAnalyzed; diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index 797d9f775..5ac090e77 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -12,11 +12,12 @@ package forestry.core.genetics; import javax.annotation.Nullable; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividualLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IIndividualLiving; + public abstract class IndividualLiving extends Individual implements IIndividualLiving { private int health; diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index ce7b03a79..21176a7f0 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -13,17 +13,20 @@ package forestry.core.genetics; import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.core.items.ItemForestry; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class ItemGE extends ItemForestry { protected ItemGE(CreativeTabs creativeTab) { @@ -62,7 +65,7 @@ public abstract class ItemGE extends ItemForestry { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { if (itemstack.getTagCompound() == null) { return; } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 2e3ea985c..a4c76452d 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -15,7 +15,23 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; @@ -27,18 +43,6 @@ import forestry.core.items.ItemForestry; import forestry.core.utils.NetworkUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.Translator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemResearchNote extends ItemForestry { @@ -279,8 +283,8 @@ public class ItemResearchNote extends ItemForestry { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); ResearchNote note = new ResearchNote(itemstack.getTagCompound()); note.addTooltip(list); } diff --git a/src/main/java/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java index ac53e3be6..793652083 100755 --- a/src/main/java/forestry/core/genetics/SpeciesRoot.java +++ b/src/main/java/forestry/core/genetics/SpeciesRoot.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.core.genetics; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -19,9 +22,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Random; -import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; @@ -30,7 +33,6 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IIndividualTranslator; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public abstract class SpeciesRoot implements ISpeciesRoot { /* TRANSLATORS */ diff --git a/src/main/java/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java index d200e48ee..8fc01ecd1 100755 --- a/src/main/java/forestry/core/gui/ContainerAnalyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAnalyzer.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.core.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.gui.slots.SlotOutput; import forestry.core.gui.slots.SlotWorking; import forestry.core.inventory.InventoryAnalyzer; import forestry.core.tiles.TileAnalyzer; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerAnalyzer extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/core/gui/ContainerEscritoire.java b/src/main/java/forestry/core/gui/ContainerEscritoire.java index aa2660b82..a428ec706 100755 --- a/src/main/java/forestry/core/gui/ContainerEscritoire.java +++ b/src/main/java/forestry/core/gui/ContainerEscritoire.java @@ -10,14 +10,15 @@ ******************************************************************************/ package forestry.core.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; + import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotOutput; import forestry.core.inventory.InventoryEscritoire; import forestry.core.network.packets.PacketGuiUpdate; import forestry.core.tiles.EscritoireGame; import forestry.core.tiles.TileEscritoire; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; public class ContainerEscritoire extends ContainerTile implements IGuiSelectable { private long lastUpdate; diff --git a/src/main/java/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 3ab811d98..fd8a718dc 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -10,14 +10,15 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.gui.slots.SlotLocked; -import forestry.core.inventory.ItemInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import forestry.core.gui.slots.SlotLocked; +import forestry.core.inventory.ItemInventory; + public abstract class ContainerItemInventory extends ContainerForestry { protected final I inventory; diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 411dda3d3..c95eeff8c 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -10,16 +10,18 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.tiles.ILiquidTankTile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.tiles.ILiquidTankTile; + public abstract class ContainerLiquidTanks extends ContainerTile implements IContainerLiquidTanks { private final ContainerLiquidTanksHelper helper; diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 4a8081c98..6de27a3ec 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -10,15 +10,16 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.gui.slots.SlotFilteredInventory; -import forestry.core.tiles.IFilterSlotDelegate; -import forestry.core.tiles.TileNaturalistChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; +import forestry.core.gui.slots.SlotFilteredInventory; +import forestry.core.tiles.IFilterSlotDelegate; +import forestry.core.tiles.TileNaturalistChest; + public class ContainerNaturalistInventory extends ContainerTile implements IGuiSelectable { public ContainerNaturalistInventory(InventoryPlayer player, TileNaturalistChest tile, int page) { diff --git a/src/main/java/forestry/core/gui/ContainerSocketed.java b/src/main/java/forestry/core/gui/ContainerSocketed.java index 912bf1345..f45de0b36 100755 --- a/src/main/java/forestry/core/gui/ContainerSocketed.java +++ b/src/main/java/forestry/core/gui/ContainerSocketed.java @@ -10,14 +10,16 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.core.circuits.ISocketable; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.circuits.ISocketable; + public abstract class ContainerSocketed extends ContainerTile implements IContainerSocketed { private final ContainerSocketedHelper helper; diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 5f688d593..e281d7865 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -17,6 +17,14 @@ import java.util.Locale; import java.util.Map; import java.util.Stack; +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; @@ -39,12 +47,6 @@ import forestry.core.gui.widgets.WidgetManager; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.StringUtils; public class GuiAlyzer extends GuiForestry { @@ -205,8 +207,8 @@ public class GuiAlyzer extends GuiForestry { String title = Translator.translateToLocal("for.gui.portablealyzer").toUpperCase(); textLayout.drawCenteredLine(title, 8, 208, ColourProperties.INSTANCE.get("gui.screen")); textLayout.newLine(); - - fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.portablealyzer.help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, ColourProperties.INSTANCE.get("gui.screen")); + + fontRenderer.drawSplitString(Translator.translateToLocal("for.gui.portablealyzer.help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, ColourProperties.INSTANCE.get("gui.screen")); textLayout.newLine(); textLayout.newLine(); textLayout.newLine(); @@ -272,7 +274,7 @@ public class GuiAlyzer extends GuiForestry { textLayout.drawLine(Translator.translateToLocal("for.gui.alyzer.authority") + ": " + individual.getGenome().getPrimary().getAuthority(), 12); if (AlleleManager.alleleRegistry.isBlacklisted(individual.getIdent())) { String extinct = ">> " + Translator.translateToLocal("for.gui.alyzer.extinct").toUpperCase() + " <<"; - fontRendererObj.drawStringWithShadow(extinct, guiLeft + 200 - fontRendererObj.getStringWidth(extinct), + fontRenderer.drawStringWithShadow(extinct, guiLeft + 200 - fontRenderer.getStringWidth(extinct), guiTop + textLayout.getLineY(), ColourProperties.INSTANCE.get("gui.beealyzer.dominant")); } @@ -285,7 +287,7 @@ public class GuiAlyzer extends GuiForestry { textLayout.drawSplitLine(tokens[0], 12, 200, 0x666666); if (tokens.length > 1) { String signature = "- " + tokens[1]; - fontRendererObj.drawStringWithShadow(signature, guiLeft + 210 - fontRendererObj.getStringWidth(signature), guiTop + 145 - 14, 0x99cc32); + fontRenderer.drawStringWithShadow(signature, guiLeft + 210 - fontRenderer.getStringWidth(signature), guiTop + 145 - 14, 0x99cc32); } } @@ -392,7 +394,7 @@ public class GuiAlyzer extends GuiForestry { boolean researched = breedingTracker.isResearched(combination); if (researched) { - fontRendererObj.drawString("+", x + 9, y + 1, 0); + fontRenderer.drawString("+", x + 9, y + 1, 0); GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); } } @@ -462,8 +464,8 @@ public class GuiAlyzer extends GuiForestry { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); String fertilityString = Integer.toString(fertility) + " x"; - - int stringWidth = fontRendererObj.getStringWidth(fertilityString); + + int stringWidth = fontRenderer.getStringWidth(fertilityString); bindTexture(textureFile); drawTexturedModalRect(guiLeft + x + stringWidth + 2, guiTop + textLayout.getLineY() - 1, 60, 240 + texOffset, 12, 8); diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index f221bb080..a74e4cf06 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.core.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.widgets.TankWidget; import forestry.core.render.EnumTankLevel; import forestry.core.tiles.TileAnalyzer; -import net.minecraft.entity.player.InventoryPlayer; public class GuiAnalyzer extends GuiForestryTitled { private final TileAnalyzer tile; diff --git a/src/main/java/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java index 42de934b1..2a1786dc4 100755 --- a/src/main/java/forestry/core/gui/GuiEscritoire.java +++ b/src/main/java/forestry/core/gui/GuiEscritoire.java @@ -10,6 +10,12 @@ ******************************************************************************/ package forestry.core.gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + import forestry.core.config.Constants; import forestry.core.gui.widgets.GameTokenWidget; import forestry.core.gui.widgets.ProbeButton; @@ -19,11 +25,6 @@ import forestry.core.tiles.EscritoireGame; import forestry.core.tiles.EscritoireTextSource; import forestry.core.tiles.TileEscritoire; import forestry.core.utils.Translator; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; public class GuiEscritoire extends GuiForestry { private final ItemStack LEVEL_ITEM = new ItemStack(Items.PAPER); diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 3a43292ed..f2add30fd 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -15,6 +15,20 @@ import java.awt.Rectangle; import java.io.IOException; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; + import forestry.api.core.IErrorLogicSource; import forestry.api.core.IErrorSource; import forestry.core.config.Config; @@ -31,18 +45,6 @@ import forestry.core.render.ColourProperties; import forestry.core.render.ForestryResource; import forestry.core.tiles.IClimatised; import forestry.energy.EnergyManager; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; public abstract class GuiForestry extends GuiContainer { protected final C container; @@ -132,7 +134,7 @@ public abstract class GuiForestry extends GuiContainer { } public FontRenderer getFontRenderer() { - return fontRendererObj; + return fontRenderer; } @Override diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index cae124915..674dafdd2 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -14,6 +14,13 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.HashMap; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.IApiaristTracker; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; @@ -29,12 +36,6 @@ import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.render.ColourProperties; import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class GuiNaturalistInventory extends GuiForestry { private final ISpeciesRoot speciesRoot; @@ -64,7 +65,7 @@ public class GuiNaturalistInventory extends GuiForestry { protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { super.drawGuiContainerBackgroundLayer(f, i, j); String header = Translator.translateToLocal("for.gui.page") + " " + (pageCurrent + 1) + "/" + pageMax; - fontRendererObj.drawString(header, guiLeft + 95 + textLayout.getCenteredOffset(header, 98), guiTop + 10, ColourProperties.INSTANCE.get("gui.title")); + fontRenderer.drawString(header, guiLeft + 95 + textLayout.getCenteredOffset(header, 98), guiTop + 10, ColourProperties.INSTANCE.get("gui.title")); IIndividual individual = getIndividualAtPosition(i, j); if (individual == null) { diff --git a/src/main/java/forestry/core/gui/GuiTextBox.java b/src/main/java/forestry/core/gui/GuiTextBox.java index cc924efc2..9d44b592f 100755 --- a/src/main/java/forestry/core/gui/GuiTextBox.java +++ b/src/main/java/forestry/core/gui/GuiTextBox.java @@ -19,15 +19,15 @@ public class GuiTextBox extends GuiTextField { private static final int enabledColor = 14737632; private static final int disabledColor = 7368816; - private final FontRenderer fontRendererObj; + private final FontRenderer fontRenderer; private final int startX, startY, width, height; private int lineScroll = 0; private int maxLines = 0; - public GuiTextBox(int ID, FontRenderer fontRendererObj, int startX, int startY, int width, int height) { - super(ID, fontRendererObj, startX, startY, width, height); - this.fontRendererObj = fontRendererObj; + public GuiTextBox(int ID, FontRenderer fontRenderer, int startX, int startY, int width, int height) { + super(ID, fontRenderer, startX, startY, width, height); + this.fontRenderer = fontRenderer; this.startX = startX; this.startY = startY; this.width = width; @@ -51,7 +51,7 @@ public class GuiTextBox extends GuiTextField { } public boolean moreLinesAllowed() { - return fontRendererObj.listFormattedStringToWidth(getCursoredText(), width).size() * fontRendererObj.FONT_HEIGHT < height; + return fontRenderer.listFormattedStringToWidth(getCursoredText(), width).size() * fontRenderer.FONT_HEIGHT < height; } private String getCursoredText() { @@ -71,7 +71,7 @@ public class GuiTextBox extends GuiTextField { } private void drawScrolledSplitString(String text, int startX, int startY, int width, int textColour) { - List lines = fontRendererObj.listFormattedStringToWidth(text, width); + List lines = fontRenderer.listFormattedStringToWidth(text, width); maxLines = lines.size(); int count = 0; @@ -81,12 +81,12 @@ public class GuiTextBox extends GuiTextField { if (count < lineScroll) { count++; continue; - } else if (lineY + fontRendererObj.FONT_HEIGHT - startY > height) { + } else if (lineY + fontRenderer.FONT_HEIGHT - startY > height) { break; } - fontRendererObj.drawString(line, startX, lineY, textColour); - lineY += fontRendererObj.FONT_HEIGHT; + fontRenderer.drawString(line, startX, lineY, textColour); + lineY += fontRenderer.FONT_HEIGHT; count++; } diff --git a/src/main/java/forestry/core/gui/GuiUtil.java b/src/main/java/forestry/core/gui/GuiUtil.java old mode 100644 new mode 100755 index 246941cd9..acb88a07d --- a/src/main/java/forestry/core/gui/GuiUtil.java +++ b/src/main/java/forestry/core/gui/GuiUtil.java @@ -13,18 +13,20 @@ package forestry.core.gui; import java.util.Collection; import java.util.List; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderItem; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; + @SideOnly(Side.CLIENT) public class GuiUtil { public static void drawItemStack(GuiForestry gui, ItemStack stack, int xPos, int yPos) { @@ -47,7 +49,7 @@ public class GuiUtil { GlStateManager.pushMatrix(); GlStateManager.translate(-gui.getGuiLeft(), -gui.getGuiTop(), 0); ScaledResolution scaledresolution = new ScaledResolution(gui.mc); - GuiUtils.drawHoveringText(lines, mouseX, mouseY, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), -1, gui.mc.fontRendererObj); + GuiUtils.drawHoveringText(lines, mouseX, mouseY, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), -1, gui.mc.fontRenderer); GlStateManager.popMatrix(); } } diff --git a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java index b4a8a296f..23430cf7a 100755 --- a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java +++ b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java @@ -12,18 +12,20 @@ package forestry.core.gui.buttons; import javax.annotation.Nullable; -import forestry.core.config.Constants; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; -import forestry.core.render.ForestryResource; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.config.Constants; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.render.ForestryResource; + @SideOnly(Side.CLIENT) public class GuiBetterButton extends GuiButton implements IToolTipProvider { @@ -81,15 +83,15 @@ public class GuiBetterButton extends GuiButton implements IToolTipProvider { } public boolean isMouseOverButton(int mouseX, int mouseY) { - return mouseX >= xPosition && mouseY >= yPosition && mouseX < xPosition + getWidth() && mouseY < yPosition + getHeight(); + return mouseX >= x && mouseY >= y && mouseX < x + getWidth() && mouseY < y + getHeight(); } - + @Override - public void drawButton(Minecraft minecraft, int mouseX, int mouseY) { + public void drawButton(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) { if (!visible) { return; } - FontRenderer fontrenderer = minecraft.fontRendererObj; + FontRenderer fontrenderer = minecraft.fontRenderer; minecraft.getTextureManager().bindTexture(TEXTURE); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); int xOffset = texture.getX(); @@ -99,13 +101,13 @@ public class GuiBetterButton extends GuiButton implements IToolTipProvider { boolean mouseOver = isMouseOverButton(mouseX, mouseY); int hoverState = getHoverState(mouseOver); if (useTexWidth) { - drawTexturedModalRect(xPosition, yPosition, xOffset, yOffset + hoverState * h, w, h); + drawTexturedModalRect(x, y, xOffset, yOffset + hoverState * h, w, h); } else { - drawTexturedModalRect(xPosition, yPosition, xOffset, yOffset + hoverState * h, width / 2, h); - drawTexturedModalRect(xPosition + width / 2, yPosition, xOffset + w - width / 2, yOffset + hoverState * h, width / 2, h); + drawTexturedModalRect(x, y, xOffset, yOffset + hoverState * h, width / 2, h); + drawTexturedModalRect(x + width / 2, y, xOffset + w - width / 2, yOffset + hoverState * h, width / 2, h); } mouseDragged(minecraft, mouseX, mouseY); - drawCenteredString(fontrenderer, displayString, xPosition + getWidth() / 2, yPosition + (h - 8) / 2, getTextColor(mouseOver)); + drawCenteredString(fontrenderer, displayString, x + getWidth() / 2, y + (h - 8) / 2, getTextColor(mouseOver)); } @Override diff --git a/src/main/java/forestry/core/gui/ledgers/HintLedger.java b/src/main/java/forestry/core/gui/ledgers/HintLedger.java old mode 100644 new mode 100755 index 7fa6346c0..eea35fd23 --- a/src/main/java/forestry/core/gui/ledgers/HintLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/HintLedger.java @@ -13,11 +13,12 @@ package forestry.core.gui.ledgers; import java.util.List; import java.util.Random; -import forestry.core.render.TextureManagerForestry; -import forestry.core.utils.Translator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import forestry.core.render.TextureManagerForestry; +import forestry.core.utils.Translator; + public class HintLedger extends Ledger { private final String hintString; @@ -32,7 +33,7 @@ public class HintLedger extends Ledger { hintTooltip = Translator.translateToLocal("for.hints." + hint + ".tag"); Minecraft minecraft = Minecraft.getMinecraft(); - FontRenderer fontRenderer = minecraft.fontRendererObj; + FontRenderer fontRenderer = minecraft.fontRenderer; int lineCount = fontRenderer.listFormattedStringToWidth(hintString, maxTextWidth).size(); maxHeight = (lineCount + 1) * fontRenderer.FONT_HEIGHT + 20; } diff --git a/src/main/java/forestry/core/gui/ledgers/Ledger.java b/src/main/java/forestry/core/gui/ledgers/Ledger.java old mode 100644 new mode 100755 index 6f60da758..f5da297bb --- a/src/main/java/forestry/core/gui/ledgers/Ledger.java +++ b/src/main/java/forestry/core/gui/ledgers/Ledger.java @@ -13,18 +13,20 @@ package forestry.core.gui.ledgers; import java.awt.Rectangle; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.SessionVars; import forestry.core.gui.GuiForestry; import forestry.core.render.ForestryResource; import forestry.core.render.TextureManagerForestry; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Side ledger for guis @@ -157,8 +159,8 @@ public abstract class Ledger { public boolean handleMouseClicked(int x, int y, int mouseButton) { return false; } - - public boolean intersectsWith(int mouseX, int mouseY) { + + public boolean intersects(int mouseX, int mouseY) { return mouseX >= currentShiftX && mouseX <= currentShiftX + currentWidth && mouseY >= currentShiftY && mouseY <= currentShiftY + getHeight(); } @@ -245,11 +247,11 @@ public abstract class Ledger { protected int drawSplitText(String string, int x, int y, int width, int color, boolean shadow) { int originalY = y; Minecraft minecraft = Minecraft.getMinecraft(); - List strings = minecraft.fontRendererObj.listFormattedStringToWidth(string, width); + List strings = minecraft.fontRenderer.listFormattedStringToWidth(string, width); for (Object obj : strings) { if (obj instanceof String) { - minecraft.fontRendererObj.drawString((String) obj, x, y, color, shadow); - y += minecraft.fontRendererObj.FONT_HEIGHT; + minecraft.fontRenderer.drawString((String) obj, x, y, color, shadow); + y += minecraft.fontRenderer.FONT_HEIGHT; } } return y - originalY; @@ -257,7 +259,7 @@ public abstract class Ledger { protected int drawText(String string, int x, int y) { Minecraft minecraft = Minecraft.getMinecraft(); - minecraft.fontRendererObj.drawString(string, x, y, fontColorText); - return minecraft.fontRendererObj.FONT_HEIGHT; + minecraft.fontRenderer.drawString(string, x, y, fontColorText); + return minecraft.fontRenderer.FONT_HEIGHT; } } diff --git a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java old mode 100644 new mode 100755 index 5e8ae3fd9..1ba4b1d17 --- a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java +++ b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java @@ -15,6 +15,11 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; import forestry.core.config.SessionVars; @@ -22,9 +27,6 @@ import forestry.core.errors.FakeErrorSource; import forestry.core.gui.GuiForestry; import forestry.core.gui.GuiUtil; import forestry.core.gui.tooltips.ToolTip; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class LedgerManager { @@ -90,7 +92,7 @@ public class LedgerManager { ledger.currentShiftX = xShift; ledger.currentShiftY = yShift; - if (ledger.intersectsWith(mX, mY)) { + if (ledger.intersects(mX, mY)) { return ledger; } @@ -108,7 +110,7 @@ public class LedgerManager { errorLedger.currentShiftX = xShiftError - errorLedger.getWidth(); errorLedger.currentShiftY = yShiftError; - if (errorLedger.intersectsWith(mX, mY)) { + if (errorLedger.intersects(mX, mY)) { return errorLedger; } diff --git a/src/main/java/forestry/core/gui/slots/SlotCrafter.java b/src/main/java/forestry/core/gui/slots/SlotCrafter.java index 241e9751e..680f4844b 100755 --- a/src/main/java/forestry/core/gui/slots/SlotCrafter.java +++ b/src/main/java/forestry/core/gui/slots/SlotCrafter.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.core.gui.slots; -import forestry.factory.tiles.ICrafterWorktable; +import com.google.common.collect.Lists; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.stats.AchievementList; +import net.minecraft.item.crafting.IRecipe; + +import forestry.factory.tiles.ICrafterWorktable; public class SlotCrafter extends Slot { @@ -67,7 +65,6 @@ public class SlotCrafter extends Slot { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. * Copied from {@link SlotCrafting#onCrafting(ItemStack)} */ @Override @@ -76,47 +73,14 @@ public class SlotCrafter extends Slot { stack.onCrafting(this.player.world, this.player, this.amountCrafted); net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(this.player, stack, craftMatrix); } - + this.amountCrafted = 0; - - if (stack.getItem() == Item.getItemFromBlock(Blocks.CRAFTING_TABLE)) { - this.player.addStat(AchievementList.BUILD_WORK_BENCH); - } - - if (stack.getItem() instanceof ItemPickaxe) { - this.player.addStat(AchievementList.BUILD_PICKAXE); - } - - if (stack.getItem() == Item.getItemFromBlock(Blocks.FURNACE)) { - this.player.addStat(AchievementList.BUILD_FURNACE); - } - - if (stack.getItem() instanceof ItemHoe) { - this.player.addStat(AchievementList.BUILD_HOE); - } - - if (stack.getItem() == Items.BREAD) { - this.player.addStat(AchievementList.MAKE_BREAD); - } - - if (stack.getItem() == Items.CAKE) { - this.player.addStat(AchievementList.BAKE_CAKE); - } - - if (stack.getItem() instanceof ItemPickaxe && ((ItemPickaxe) stack.getItem()).getToolMaterial() != Item.ToolMaterial.WOOD) { - this.player.addStat(AchievementList.BUILD_BETTER_PICKAXE); - } - - if (stack.getItem() instanceof ItemSword) { - this.player.addStat(AchievementList.BUILD_SWORD); - } - - if (stack.getItem() == Item.getItemFromBlock(Blocks.ENCHANTING_TABLE)) { - this.player.addStat(AchievementList.ENCHANTMENTS); - } - - if (stack.getItem() == Item.getItemFromBlock(Blocks.BOOKSHELF)) { - this.player.addStat(AchievementList.BOOKCASE); + InventoryCraftResult inventorycraftresult = (InventoryCraftResult) this.inventory; + IRecipe irecipe = inventorycraftresult.getRecipeUsed(); + + if (irecipe != null && !irecipe.isHidden()) { + this.player.unlockRecipes(Lists.newArrayList(irecipe)); + inventorycraftresult.setRecipeUsed(null); } } diff --git a/src/main/java/forestry/core/gui/slots/SlotForestry.java b/src/main/java/forestry/core/gui/slots/SlotForestry.java index 212602073..82d698e4c 100755 --- a/src/main/java/forestry/core/gui/slots/SlotForestry.java +++ b/src/main/java/forestry/core/gui/slots/SlotForestry.java @@ -12,16 +12,18 @@ package forestry.core.gui.slots; import javax.annotation.Nullable; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; -import forestry.core.render.TextureManagerForestry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.render.TextureManagerForestry; + public class SlotForestry extends Slot implements IToolTipProvider { private boolean isPhantom; diff --git a/src/main/java/forestry/core/gui/slots/SlotOutput.java b/src/main/java/forestry/core/gui/slots/SlotOutput.java index 9caab156b..73c3e0bcd 100755 --- a/src/main/java/forestry/core/gui/slots/SlotOutput.java +++ b/src/main/java/forestry/core/gui/slots/SlotOutput.java @@ -15,6 +15,7 @@ import javax.annotation.Nullable; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/forestry/core/gui/tooltips/ToolTip.java b/src/main/java/forestry/core/gui/tooltips/ToolTip.java index cde5d5bc7..c2e7b3b6b 100755 --- a/src/main/java/forestry/core/gui/tooltips/ToolTip.java +++ b/src/main/java/forestry/core/gui/tooltips/ToolTip.java @@ -16,6 +16,7 @@ import java.util.Collections; import java.util.List; import net.minecraft.util.text.TextFormatting; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java b/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java old mode 100644 new mode 100755 index 699fe175b..88c1a9af6 --- a/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java +++ b/src/main/java/forestry/core/gui/widgets/ItemStackWidgetBase.java @@ -10,14 +10,17 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import forestry.core.gui.GuiUtil; -import forestry.core.gui.tooltips.ToolTip; import net.minecraft.client.Minecraft; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.gui.GuiUtil; +import forestry.core.gui.tooltips.ToolTip; + public abstract class ItemStackWidgetBase extends Widget { public ItemStackWidgetBase(WidgetManager widgetManager, int xPos, int yPos) { super(widgetManager, xPos, yPos); @@ -41,7 +44,7 @@ public abstract class ItemStackWidgetBase extends Widget { ItemStack itemStack = getItemStack(); ToolTip tip = new ToolTip(); if (!itemStack.isEmpty()) { - tip.add(itemStack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips)); + tip.add(itemStack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); } return tip; } diff --git a/src/main/java/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java index adfb2cea3..c6ebda538 100755 --- a/src/main/java/forestry/core/gui/widgets/SocketWidget.java +++ b/src/main/java/forestry/core/gui/widgets/SocketWidget.java @@ -10,20 +10,23 @@ ******************************************************************************/ package forestry.core.gui.widgets; +import net.minecraft.client.Minecraft; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.circuits.ISocketable; import forestry.core.circuits.ISolderingIron; import forestry.core.circuits.ItemCircuitBoard; import forestry.core.gui.IContainerSocketed; import forestry.core.gui.tooltips.ToolTip; import forestry.core.utils.Translator; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class SocketWidget extends Widget { @@ -59,7 +62,7 @@ public class SocketWidget extends Widget { if (!stack.isEmpty()) { Minecraft minecraft = Minecraft.getMinecraft(); EntityPlayer player = minecraft.player; - toolTip.add(stack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips)); + toolTip.add(stack.getTooltip(player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); toolTip.add(TextFormatting.ITALIC + Translator.translateToLocal("for.gui.socket.remove")); } else { toolTip.add(Translator.translateToLocal("for.gui.emptysocket")); diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index 6567c7631..232df581d 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -12,16 +12,10 @@ package forestry.core.gui.widgets; import javax.annotation.Nullable; -import forestry.api.core.IToolPipette; -import forestry.core.fluids.StandardTank; -import forestry.core.gui.IContainerLiquidTanks; -import forestry.core.gui.tooltips.ToolTip; -import forestry.farming.gui.ContainerFarm; -import forestry.greenhouse.gui.ContainerGreenhouse; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -31,12 +25,20 @@ import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IToolPipette; +import forestry.core.fluids.StandardTank; +import forestry.core.gui.IContainerLiquidTanks; +import forestry.core.gui.tooltips.ToolTip; +import forestry.farming.gui.ContainerFarm; +import forestry.greenhouse.gui.ContainerGreenhouse; + /** * Slot for liquid tanks */ @@ -171,12 +173,12 @@ public class TankWidget extends Widget { vMax = vMax - maskTop / 16.0 * (vMax - vMin); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexBuffer = tessellator.getBuffer(); - vertexBuffer.begin(7, DefaultVertexFormats.POSITION_TEX); - vertexBuffer.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); - vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); - vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex(); - vertexBuffer.pos(xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(7, DefaultVertexFormats.POSITION_TEX); + buffer.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); + buffer.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); + buffer.pos(xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex(); + buffer.pos(xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex(); tessellator.draw(); } diff --git a/src/main/java/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java index 5ac569c69..49f8c3a04 100755 --- a/src/main/java/forestry/core/gui/widgets/Widget.java +++ b/src/main/java/forestry/core/gui/widgets/Widget.java @@ -12,11 +12,12 @@ package forestry.core.gui.widgets; import javax.annotation.Nullable; -import forestry.core.gui.tooltips.IToolTipProvider; -import forestry.core.gui.tooltips.ToolTip; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.gui.tooltips.IToolTipProvider; +import forestry.core.gui.tooltips.ToolTip; + /** * Basic non-ItemStack slot */ diff --git a/src/main/java/forestry/core/gui/widgets/WidgetCamouflageSlot.java b/src/main/java/forestry/core/gui/widgets/WidgetCamouflageSlot.java old mode 100644 new mode 100755 index cc85e42c9..98f2e2f0d --- a/src/main/java/forestry/core/gui/widgets/WidgetCamouflageSlot.java +++ b/src/main/java/forestry/core/gui/widgets/WidgetCamouflageSlot.java @@ -10,22 +10,25 @@ ******************************************************************************/ package forestry.core.gui.widgets; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.CamouflageManager; import forestry.api.core.ICamouflageHandler; import forestry.api.core.ICamouflageItemHandler; import forestry.api.multiblock.IMultiblockController; import forestry.core.gui.tooltips.ToolTip; import forestry.core.utils.Translator; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class WidgetCamouflageSlot extends Widget { private final ICamouflageHandler camouflageHandler; @@ -96,7 +99,7 @@ public class WidgetCamouflageSlot extends Widget { toolTip.add(TextFormatting.ITALIC.toString() + Translator.translateToLocal("for.gui.empty")); } else { Minecraft minecraft = Minecraft.getMinecraft(); - toolTip.add(TextFormatting.ITALIC.toString() + camouflageBlock.getTooltip(minecraft.player, minecraft.gameSettings.advancedItemTooltips)); + toolTip.add(TextFormatting.ITALIC.toString() + camouflageBlock.getTooltip(minecraft.player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); } } }; diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index a2dd8ec74..377ebe81a 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -13,10 +13,6 @@ package forestry.core.inventory; import javax.annotation.Nullable; import java.io.IOException; -import forestry.core.config.Constants; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; -import forestry.core.utils.InventoryUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -25,6 +21,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import forestry.core.config.Constants; +import forestry.core.network.IStreamable; +import forestry.core.network.PacketBufferForestry; +import forestry.core.utils.InventoryUtil; + /** * With permission from Krapht. */ diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index ca983d800..27ba0c419 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -10,11 +10,11 @@ ******************************************************************************/ package forestry.core.inventory; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.Random; -import com.google.common.base.Preconditions; -import forestry.core.tiles.IFilterSlotDelegate; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ItemStackHelper; @@ -25,12 +25,15 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; +import forestry.core.tiles.IFilterSlotDelegate; + public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, ICapabilityProvider { private static final String KEY_SLOTS = "Slots"; private static final String KEY_UID = "UID"; diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index 93ef9c56f..380915ba3 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -13,25 +13,28 @@ package forestry.core.items; import javax.annotation.Nullable; import java.util.List; -import forestry.api.arboriculture.ArboricultureCapabilities; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; -import forestry.core.config.Constants; -import forestry.core.utils.ItemTooltipUtil; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.ArboricultureCapabilities; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.config.Constants; +import forestry.core.utils.ItemTooltipUtil; + public class ItemArmorNaturalist extends ItemArmor implements IItemModelRegister { public ItemArmorNaturalist() { @@ -58,8 +61,8 @@ public class ItemArmorNaturalist extends ItemArmor implements IItemModelRegister @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { + ItemTooltipUtil.addInformation(stack, world, tooltip, advanced); } @Override diff --git a/src/main/java/forestry/core/items/ItemBlockForestry.java b/src/main/java/forestry/core/items/ItemBlockForestry.java old mode 100644 new mode 100755 index c7de3e3b5..b1fced1a6 --- a/src/main/java/forestry/core/items/ItemBlockForestry.java +++ b/src/main/java/forestry/core/items/ItemBlockForestry.java @@ -10,24 +10,28 @@ ******************************************************************************/ package forestry.core.items; +import javax.annotation.Nullable; import java.util.List; -import forestry.core.blocks.IBlockRotatable; -import forestry.core.blocks.IBlockWithMeta; -import forestry.core.tiles.TileForestry; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.ItemTooltipUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.blocks.IBlockRotatable; +import forestry.core.blocks.IBlockWithMeta; +import forestry.core.tiles.TileForestry; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.ItemTooltipUtil; + public class ItemBlockForestry extends ItemBlock { public ItemBlockForestry(Block block) { @@ -60,9 +64,9 @@ public class ItemBlockForestry extends ItemBlock { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); - ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { + super.addInformation(stack, world, tooltip, advanced); + ItemTooltipUtil.addInformation(stack, world, tooltip, advanced); } @Override diff --git a/src/main/java/forestry/core/items/ItemBlockNBT.java b/src/main/java/forestry/core/items/ItemBlockNBT.java old mode 100644 new mode 100755 index 01596d970..cba3f08be --- a/src/main/java/forestry/core/items/ItemBlockNBT.java +++ b/src/main/java/forestry/core/items/ItemBlockNBT.java @@ -10,11 +10,14 @@ ******************************************************************************/ package forestry.core.items; +import javax.annotation.Nullable; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,8 +29,8 @@ public class ItemBlockNBT extends ItemBlockForestry { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean advanced) { - super.addInformation(itemstack, player, info, advanced); + public void addInformation(ItemStack itemstack, @Nullable World world, List info, ITooltipFlag advanced) { + super.addInformation(itemstack, world, info, advanced); if (itemstack.getTagCompound() != null) { info.add("There are still some scribbles on this."); diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java old mode 100644 new mode 100755 index 3888be4e0..01e8c7380 --- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java +++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java @@ -10,14 +10,16 @@ ******************************************************************************/ package forestry.core.items; -import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; + public class ItemCraftingMaterial extends ItemForestry { private final String[] definition = new String[]{"pulsating_dust", "pulsating_mesh", "silk_wisp", "woven_silk", "dissipation_charge", "ice_shard", "scented_paneling", "camouflaged_paneling"}; @@ -56,7 +58,7 @@ public class ItemCraftingMaterial extends ItemForestry { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < definition.length; i++) { subItems.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index 5c8059dc6..ba63dc1a8 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -12,9 +12,6 @@ package forestry.core.items; import javax.annotation.Nullable; -import forestry.api.core.IModelManager; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.Translator; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -26,10 +23,15 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Translator; + public class ItemCrated extends ItemForestry implements IColoredItem { private final ItemStack contained; @Nullable diff --git a/src/main/java/forestry/core/items/ItemElectronTube.java b/src/main/java/forestry/core/items/ItemElectronTube.java old mode 100644 new mode 100755 index 6fe39719f..332197121 --- a/src/main/java/forestry/core/items/ItemElectronTube.java +++ b/src/main/java/forestry/core/items/ItemElectronTube.java @@ -10,11 +10,24 @@ ******************************************************************************/ package forestry.core.items; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; + +import javax.annotation.Nullable; import java.util.Collection; import java.util.List; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; @@ -22,15 +35,6 @@ import forestry.core.CreativeTabForestry; import forestry.core.circuits.SolderManager; import forestry.core.config.Config; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemElectronTube extends ItemOverlay { @@ -40,8 +44,8 @@ public class ItemElectronTube extends ItemOverlay { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); Multimap circuits = getCircuits(itemstack); if (!circuits.isEmpty()) { if (GuiScreen.isShiftKeyDown()) { @@ -61,7 +65,7 @@ public class ItemElectronTube extends ItemOverlay { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < overlays.length; i++) { if (Config.isDebug || !overlays[i].isSecret()) { ItemStack itemStack = new ItemStack(this, 1, i); diff --git a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java old mode 100644 new mode 100755 index 6f673218c..7d7c8c4a0 --- a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java +++ b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java @@ -13,11 +13,6 @@ package forestry.core.items; import javax.annotation.Nullable; import java.util.Locale; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; -import forestry.core.config.Constants; -import forestry.core.fluids.Fluids; -import forestry.core.utils.Translator; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -36,6 +31,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; @@ -46,6 +42,12 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.utils.Translator; + public class ItemFluidContainerForestry extends ItemForestry { private final EnumContainerType type; @@ -65,13 +67,13 @@ public class ItemFluidContainerForestry extends ItemForestry { @SideOnly(Side.CLIENT) @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { // empty - subItems.add(new ItemStack(item)); + subItems.add(new ItemStack(this)); // filled for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { - ItemStack itemStack = new ItemStack(item); + ItemStack itemStack = new ItemStack(this); IFluidHandlerItem fluidHandler = new FluidHandlerItemForestry(itemStack, type); if (fluidHandler.fill(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true) == Fluid.BUCKET_VOLUME) { ItemStack filled = fluidHandler.getContainer(); diff --git a/src/main/java/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java index 06fa37eec..05c9d214e 100755 --- a/src/main/java/forestry/core/items/ItemForestry.java +++ b/src/main/java/forestry/core/items/ItemForestry.java @@ -10,19 +10,23 @@ ******************************************************************************/ package forestry.core.items; +import javax.annotation.Nullable; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; import forestry.core.utils.ItemTooltipUtil; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; public class ItemForestry extends Item implements IItemModelRegister { public ItemForestry() { @@ -53,8 +57,8 @@ public class ItemForestry extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - super.addInformation(stack, playerIn, tooltip, advanced); - ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { + super.addInformation(stack, world, tooltip, advanced); + ItemTooltipUtil.addInformation(stack, world, tooltip, advanced); } } diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index 9e2c659be..9c5509a40 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -10,16 +10,18 @@ ******************************************************************************/ package forestry.core.items; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.CreativeTabForestry; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.CreativeTabForestry; + public class ItemForestryFood extends ItemFood implements IItemModelRegister { private boolean isDrink = false; diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 464dbf6cd..036190601 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.items; -import forestry.core.PluginCore; -import forestry.core.utils.ItemStackUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -26,10 +24,14 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import forestry.core.PluginCore; +import forestry.core.utils.ItemStackUtil; + public class ItemForestryTool extends ItemForestry { private final ItemStack remnants; private float efficiencyOnProperMaterial; diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index db8043de7..52d385593 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -12,16 +12,18 @@ package forestry.core.items; import java.util.Locale; -import forestry.api.core.IModelManager; -import forestry.core.PluginCore; -import forestry.core.utils.OreDictUtil; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.core.PluginCore; +import forestry.core.utils.OreDictUtil; + public class ItemFruit extends ItemForestryFood { public enum EnumFruit { @@ -86,7 +88,7 @@ public class ItemFruit extends ItemForestryFood { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < EnumFruit.values().length; i++) { subItems.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 15d896979..6da834e44 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -10,15 +10,17 @@ ******************************************************************************/ package forestry.core.items; -import forestry.api.core.IModelManager; -import forestry.core.config.Config; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.core.config.Config; + public class ItemOverlay extends ItemForestry implements IColoredItem { public interface IOverlayInfo { @@ -52,7 +54,7 @@ public class ItemOverlay extends ItemForestry implements IColoredItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { for (int i = 0; i < overlays.length; i++) { if (Config.isDebug || !overlays[i].isSecret()) { subItems.add(new ItemStack(this, 1, i)); diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index 1e4beb133..439b0c058 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -13,17 +13,16 @@ package forestry.core.items; import javax.annotation.Nullable; import java.util.List; -import forestry.api.core.IModelManager; -import forestry.api.core.IToolPipette; -import forestry.core.fluids.PipetteContents; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidUtil; @@ -31,6 +30,10 @@ import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.IToolPipette; +import forestry.core.fluids.PipetteContents; + public class ItemPipette extends ItemForestry implements IToolPipette { @SideOnly(Side.CLIENT) public ModelResourceLocation[] models; @@ -48,8 +51,8 @@ public class ItemPipette extends ItemForestry implements IToolPipette { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); PipetteContents contained = PipetteContents.create(itemstack); if (contained != null) { diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java old mode 100644 new mode 100755 index 4657d2812..2e9903fa1 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -12,14 +12,16 @@ package forestry.core.items; import java.util.Locale; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.oredict.OreDictionary; + import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; import forestry.plugins.PluginManager; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; public abstract class ItemRegistry { protected static T registerItem(T item, String name) { @@ -35,8 +37,8 @@ public abstract class ItemRegistry { item.setRegistryName(name); MigrationHelper.addItemName(name); - - GameRegistry.register(item); + + ForgeRegistries.ITEMS.register(item); Proxies.common.registerItem(item); return item; } diff --git a/src/main/java/forestry/core/items/ItemScoop.java b/src/main/java/forestry/core/items/ItemScoop.java index c530c09bc..9a4f2000b 100755 --- a/src/main/java/forestry/core/items/ItemScoop.java +++ b/src/main/java/forestry/core/items/ItemScoop.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.core.items; +import net.minecraft.item.ItemStack; + import forestry.api.core.IToolScoop; import forestry.api.core.Tabs; -import net.minecraft.item.ItemStack; public class ItemScoop extends ItemForestryTool implements IToolScoop { public ItemScoop() { diff --git a/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java b/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java old mode 100644 new mode 100755 index 46a770048..063e933e9 --- a/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java +++ b/src/main/java/forestry/core/models/ModelCamouflageSprayCan.java @@ -6,7 +6,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import forestry.core.inventory.ItemInventoryCamouflageSprayCan; +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -20,13 +21,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; + +import forestry.core.inventory.ItemInventoryCamouflageSprayCan; @SideOnly(Side.CLIENT) public class ModelCamouflageSprayCan extends BlankModel { @@ -63,8 +66,8 @@ public class ModelCamouflageSprayCan extends BlankModel { } } - - private class SprayCanModel extends BlankModel implements IPerspectiveAwareModel { + + private class SprayCanModel extends BlankModel { private final IBakedModel originalModel; @Nullable @@ -92,9 +95,9 @@ public class ModelCamouflageSprayCan extends BlankModel { @Override public Pair handlePerspective(TransformType cameraTransformType) { if (cameraTransformType == TransformType.GUI) { - return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, state, cameraTransformType); + return PerspectiveMapWrapper.handlePerspective(this, state, cameraTransformType); } - return IPerspectiveAwareModel.MapWrapper.handlePerspective(originalModel, state, cameraTransformType); + return PerspectiveMapWrapper.handlePerspective(originalModel, state, cameraTransformType); } } diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java old mode 100644 new mode 100755 index f321441a1..98fcfbc94 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.models; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import java.util.ArrayList; @@ -18,11 +20,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.google.common.base.Preconditions; -import forestry.core.items.ItemCrated; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.ModelUtil; -import forestry.storage.PluginStorage; +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -34,14 +33,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; + +import forestry.core.items.ItemCrated; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.ModelUtil; +import forestry.storage.PluginStorage; @SideOnly(Side.CLIENT) public class ModelCrate extends BlankModel { @@ -129,8 +133,8 @@ public class ModelCrate extends BlankModel { } } - - public static class BakedCrateModel extends BlankModel implements IPerspectiveAwareModel { + + public static class BakedCrateModel extends BlankModel implements IBakedModel { private final BakedCrateModel other; private final boolean gui; private final List quads = new ArrayList<>(); @@ -159,7 +163,7 @@ public class ModelCrate extends BlankModel { @Override public Pair handlePerspective(TransformType cameraTransformType) { - Pair pair = IPerspectiveAwareModel.MapWrapper.handlePerspective(this, ModelManager.getInstance().getDefaultItemState(), cameraTransformType); + Pair pair = PerspectiveMapWrapper.handlePerspective(this, ModelManager.getInstance().getDefaultItemState(), cameraTransformType); if (cameraTransformType == TransformType.GUI && !gui && pair.getRight() == null) { return Pair.of(other, null); } else if (cameraTransformType != TransformType.GUI && gui) { diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java old mode 100644 new mode 100755 index bb6e237fb..af6e29b67 --- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.models.baker; +import com.google.common.collect.ImmutableMap; + import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import java.util.ArrayList; @@ -17,8 +19,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableMap; -import forestry.api.core.IModelBakerModel; +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -28,11 +30,14 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformT import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; + +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.tuple.Pair; + +import forestry.api.core.IModelBakerModel; @SideOnly(Side.CLIENT) public class ModelBakerModel implements IModelBakerModel { @@ -169,7 +174,7 @@ public class ModelBakerModel implements IModelBakerModel { public void setModelState(@Nullable IModelState modelState) { this.modelState = modelState; - this.transforms = MapWrapper.getTransforms(modelState); + this.transforms = PerspectiveMapWrapper.getTransforms(modelState); } public void addModelQuads(Pair model) { @@ -207,6 +212,6 @@ public class ModelBakerModel implements IModelBakerModel { @Override public Pair handlePerspective(TransformType cameraTransformType) { - return MapWrapper.handlePerspective(this, transforms, cameraTransformType); + return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType); } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java old mode 100644 new mode 100755 index fc1c105a2..9ed7863c4 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -9,10 +9,6 @@ import java.util.List; import java.util.Random; import java.util.Set; -import forestry.api.multiblock.IMultiblockComponent; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.Log; -import forestry.core.utils.Translator; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -20,9 +16,15 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.multiblock.IMultiblockComponent; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.Log; +import forestry.core.utils.Translator; + /** * This class contains the base logic for "multiblock controllers". Conceptually, they are * meta-TileEntities. They govern the logic for an associated group of TileEntities. @@ -453,7 +455,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI for (int z = minChunkZ; z <= maxChunkZ; z++) { // Ensure that we save our data, even if the our save delegate is in has no TEs. Chunk chunkToSave = this.world.getChunkFromChunkCoords(x, z); - chunkToSave.setChunkModified(); + chunkToSave.markDirty(); } } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java b/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java old mode 100644 new mode 100755 index a6142b507..160711b2e --- a/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java +++ b/src/main/java/forestry/core/multiblock/MultiblockEventHandler.java @@ -2,6 +2,7 @@ package forestry.core.multiblock; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -17,7 +18,7 @@ public class MultiblockEventHandler { public void onChunkLoad(ChunkEvent.Load loadEvent) { Chunk chunk = loadEvent.getChunk(); World world = loadEvent.getWorld(); - MultiblockRegistry.onChunkLoaded(world, chunk.xPosition, chunk.zPosition); + MultiblockRegistry.onChunkLoaded(world, chunk.x, chunk.z); } // Cleanup, for nice memory usageness diff --git a/src/main/java/forestry/core/multiblock/MultiblockEventHandlerClient.java b/src/main/java/forestry/core/multiblock/MultiblockEventHandlerClient.java old mode 100644 new mode 100755 index 1ee5402df..9a4992cfc --- a/src/main/java/forestry/core/multiblock/MultiblockEventHandlerClient.java +++ b/src/main/java/forestry/core/multiblock/MultiblockEventHandlerClient.java @@ -2,11 +2,6 @@ package forestry.core.multiblock; import java.util.Set; -import forestry.api.multiblock.IMultiblockComponent; -import forestry.api.multiblock.IMultiblockController; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.Log; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -19,12 +14,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; + import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.multiblock.IMultiblockComponent; +import forestry.api.multiblock.IMultiblockController; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.Log; + @SideOnly(Side.CLIENT) public class MultiblockEventHandlerClient { @@ -34,8 +36,8 @@ public class MultiblockEventHandlerClient { if(event.getType() == RenderGameOverlayEvent.ElementType.ALL && Minecraft.getMinecraft().currentScreen == null){ Minecraft minecraft = Minecraft.getMinecraft(); RayTraceResult posHit = minecraft.objectMouseOver; - FontRenderer font = minecraft.fontRendererObj; - ScaledResolution resolution = event.getResolution(); + FontRenderer font = minecraft.fontRenderer; + ScaledResolution resolution = event.getResolution(); if(posHit != null && posHit.getBlockPos() != null){ TileUtil.actOnTile(minecraft.world, posHit.getBlockPos(), IMultiblockComponent.class, component -> { @@ -43,7 +45,7 @@ public class MultiblockEventHandlerClient { String lastValidationError = controller.getLastValidationError(); if(lastValidationError != null){ lastValidationError = TextFormatting.DARK_RED.toString() + TextFormatting.ITALIC.toString() + lastValidationError; - minecraft.fontRendererObj.drawSplitString(lastValidationError, resolution.getScaledWidth() / 2 + 35, resolution.getScaledHeight() / 2 - 25, 128, 16777215); + minecraft.fontRenderer.drawSplitString(lastValidationError, resolution.getScaledWidth() / 2 + 35, resolution.getScaledHeight() / 2 - 25, 128, 16777215); } }); } diff --git a/src/main/java/forestry/core/network/ForestryPacket.java b/src/main/java/forestry/core/network/ForestryPacket.java index c1bae3472..934a7f87c 100755 --- a/src/main/java/forestry/core/network/ForestryPacket.java +++ b/src/main/java/forestry/core/network/ForestryPacket.java @@ -12,10 +12,12 @@ package forestry.core.network; import java.io.IOException; -import forestry.core.utils.Log; -import io.netty.buffer.Unpooled; import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import forestry.core.utils.Log; + +import io.netty.buffer.Unpooled; + public abstract class ForestryPacket implements IForestryPacket { @Override public final FMLProxyPacket getPacket() { diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java old mode 100644 new mode 100755 index 2277425f7..d59a9cf5b --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -10,15 +10,16 @@ ******************************************************************************/ package forestry.core.network; +import com.google.common.base.Preconditions; + import java.io.IOException; -import com.google.common.base.Preconditions; -import forestry.core.utils.Log; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.util.IThreadListener; + import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.FMLEventChannel; import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; @@ -28,6 +29,8 @@ import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.utils.Log; + public class PacketHandler { public static final String channelId = "FOR"; private final FMLEventChannel channel; @@ -40,7 +43,7 @@ public class PacketHandler { @SubscribeEvent public void onPacket(ServerCustomPacketEvent event) { PacketBufferForestry data = new PacketBufferForestry(event.getPacket().payload()); - EntityPlayerMP player = ((NetHandlerPlayServer) event.getHandler()).playerEntity; + EntityPlayerMP player = ((NetHandlerPlayServer) event.getHandler()).player; byte packetIdOrdinal = data.readByte(); PacketIdServer packetId = PacketIdServer.VALUES[packetIdOrdinal]; diff --git a/src/main/java/forestry/core/owner/GameProfileDataSerializer.java b/src/main/java/forestry/core/owner/GameProfileDataSerializer.java old mode 100644 new mode 100755 index 401ce40c4..279670653 --- a/src/main/java/forestry/core/owner/GameProfileDataSerializer.java +++ b/src/main/java/forestry/core/owner/GameProfileDataSerializer.java @@ -3,12 +3,13 @@ package forestry.core.owner; import java.util.Optional; import java.util.UUID; -import com.mojang.authlib.GameProfile; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializer; import net.minecraft.network.datasync.DataSerializers; +import com.mojang.authlib.GameProfile; + public class GameProfileDataSerializer implements DataSerializer> { public static final GameProfileDataSerializer INSTANCE = new GameProfileDataSerializer(); @@ -49,4 +50,9 @@ public class GameProfileDataSerializer implements DataSerializer> createKey(int id) { return new DataParameter<>(id, this); } + + @Override + public Optional copyValue(Optional value) { + return value; + } } diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 311062a2c..24d22473f 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -12,14 +12,16 @@ package forestry.core.proxy; import java.io.File; -import forestry.core.TickHandlerCoreServer; -import forestry.core.multiblock.MultiblockServerTickHandler; -import forestry.core.worldgen.WorldGenerator; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; + import net.minecraftforge.common.MinecraftForge; +import forestry.core.TickHandlerCoreServer; +import forestry.core.multiblock.MultiblockServerTickHandler; +import forestry.core.worldgen.WorldGenerator; + public class ProxyCommon { public void registerItem(Item item) { diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java old mode 100644 new mode 100755 index b5f60c997..01aeedbfe --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -13,27 +13,34 @@ package forestry.core.recipes; import javax.annotation.Nullable; import java.util.List; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.api.recipes.RecipeManagers; -import forestry.core.fluids.Fluids; -import forestry.core.utils.ItemStackUtil; -import forestry.factory.inventory.InventoryCraftingForestry; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapelessOreRecipe; -public abstract class RecipeUtil { +import forestry.api.recipes.IDescriptiveRecipe; +import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Constants; +import forestry.core.fluids.Fluids; +import forestry.core.utils.ItemStackUtil; +import forestry.factory.inventory.InventoryCraftingForestry; +public abstract class RecipeUtil { + + // hack to make unique recipe names. + // TODO use json recipes + private static int recipeIndex; + public static void addFermenterRecipes(ItemStack resource, int fermentationValue, Fluids output) { if (RecipeManagers.fermenterManager == null) { return; @@ -112,8 +119,8 @@ public abstract class RecipeUtil { matchingRecipes.add(repairRecipe); return matchingRecipes; } - - for (Object recipe : CraftingManager.getInstance().getRecipeList()) { + + for (Object recipe : ForgeRegistries.RECIPES.getValues()) { IRecipe irecipe = (IRecipe) recipe; if (irecipe.matches(inventory, world)) { @@ -173,11 +180,9 @@ public abstract class RecipeUtil { } public static void addRecipe(ItemStack itemstack, Object... obj) { - CraftingManager.getInstance().getRecipeList().add(new ShapedRecipeCustom(itemstack, obj)); - } - - public static void addPriorityRecipe(ItemStack itemStack, Object... obj) { - CraftingManager.getInstance().getRecipeList().add(0, new ShapedRecipeCustom(itemStack, obj)); + ShapedRecipeCustom recipe = new ShapedRecipeCustom(itemstack, obj); + recipe.setRegistryName(Constants.MOD_ID, "Recipe" + recipeIndex++); + ForgeRegistries.RECIPES.register(recipe); } public static void addShapelessRecipe(Item item, Object... obj) { @@ -185,7 +190,9 @@ public abstract class RecipeUtil { } public static void addShapelessRecipe(ItemStack itemstack, Object... obj) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(itemstack, obj)); + ShapelessOreRecipe recipe = new ShapelessOreRecipe(null, itemstack, obj); + recipe.setRegistryName(Constants.MOD_ID, "Recipe" + recipeIndex++); + ForgeRegistries.RECIPES.register(recipe); } public static void addSmelting(ItemStack res, Item prod, float xp) { @@ -197,7 +204,7 @@ public abstract class RecipeUtil { } public static String[][] matches(IDescriptiveRecipe recipe, IInventory inventoryCrafting) { - NonNullList> recipeIngredients = recipe.getIngredients(); + NonNullList> recipeIngredients = recipe.getRawIngredients(); NonNullList oreDicts = recipe.getOreDicts(); int width = recipe.getWidth(); int height = recipe.getHeight(); diff --git a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java old mode 100644 new mode 100755 index 676163bb0..5b1dc60fd --- a/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java +++ b/src/main/java/forestry/core/recipes/ShapedRecipeCustom.java @@ -13,17 +13,19 @@ package forestry.core.recipes; import java.util.HashMap; import java.util.Iterator; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.core.utils.ItemStackUtil; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.world.World; + import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import forestry.api.recipes.IDescriptiveRecipe; +import forestry.core.utils.ItemStackUtil; + public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveRecipe { //Added in for future ease of change, but hard coded for now. private static final int MAX_CRAFT_GRID_WIDTH = 3; @@ -36,7 +38,7 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR private boolean mirrored = true; public ShapedRecipeCustom(ItemStack result, Object... recipe) { - super(result, recipe); + super(null, result, recipe); ItemStack output = result.copy(); String shape = ""; @@ -137,9 +139,8 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR public int getHeight() { return height; } - - @Override - public NonNullList> getIngredients() { + + public NonNullList> getRawIngredients() { return input; } @@ -160,16 +161,21 @@ public class ShapedRecipeCustom extends ShapedOreRecipe implements IDescriptiveR if (checkMatch(inv, x, y, false)) { return true; } - + if (mirrored && checkMatch(inv, x, y, true)) { return true; } } } - + return false; } - + + @Override + public boolean isHidden() { + return false; + } + @Override public boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) { for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) { diff --git a/src/main/java/forestry/core/render/ParticleRender.java b/src/main/java/forestry/core/render/ParticleRender.java old mode 100644 new mode 100755 index b18cca375..47009b185 --- a/src/main/java/forestry/core/render/ParticleRender.java +++ b/src/main/java/forestry/core/render/ParticleRender.java @@ -2,6 +2,19 @@ package forestry.core.render; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IHiveTile; @@ -15,17 +28,6 @@ import forestry.core.entities.ParticleIgnition; import forestry.core.entities.ParticleSmoke; import forestry.core.entities.ParticleSnow; import forestry.core.utils.VectUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.Particle; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.Vec3i; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ParticleRender { @@ -59,7 +61,7 @@ public class ParticleRender { // Avoid rendering bee particles that are too far away, they're very small. // At 32+ distance, have no bee particles. Make more particles up close. BlockPos playerPosition = Minecraft.getMinecraft().player.getPosition(); - double playerDistanceSq = playerPosition.distanceSqToCenter(particleStart.xCoord, particleStart.yCoord, particleStart.zCoord); + double playerDistanceSq = playerPosition.distanceSqToCenter(particleStart.x, particleStart.y, particleStart.z); if (world.rand.nextInt(1024) < playerDistanceSq) { return; } diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index 1f414a9b9..3bdfa8c55 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -12,9 +12,6 @@ package forestry.core.render; import javax.annotation.Nullable; -import forestry.apiculture.render.ModelAnalyzer; -import forestry.core.blocks.BlockBase; -import forestry.core.tiles.TileAnalyzer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -25,6 +22,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import forestry.apiculture.render.ModelAnalyzer; +import forestry.core.blocks.BlockBase; +import forestry.core.tiles.TileAnalyzer; + public class RenderAnalyzer extends TileEntitySpecialRenderer { private final ModelAnalyzer model; @@ -39,7 +40,7 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer { * @param analyzer If it null its render the item else it render the tile entity. */ @Override - public void renderTileEntityAt(TileAnalyzer analyzer, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileAnalyzer analyzer, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (analyzer != null) { World worldObj = analyzer.getWorldObj(); if (worldObj.isBlockLoaded(analyzer.getPos())) { @@ -68,7 +69,7 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer { GlStateManager.translate((float) x, (float) y, (float) z); GlStateManager.translate(0.5f, 0.2f, 0.5f); GlStateManager.scale(renderScale, renderScale, renderScale); - dummyEntityItem.setEntityItemStack(itemstack); + dummyEntityItem.setItem(itemstack); if (world.getTotalWorldTime() != lastTick) { lastTick = world.getTotalWorldTime(); diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 207e90787..9b544c857 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -12,10 +12,6 @@ package forestry.core.render; import javax.annotation.Nullable; -import forestry.core.blocks.BlockBase; -import forestry.core.config.Constants; -import forestry.core.models.ModelEscritoire; -import forestry.core.tiles.TileEscritoire; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -28,6 +24,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.config.Constants; +import forestry.core.models.ModelEscritoire; +import forestry.core.tiles.TileEscritoire; + public class RenderEscritoire extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/escritoire.png"); @@ -39,7 +40,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer * @param escritoire If it null its render the item else it render the tile entity. */ @Override - public void renderTileEntityAt(@Nullable TileEscritoire escritoire, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileEscritoire escritoire, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (escritoire != null) { World world = escritoire.getWorldObj(); if (world.isBlockLoaded(escritoire.getPos())) { @@ -94,7 +95,7 @@ public class RenderEscritoire extends TileEntitySpecialRenderer { GlStateManager.translate((float) x + 0.5f, (float) y + 0.6f, (float) z + 0.5f); GlStateManager.scale(renderScale, renderScale, renderScale); - dummyEntityItem.setEntityItemStack(itemstack); + dummyEntityItem.setItem(itemstack); if (world.getTotalWorldTime() != lastTick) { lastTick = world.getTotalWorldTime(); diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index 2fec399be..1f360b9f0 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -14,10 +14,6 @@ import java.awt.Color; import java.util.EnumMap; import java.util.Locale; -import forestry.core.blocks.BlockBase; -import forestry.core.fluids.Fluids; -import forestry.core.tiles.IRenderableTile; -import forestry.core.tiles.TileBase; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; @@ -29,6 +25,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.fluids.Fluids; +import forestry.core.tiles.IRenderableTile; +import forestry.core.tiles.TileBase; + public class RenderMachine extends TileEntitySpecialRenderer { private final ModelRenderer basefront; @@ -81,12 +82,12 @@ public class RenderMachine extends TileEntitySpecialRenderer { texturesTankLevels.put(tankLevel, new ForestryResource("textures/blocks/machine_tank_" + tankLevelString + ".png")); } } - + /** * @param tile If it null its render the item else it render the tile entity. */ @Override - public void renderTileEntityAt(TileBase tile, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileBase tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (tile != null) { IRenderableTile generator = (IRenderableTile) tile; World worldObj = tile.getWorldObj(); diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index 866c1b42b..a355bc918 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.render; -import forestry.core.tiles.TileMill; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -20,6 +19,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import forestry.core.tiles.TileMill; + public class RenderMill extends TileEntitySpecialRenderer { private enum Textures {PEDESTAL, EXTENSION, BLADE_1, BLADE_2, CHARGE} @@ -83,7 +84,7 @@ public class RenderMill extends TileEntitySpecialRenderer { * @param mill If it null its render the item else it render the tile entity. */ @Override - public void renderTileEntityAt(TileMill mill, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileMill mill, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (mill != null) { render(mill.progress, mill.charge, EnumFacing.WEST, x, y, z); } else { diff --git a/src/main/java/forestry/core/render/RenderNaturalistChest.java b/src/main/java/forestry/core/render/RenderNaturalistChest.java old mode 100644 new mode 100755 index 707b527f5..842501fe1 --- a/src/main/java/forestry/core/render/RenderNaturalistChest.java +++ b/src/main/java/forestry/core/render/RenderNaturalistChest.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.core.render; -import forestry.core.blocks.BlockBase; -import forestry.core.config.Constants; -import forestry.core.tiles.TileNaturalistChest; import net.minecraft.block.state.IBlockState; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; @@ -21,6 +18,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.config.Constants; +import forestry.core.tiles.TileNaturalistChest; + public class RenderNaturalistChest extends TileEntitySpecialRenderer { private final ModelChest chestModel = new ModelChest(); @@ -34,7 +35,7 @@ public class RenderNaturalistChest extends TileEntitySpecialRenderer texture.getIconWidth() + " x " + texture.getIconHeight()); - crashreportcategory.setDetail("Sprite frames", () -> texture.getFrameCount() + " frames"); + crashreportcategory.addDetail("Sprite name", texture::getIconName); + crashreportcategory.addDetail("Sprite size", () -> texture.getIconWidth() + " x " + texture.getIconHeight()); + crashreportcategory.addDetail("Sprite frames", () -> texture.getFrameCount() + " frames"); crashreportcategory.addCrashSection("Mipmap levels", 0); throw new ReportedException(crashreport); } diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java old mode 100644 new mode 100755 index bdbf9ddc9..6f3c64fbf --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -13,7 +13,6 @@ package forestry.core.utils; import javax.annotation.Nullable; import java.util.List; -import forestry.core.network.packets.PacketFXSignal; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockOldLog; @@ -30,8 +29,11 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.oredict.OreDictionary; +import forestry.core.network.packets.PacketFXSignal; + public abstract class BlockUtil { private static final int slabWoodId = OreDictionary.getOreID("slabWood"); @@ -210,21 +212,21 @@ public abstract class BlockUtil { * Checks if a vector is within the Y and Z bounds of the block. */ private static boolean isVecInsideYZBounds(@Nullable Vec3d vec, double minY, double minZ, double maxY, double maxZ) { - return vec != null && vec.yCoord >= minY && vec.yCoord <= maxY && vec.zCoord >= minZ && vec.zCoord <= maxZ; + return vec != null && vec.y >= minY && vec.y <= maxY && vec.z >= minZ && vec.z <= maxZ; } /** * Checks if a vector is within the X and Z bounds of the block. */ private static boolean isVecInsideXZBounds(@Nullable Vec3d vec, double minX, double minZ, double maxX, double maxZ) { - return vec != null && vec.xCoord >= minX && vec.xCoord <= maxX && vec.zCoord >= minZ && vec.zCoord <= maxZ; + return vec != null && vec.x >= minX && vec.x <= maxX && vec.z >= minZ && vec.z <= maxZ; } /** * Checks if a vector is within the X and Y bounds of the block. */ private static boolean isVecInsideXYBounds(@Nullable Vec3d vec, double minX, double minY, double maxX, double maxY) { - return vec != null && vec.xCoord >= minX && vec.xCoord <= maxX && vec.yCoord >= minY && vec.yCoord <= maxY; + return vec != null && vec.x >= minX && vec.x <= maxX && vec.y >= minY && vec.y <= maxY; } /* CHUNKS */ diff --git a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java index 6772449ab..c5e49c3bf 100755 --- a/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java +++ b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java @@ -10,17 +10,19 @@ ******************************************************************************/ package forestry.core.utils; +import com.google.common.base.Joiner; + import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.google.common.base.Joiner; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.ICrashCallable; + import forestry.core.config.Constants; import forestry.plugins.ForestryPlugin; import forestry.plugins.IForestryPlugin; import forestry.plugins.PluginManager; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.ICrashCallable; /** * ICrashCallable for listing disabled modules for crash reports. diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java old mode 100644 new mode 100755 index 67de16bc4..c8e4cff3d --- a/src/main/java/forestry/core/utils/ItemStackUtil.java +++ b/src/main/java/forestry/core/utils/ItemStackUtil.java @@ -11,14 +11,13 @@ package forestry.core.utils; import javax.annotation.Nullable; - -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -29,9 +28,10 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.common.registry.IForgeRegistry; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.registries.IForgeRegistry; public abstract class ItemStackUtil { diff --git a/src/main/java/forestry/core/utils/ItemTooltipUtil.java b/src/main/java/forestry/core/utils/ItemTooltipUtil.java old mode 100644 new mode 100755 index 5e47d4adf..79e2067e0 --- a/src/main/java/forestry/core/utils/ItemTooltipUtil.java +++ b/src/main/java/forestry/core/utils/ItemTooltipUtil.java @@ -1,22 +1,25 @@ package forestry.core.utils; +import javax.annotation.Nullable; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTooltipUtil { @SideOnly(Side.CLIENT) - public static void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public static void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { String unlocalizedName = stack.getUnlocalizedName(); String tooltipKey = unlocalizedName + ".tooltip"; if (Translator.canTranslateToLocal(tooltipKey)) { String tooltipInfo = Translator.translateToLocal(tooltipKey); Minecraft minecraft = Minecraft.getMinecraft(); - List tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150); + List tooltipInfoWrapped = minecraft.fontRenderer.listFormattedStringToWidth(tooltipInfo, 150); tooltip.addAll(tooltipInfoWrapped); } } diff --git a/src/main/java/forestry/core/utils/MigrationHelper.java b/src/main/java/forestry/core/utils/MigrationHelper.java old mode 100644 new mode 100755 index 5660a7f5c..8fcb97680 --- a/src/main/java/forestry/core/utils/MigrationHelper.java +++ b/src/main/java/forestry/core/utils/MigrationHelper.java @@ -7,9 +7,12 @@ import java.util.Set; import java.util.regex.Pattern; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; + +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class MigrationHelper { @@ -47,34 +50,40 @@ public class MigrationHelper { remappings.put(nameWithoutUnderscores, name); } } - - public static void onMissingMappings(FMLMissingMappingsEvent event) { - for (FMLMissingMappingsEvent.MissingMapping missingMapping : event.get()) { - ResourceLocation resourceLocation = missingMapping.resourceLocation; - + + public static void onMissingBlockMappings(RegistryEvent.MissingMappings event) { + for (RegistryEvent.MissingMappings.Mapping missingMapping : event.getMappings()) { + ResourceLocation resourceLocation = missingMapping.key; + String resourcePath = resourceLocation.getResourcePath(); if (ignoredMappings.contains(resourcePath)) { missingMapping.ignore(); - } else { - switch (missingMapping.type) { - case BLOCK: - if (blockRemappings.containsKey(resourcePath)) { - ResourceLocation remappedResourceLocation = new ResourceLocation(resourceLocation.getResourceDomain(), blockRemappings.get(resourcePath)); - if (ForgeRegistries.BLOCKS.containsKey(remappedResourceLocation)) { - Block remappedBlock = ForgeRegistries.BLOCKS.getValue(remappedResourceLocation); - missingMapping.remap(remappedBlock); - } - } - break; - case ITEM: - if (itemRemappings.containsKey(resourcePath)) { - ResourceLocation remappedResourceLocation = new ResourceLocation(resourceLocation.getResourceDomain(), itemRemappings.get(resourcePath)); - if (ForgeRegistries.ITEMS.containsKey(remappedResourceLocation)) { - Item remappedItem = ForgeRegistries.ITEMS.getValue(remappedResourceLocation); - missingMapping.remap(remappedItem); - } - } - break; + } else if (blockRemappings.containsKey(resourcePath)) { + ResourceLocation remappedResourceLocation = new ResourceLocation(resourceLocation.getResourceDomain(), blockRemappings.get(resourcePath)); + if (ForgeRegistries.BLOCKS.containsKey(remappedResourceLocation)) { + Block remappedBlock = ForgeRegistries.BLOCKS.getValue(remappedResourceLocation); + if (remappedBlock != null && remappedBlock != Blocks.AIR) { + missingMapping.remap(remappedBlock); + } + } + } + } + } + + public static void onMissingItemMappings(RegistryEvent.MissingMappings event) { + for (RegistryEvent.MissingMappings.Mapping missingMapping : event.getMappings()) { + ResourceLocation resourceLocation = missingMapping.key; + + String resourcePath = resourceLocation.getResourcePath(); + if (ignoredMappings.contains(resourcePath)) { + missingMapping.ignore(); + } else if (itemRemappings.containsKey(resourcePath)) { + ResourceLocation remappedResourceLocation = new ResourceLocation(resourceLocation.getResourceDomain(), itemRemappings.get(resourcePath)); + if (ForgeRegistries.ITEMS.containsKey(remappedResourceLocation)) { + Item remappedItem = ForgeRegistries.ITEMS.getValue(remappedResourceLocation); + if (remappedItem != null && remappedItem != Items.AIR) { + missingMapping.remap(remappedItem); + } } } } diff --git a/src/main/java/forestry/core/utils/ModelUtil.java b/src/main/java/forestry/core/utils/ModelUtil.java old mode 100644 new mode 100755 index e139381ef..709d6662d --- a/src/main/java/forestry/core/utils/ModelUtil.java +++ b/src/main/java/forestry/core/utils/ModelUtil.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.core.utils; +import com.google.common.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.IOException; @@ -20,9 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.google.common.base.Charsets; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.commons.io.IOUtils; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -33,11 +36,11 @@ import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IPerspectiveAwareModel.MapWrapper; + +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.io.IOUtils; @SideOnly(Side.CLIENT) public class ModelUtil { @@ -57,7 +60,7 @@ public class ModelUtil { } public static SimpleModelState loadModelState(ResourceLocation location) { - return new SimpleModelState(MapWrapper.getTransforms(loadTransformFromJson(location))); + return new SimpleModelState(PerspectiveMapWrapper.getTransforms(loadTransformFromJson(location))); } private static ItemCameraTransforms loadTransformFromJson(ResourceLocation location) { diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 83d36c45e..ebb4eeab8 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -62,7 +63,7 @@ public class StringUtil { @SideOnly(Side.CLIENT) public static int getLineHeight(int maxWidth, String... strings) { Minecraft minecraft = Minecraft.getMinecraft(); - FontRenderer fontRenderer = minecraft.fontRendererObj; + FontRenderer fontRenderer = minecraft.fontRenderer; int lineCount = 0; for (String string : strings) { diff --git a/src/main/java/forestry/core/worldgen/WorldGenerator.java b/src/main/java/forestry/core/worldgen/WorldGenerator.java old mode 100644 new mode 100755 index 8a3fdd783..f64cc9fdf --- a/src/main/java/forestry/core/worldgen/WorldGenerator.java +++ b/src/main/java/forestry/core/worldgen/WorldGenerator.java @@ -13,21 +13,23 @@ package forestry.core.worldgen; import javax.annotation.Nullable; import java.util.Random; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.IChunkGenerator; +import net.minecraft.world.gen.feature.WorldGenMinable; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.terraingen.PopulateChunkEvent; +import net.minecraftforge.fml.common.IWorldGenerator; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + import forestry.core.PluginCore; import forestry.core.blocks.BlockResourceOre; import forestry.core.blocks.EnumResourceType; import forestry.core.config.Config; import forestry.plugins.PluginManager; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.feature.WorldGenMinable; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.terraingen.PopulateChunkEvent; -import net.minecraftforge.fml.common.IWorldGenerator; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class WorldGenerator implements IWorldGenerator { @Nullable @@ -55,7 +57,7 @@ public class WorldGenerator implements IWorldGenerator { public void retroGen(Random random, int chunkX, int chunkZ, World world) { generateWorld(random, chunkX, chunkZ, world); PluginManager.populateChunkRetroGen(world, random, chunkX, chunkZ); - world.getChunkFromChunkCoords(chunkX, chunkZ).setChunkModified(); + world.getChunkFromChunkCoords(chunkX, chunkZ).markDirty(); } private void generateWorld(Random random, int chunkX, int chunkZ, World world) { diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java old mode 100644 new mode 100755 index 8d7617e76..19bdc53db --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.energy.blocks; +import com.google.common.collect.ImmutableList; + import javax.annotation.Nullable; import java.util.EnumMap; import java.util.List; -import com.google.common.collect.ImmutableList; -import forestry.core.blocks.BlockBase; -import forestry.core.tiles.TileUtil; -import forestry.energy.EnergyHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +28,10 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.tiles.TileUtil; +import forestry.energy.EnergyHelper; + public class BlockEngine extends BlockBase { private static final EnumMap> boundingBoxesForDirections = new EnumMap<>(EnumFacing.class); @@ -69,7 +71,7 @@ public class BlockEngine extends BlockBase { for (AxisAlignedBB boundingBoxBase : boundingBoxes) { AxisAlignedBB boundingBox = boundingBoxBase.offset(pos.getX(), pos.getY(), pos.getZ()); - if (entityBox.intersectsWith(boundingBox)) { + if (entityBox.intersects(boundingBox)) { collidingBoxes.add(boundingBox); } } diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index ce68bc531..a380e52fe 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -11,6 +11,7 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.network.packets.PacketGuiUpdate; diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index 12b26ebeb..f7e36c741 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.energy.gui; +import net.minecraft.inventory.Container; + import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.Ledger; import forestry.core.render.TextureManagerForestry; import forestry.core.tiles.TileEngine; import forestry.core.utils.Translator; -import net.minecraft.inventory.Container; public abstract class GuiEngine extends GuiForestryTitled { protected final I tile; diff --git a/src/main/java/forestry/energy/inventory/InventoryEngineElectric.java b/src/main/java/forestry/energy/inventory/InventoryEngineElectric.java old mode 100644 new mode 100755 diff --git a/src/main/java/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java index 8a48aefa5..6270e459d 100755 --- a/src/main/java/forestry/energy/render/RenderEngine.java +++ b/src/main/java/forestry/energy/render/RenderEngine.java @@ -10,13 +10,6 @@ ******************************************************************************/ package forestry.energy.render; -import javax.annotation.Nullable; - -import forestry.core.blocks.BlockBase; -import forestry.core.config.Constants; -import forestry.core.render.ForestryResource; -import forestry.core.tiles.TemperatureState; -import forestry.core.tiles.TileEngine; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; @@ -28,6 +21,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import forestry.core.blocks.BlockBase; +import forestry.core.config.Constants; +import forestry.core.render.ForestryResource; +import forestry.core.tiles.TemperatureState; +import forestry.core.tiles.TileEngine; + public class RenderEngine extends TileEntitySpecialRenderer { private final ModelRenderer boiler; private final ModelRenderer trunk; @@ -87,9 +86,9 @@ public class RenderEngine extends TileEntitySpecialRenderer { new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_medium.png"), new ForestryResource(Constants.TEXTURE_PATH_BLOCKS + "/engine_trunk_low.png"),}; } - + @Override - public void renderTileEntityAt(@Nullable TileEngine engine, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(TileEngine engine, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (engine != null) { World worldObj = engine.getWorldObj(); if (worldObj.isBlockLoaded(engine.getPos())) { diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java old mode 100644 new mode 100755 index 6e574fee8..7ce542d1e --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -10,14 +10,24 @@ ******************************************************************************/ package forestry.energy.tiles; +import javax.annotation.Nonnull; import java.io.IOException; -import javax.annotation.Nonnull; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitSocketType; +import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.core.circuits.ISocketable; import forestry.core.config.Constants; @@ -30,16 +40,9 @@ import forestry.core.tiles.TileEngine; import forestry.energy.gui.ContainerEngineElectric; import forestry.energy.gui.GuiEngineElectric; import forestry.energy.inventory.InventoryEngineElectric; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.ForestryPluginUids; + import ic2.api.energy.prefab.BasicSink; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileEngineElectric extends TileEngine implements ISocketable, IInventory, IStreamableGui { protected static class EuConfig { @@ -64,8 +67,8 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve super("engine.tin", Constants.ENGINE_ELECTRIC_HEAT_MAX, 100000); setInternalInventory(new InventoryEngineElectric(this)); - - if (PluginIC2.instance.isAvailable()) { + + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT2)) { ic2EnergySink = new BasicSink(this, euConfig.euStorage, 4); } } diff --git a/src/main/java/forestry/energy/tiles/TileEuGenerator.java b/src/main/java/forestry/energy/tiles/TileEuGenerator.java old mode 100644 new mode 100755 index 9fa959509..eac011d03 --- a/src/main/java/forestry/energy/tiles/TileEuGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileEuGenerator.java @@ -25,15 +25,17 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; +import forestry.core.fluids.FilteredTank; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.ITankManager; import forestry.core.fluids.TankManager; -import forestry.core.fluids.FilteredTank; import forestry.core.network.IStreamableGui; import forestry.core.network.PacketBufferForestry; import forestry.core.render.TankRenderInfo; @@ -43,7 +45,7 @@ import forestry.core.tiles.TileBase; import forestry.energy.gui.ContainerGenerator; import forestry.energy.gui.GuiGenerator; import forestry.energy.inventory.InventoryGenerator; -import forestry.plugins.compat.PluginIC2; +import forestry.plugins.ForestryPluginUids; import ic2.api.energy.prefab.BasicSource; @@ -66,8 +68,8 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui resourceTank.setFilters(FuelManager.generatorFuel.keySet()); tankManager = new TankManager(this, resourceTank); - - if (PluginIC2.instance.isAvailable()) { + + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.INDUSTRIALCRAFT2)) { ic2EnergySource = new BasicSource(this, maxEnergy, 1); } } diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java old mode 100644 new mode 100755 index 1796180a8..38eb08680 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -10,10 +10,22 @@ ******************************************************************************/ package forestry.factory; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.Set; -import com.google.common.base.Preconditions; +import net.minecraft.block.BlockDirt.DirtType; +import net.minecraft.block.BlockPlanks.EnumType; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuit; @@ -61,15 +73,6 @@ import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; import forestry.storage.PluginStorage; -import net.minecraft.block.BlockDirt.DirtType; -import net.minecraft.block.BlockPlanks.EnumType; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; @ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description") public class PluginFactory extends BlankForestryPlugin { @@ -338,7 +341,7 @@ public class PluginFactory extends BlankForestryPlugin { 'X', beeItems.propolis.getWildcard()}); } RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlassX4, new ItemStack(Blocks.GLASS, 1, 0), new Object[]{ - "#", "X", + "X", 'X', beeItems.propolis.getWildcard()}); } diff --git a/src/main/java/forestry/factory/gui/ContainerBottler.java b/src/main/java/forestry/factory/gui/ContainerBottler.java index 91c5331b3..dc24ac07c 100755 --- a/src/main/java/forestry/factory/gui/ContainerBottler.java +++ b/src/main/java/forestry/factory/gui/ContainerBottler.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventoryBottler; import forestry.factory.tiles.TileBottler; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerBottler extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java index 6d22674b2..face474fb 100755 --- a/src/main/java/forestry/factory/gui/ContainerCarpenter.java +++ b/src/main/java/forestry/factory/gui/ContainerCarpenter.java @@ -10,6 +10,11 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.IContainerCrafting; import forestry.core.gui.slots.SlotCraftMatrix; @@ -20,10 +25,6 @@ import forestry.core.gui.slots.SlotOutput; import forestry.core.network.packets.PacketItemStackDisplay; import forestry.factory.inventory.InventoryCarpenter; import forestry.factory.tiles.TileCarpenter; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class ContainerCarpenter extends ContainerLiquidTanks implements IContainerCrafting { diff --git a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java index 62cf5213e..280def2ad 100755 --- a/src/main/java/forestry/factory/gui/ContainerCentrifuge.java +++ b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java @@ -10,15 +10,16 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotLocked; import forestry.core.gui.slots.SlotOutput; import forestry.core.network.packets.PacketItemStackDisplay; import forestry.factory.tiles.TileCentrifuge; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class ContainerCentrifuge extends ContainerSocketed { diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index f7b57b6a0..fcb57e8d6 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -10,6 +10,14 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.IContainerCrafting; import forestry.core.gui.slots.SlotCraftMatrix; @@ -18,12 +26,6 @@ import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventoryFabricator; import forestry.factory.inventory.InventoryGhostCrafting; import forestry.factory.tiles.TileFabricator; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerFabricator extends ContainerLiquidTanks implements IContainerCrafting { diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index aace47b35..9e84e84cd 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -10,6 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IContainerListener; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; import forestry.core.gui.slots.SlotFiltered; @@ -17,10 +23,6 @@ import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventoryFermenter; import forestry.factory.tiles.TileFermenter; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerFermenter extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index 669424123..89572896f 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -10,17 +10,19 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.IInventory; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotWatched; import forestry.core.gui.slots.SlotWorking; import forestry.core.inventory.watchers.ISlotChangeWatcher; import forestry.factory.tiles.TileMoistener; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerMoistener extends ContainerLiquidTanks implements ISlotChangeWatcher { diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index 1e25482da..cbf7dde2f 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -10,15 +10,17 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IContainerListener; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventoryRaintank; import forestry.factory.tiles.TileRaintank; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerRaintank extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java index 9797537bf..1c02def00 100755 --- a/src/main/java/forestry/factory/gui/ContainerSqueezer.java +++ b/src/main/java/forestry/factory/gui/ContainerSqueezer.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.gui.ContainerLiquidTanksSocketed; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventorySqueezer; import forestry.factory.tiles.TileSqueezer; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerSqueezer extends ContainerLiquidTanksSocketed { diff --git a/src/main/java/forestry/factory/gui/ContainerStill.java b/src/main/java/forestry/factory/gui/ContainerStill.java index 03a5822d6..680b72864 100755 --- a/src/main/java/forestry/factory/gui/ContainerStill.java +++ b/src/main/java/forestry/factory/gui/ContainerStill.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; import forestry.core.gui.slots.SlotLiquidIn; import forestry.core.gui.slots.SlotOutput; import forestry.factory.inventory.InventoryStill; import forestry.factory.tiles.TileStill; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerStill extends ContainerLiquidTanks { diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 16fc3ea02..9cb85a2db 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -10,6 +10,15 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.gui.ContainerTile; import forestry.core.gui.IContainerCrafting; import forestry.core.gui.IGuiSelectable; @@ -27,13 +36,6 @@ import forestry.factory.network.packets.PacketWorktableRecipeUpdate; import forestry.factory.recipes.MemorizedRecipe; import forestry.factory.recipes.RecipeMemory; import forestry.factory.tiles.TileWorktable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerWorktable extends ContainerTile implements IContainerCrafting, IGuiSelectable { private final InventoryCraftingForestry craftMatrix = new InventoryCraftingForestry(this); diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index 92d40ffdf..1579fc854 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -10,15 +10,16 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; import forestry.factory.tiles.TileBottler; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.InventoryPlayer; public class GuiBottler extends GuiForestryTitled { private final TileBottler tile; diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index f359f5a53..2351f5279 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileCarpenter; -import net.minecraft.entity.player.InventoryPlayer; public class GuiCarpenter extends GuiForestryTitled { private final TileCarpenter tile; diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index 292b60d3b..963777f32 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.SocketWidget; import forestry.factory.tiles.TileCentrifuge; -import net.minecraft.entity.player.InventoryPlayer; public class GuiCentrifuge extends GuiForestryTitled { private final TileCentrifuge tile; diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index f3e0bcfd9..df53baac4 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.ReservoirWidget; import forestry.factory.tiles.TileFabricator; -import net.minecraft.entity.player.InventoryPlayer; public class GuiFabricator extends GuiForestryTitled { private final TileFabricator tile; diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index f95b5dd4c..d52f273a6 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileFermenter; -import net.minecraft.entity.player.InventoryPlayer; public class GuiFermenter extends GuiForestryTitled { private final TileFermenter tile; diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index f72203f90..27b0f6a18 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileMoistener; -import net.minecraft.entity.player.InventoryPlayer; public class GuiMoistener extends GuiForestryTitled { private final TileMoistener tile; diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index c6ed6e08e..6661bbb92 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileRaintank; -import net.minecraft.entity.player.InventoryPlayer; public class GuiRaintank extends GuiForestryTitled { private final TileRaintank tile; diff --git a/src/main/java/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java index 7085a3974..008987193 100755 --- a/src/main/java/forestry/factory/gui/GuiSqueezer.java +++ b/src/main/java/forestry/factory/gui/GuiSqueezer.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.SocketWidget; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileSqueezer; -import net.minecraft.entity.player.InventoryPlayer; public class GuiSqueezer extends GuiForestryTitled { private final TileSqueezer tile; diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index 3bcd99cc2..826bf46e5 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; import forestry.factory.tiles.TileStill; -import net.minecraft.entity.player.InventoryPlayer; public class GuiStill extends GuiForestryTitled { private final TileStill tile; diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index c10d841e5..ee70f98f7 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.factory.gui; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.buttons.GuiBetterButton; @@ -21,8 +24,6 @@ import forestry.factory.gui.widgets.ClearWorktable; import forestry.factory.gui.widgets.MemorizedRecipeSlot; import forestry.factory.recipes.RecipeMemory; import forestry.factory.tiles.TileWorktable; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; public class GuiWorktable extends GuiForestryTitled { private static final int SPACING = 18; diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java old mode 100644 new mode 100755 index 19f6e281f..8959c2cb5 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java @@ -35,7 +35,7 @@ public class FabricatorRecipeManager implements IFabricatorManager { @Override public void addRecipe(ItemStack plan, FluidStack molten, ItemStack result, Object[] pattern) { ShapedRecipeCustom patternRecipe = new ShapedRecipeCustom(result, pattern); - NonNullList> ingredients = patternRecipe.getIngredients(); + NonNullList> ingredients = patternRecipe.getRawIngredients(); IFabricatorRecipe recipe = new FabricatorRecipe(plan, molten, result, ingredients, patternRecipe.getOreDicts(), patternRecipe.getWidth(), patternRecipe.getHeight()); addRecipe(recipe); diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java old mode 100644 new mode 100755 index d628d9c1b..259a146d6 --- a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java @@ -4,13 +4,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.fluids.FluidStack; + import forestry.api.recipes.ICarpenterRecipe; import forestry.api.recipes.IDescriptiveRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; + import mezz.jei.api.ingredients.IIngredients; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.FluidStack; public class CarpenterRecipeWrapper extends ForestryRecipeWrapper { private final List> inputStacks; @@ -19,7 +22,7 @@ public class CarpenterRecipeWrapper extends ForestryRecipeWrapper> inputs = craftingGridRecipe.getIngredients(); + NonNullList> inputs = craftingGridRecipe.getRawIngredients(); this.inputStacks = new ArrayList<>(); for (List stacks : inputs) { diff --git a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java old mode 100644 new mode 100755 index 3ec74ef8f..736a87b53 --- a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java @@ -3,15 +3,18 @@ package forestry.factory.recipes.jei.rainmaker; import java.awt.Color; import java.util.Collections; -import forestry.api.fuels.RainSubstrate; -import forestry.core.utils.Translator; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.fuels.RainSubstrate; +import forestry.core.utils.Translator; + +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; + public class RainmakerRecipeWrapper extends BlankRecipeWrapper { private final RainSubstrate substrate; @@ -29,12 +32,12 @@ public class RainmakerRecipeWrapper extends BlankRecipeWrapper { public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); - minecraft.fontRendererObj.drawString(getEffectString(), 24, 0, Color.darkGray.getRGB()); + minecraft.fontRenderer.drawString(getEffectString(), 24, 0, Color.darkGray.getRGB()); String speed = Translator.translateToLocalFormatted("for.jei.rainmaker.speed", substrate.getSpeed()); - minecraft.fontRendererObj.drawString(speed, 24, 10, Color.gray.getRGB()); + minecraft.fontRenderer.drawString(speed, 24, 10, Color.gray.getRGB()); if (!substrate.isReverse()) { String duration = Translator.translateToLocalFormatted("for.jei.rainmaker.duration", substrate.getDuration()); - minecraft.fontRendererObj.drawString(duration, 24, 20, Color.gray.getRGB()); + minecraft.fontRenderer.drawString(duration, 24, 20, Color.gray.getRGB()); } } diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java old mode 100644 new mode 100755 index 1d29309d2..e1ca5651b --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -29,7 +29,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -297,8 +296,8 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I } public void sendGUINetworkData(Container container, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, heat); - iCrafting.sendProgressBarUpdate(container, 1, getMeltingPoint()); + iCrafting.sendWindowProperty(container, 0, heat); + iCrafting.sendWindowProperty(container, 1, getMeltingPoint()); } /** diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java old mode 100644 new mode 100755 index b47cb4e03..14007b85c --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -13,6 +13,22 @@ package forestry.factory.tiles; import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IErrorLogic; import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; @@ -31,20 +47,6 @@ import forestry.factory.gui.ContainerFermenter; import forestry.factory.gui.GuiFermenter; import forestry.factory.inventory.InventoryFermenter; import forestry.factory.recipes.FermenterRecipeManager; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile { private final FilteredTank resourceTank; @@ -291,10 +293,10 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu } public void sendGUINetworkData(Container container, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, fuelBurnTime); - iCrafting.sendProgressBarUpdate(container, 1, fuelTotalTime); - iCrafting.sendProgressBarUpdate(container, 2, fermentationTime); - iCrafting.sendProgressBarUpdate(container, 3, fermentationTotalTime); + iCrafting.sendWindowProperty(container, 0, fuelBurnTime); + iCrafting.sendWindowProperty(container, 1, fuelTotalTime); + iCrafting.sendWindowProperty(container, 2, fermentationTime); + iCrafting.sendWindowProperty(container, 3, fermentationTotalTime); } diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java old mode 100644 new mode 100755 index 6d9489388..6f5f3fe47 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -14,6 +14,21 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IErrorLogic; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; @@ -35,19 +50,6 @@ import forestry.factory.gui.ContainerMoistener; import forestry.factory.gui.GuiMoistener; import forestry.factory.inventory.InventoryMoistener; import forestry.factory.recipes.MoistenerRecipeManager; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { private final FilteredTank resourceTank; @@ -502,10 +504,10 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } public void sendGUINetworkData(Container container, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, burnTime); - iCrafting.sendProgressBarUpdate(container, 1, totalTime); - iCrafting.sendProgressBarUpdate(container, 2, productionTime); - iCrafting.sendProgressBarUpdate(container, 3, timePerItem); + iCrafting.sendWindowProperty(container, 0, burnTime); + iCrafting.sendWindowProperty(container, 1, totalTime); + iCrafting.sendWindowProperty(container, 2, productionTime); + iCrafting.sendWindowProperty(container, 3, timePerItem); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java old mode 100644 new mode 100755 index a0745b10b..ed882baca --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -13,6 +13,27 @@ package forestry.factory.tiles; import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IErrorLogic; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; @@ -27,25 +48,6 @@ import forestry.core.tiles.TileBase; import forestry.factory.gui.ContainerRaintank; import forestry.factory.gui.GuiRaintank; import forestry.factory.inventory.InventoryRaintank; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile { private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME); @@ -161,7 +163,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa } public void sendGUINetworkData(Container container, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, containerFiller.getFillingProgress()); + iCrafting.sendWindowProperty(container, 0, containerFiller.getFillingProgress()); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java old mode 100644 new mode 100755 index 4a92018b2..b7172fdb2 --- a/src/main/java/forestry/factory/tiles/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -10,10 +10,25 @@ ******************************************************************************/ package forestry.factory.tiles; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.io.IOException; -import com.google.common.base.Preconditions; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryBasic; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; + +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.core.inventory.InventoryAdapterTile; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.PacketBufferForestry; @@ -28,18 +43,6 @@ import forestry.factory.inventory.InventoryGhostCrafting; import forestry.factory.inventory.InventoryWorktable; import forestry.factory.recipes.MemorizedRecipe; import forestry.factory.recipes.RecipeMemory; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryBasic; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileWorktable extends TileBase implements ICrafterWorktable { private RecipeMemory recipeMemory; @@ -171,7 +174,7 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { Preconditions.checkState(currentRecipe != null); ForgeHooks.setCraftingPlayer(player); - NonNullList remainingItems = CraftingManager.getInstance().getRemainingItems(currentRecipe.getCraftMatrix(), player.world); + NonNullList remainingItems = CraftingManager.getRemainingItems(currentRecipe.getCraftMatrix(), player.world); ForgeHooks.setCraftingPlayer(null); for (ItemStack remainingItem : remainingItems) { diff --git a/src/main/java/forestry/farming/FarmHelper.java b/src/main/java/forestry/farming/FarmHelper.java index 3df16b59f..c951cff3e 100755 --- a/src/main/java/forestry/farming/FarmHelper.java +++ b/src/main/java/forestry/farming/FarmHelper.java @@ -11,12 +11,14 @@ package forestry.farming; import com.google.common.collect.ImmutableSet; -import forestry.api.farming.FarmDirection; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import forestry.api.farming.FarmDirection; + public class FarmHelper { public static final ImmutableSet bricks = ImmutableSet.of( diff --git a/src/main/java/forestry/farming/FarmTarget.java b/src/main/java/forestry/farming/FarmTarget.java index 5dd8b4a08..1b37e3e05 100755 --- a/src/main/java/forestry/farming/FarmTarget.java +++ b/src/main/java/forestry/farming/FarmTarget.java @@ -12,11 +12,12 @@ package forestry.farming; import javax.annotation.Nullable; -import forestry.api.farming.FarmDirection; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; + public class FarmTarget { private final BlockPos start; diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java old mode 100644 new mode 100755 index 3bd7e07a5..eb1434ff6 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -14,20 +14,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.core.blocks.BlockStructure; -import forestry.core.blocks.properties.UnlistedBlockAccess; -import forestry.core.blocks.properties.UnlistedBlockPos; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.ItemStackUtil; -import forestry.farming.models.EnumFarmBlockTexture; -import forestry.farming.tiles.TileFarm; -import forestry.farming.tiles.TileFarmControl; -import forestry.farming.tiles.TileFarmGearbox; -import forestry.farming.tiles.TileFarmHatch; -import forestry.farming.tiles.TileFarmPlain; -import forestry.farming.tiles.TileFarmValve; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; @@ -48,6 +34,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -55,6 +42,21 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.core.blocks.BlockStructure; +import forestry.core.blocks.properties.UnlistedBlockAccess; +import forestry.core.blocks.properties.UnlistedBlockPos; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.ItemStackUtil; +import forestry.farming.models.EnumFarmBlockTexture; +import forestry.farming.tiles.TileFarm; +import forestry.farming.tiles.TileFarmControl; +import forestry.farming.tiles.TileFarmGearbox; +import forestry.farming.tiles.TileFarmHatch; +import forestry.farming.tiles.TileFarmPlain; +import forestry.farming.tiles.TileFarmValve; + public class BlockFarm extends BlockStructure { public static final PropertyEnum META = PropertyEnum.create("meta", EnumFarmBlockType.class); @@ -91,14 +93,14 @@ public class BlockFarm extends BlockStructure { } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { + public void getSubBlocks(CreativeTabs tab, NonNullList list) { for (int i = 0; i < 6; i++) { if (i == 1) { continue; } for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) { - ItemStack stack = new ItemStack(itemIn, 1, i); + ItemStack stack = new ItemStack(this, 1, i); NBTTagCompound compound = new NBTTagCompound(); block.saveToCompound(compound); stack.setTagCompound(compound); diff --git a/src/main/java/forestry/farming/blocks/BlockMushroom.java b/src/main/java/forestry/farming/blocks/BlockMushroom.java old mode 100644 new mode 100755 index 94f754fee..62c6bc0fa --- a/src/main/java/forestry/farming/blocks/BlockMushroom.java +++ b/src/main/java/forestry/farming/blocks/BlockMushroom.java @@ -15,9 +15,6 @@ import java.util.List; import java.util.Locale; import java.util.Random; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.core.config.Constants; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDirt; import net.minecraft.block.IGrowable; @@ -39,9 +36,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenBigMushroom; import net.minecraft.world.gen.feature.WorldGenerator; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.config.Constants; + public class BlockMushroom extends BlockBush implements IItemModelRegister, IGrowable { public static final PropertyEnum VARIANT = PropertyEnum.create("mushroom", MushroomType.class); @@ -158,9 +160,9 @@ public class BlockMushroom extends BlockBush implements IItemModelRegister, IGro } @Override - public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList list) { - list.add(new ItemStack(itemIn, 1, 0)); - list.add(new ItemStack(itemIn, 1, 1)); + public void getSubBlocks(CreativeTabs tab, NonNullList list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); } @Override diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index 4889e7302..52911661f 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.farming.gui; +import net.minecraft.entity.player.InventoryPlayer; + +import net.minecraftforge.fluids.IFluidTank; + import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotFiltered; import forestry.core.gui.slots.SlotLiquidIn; @@ -17,8 +21,6 @@ import forestry.core.gui.slots.SlotOutput; import forestry.core.network.packets.PacketGuiUpdate; import forestry.farming.multiblock.InventoryFarm; import forestry.farming.tiles.TileFarm; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.IFluidTank; public class ContainerFarm extends ContainerSocketed { diff --git a/src/main/java/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java index f735f20db..793ad140d 100755 --- a/src/main/java/forestry/farming/gui/GuiFarm.java +++ b/src/main/java/forestry/farming/gui/GuiFarm.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.farming.gui; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.farming.FarmDirection; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; @@ -17,7 +19,6 @@ import forestry.core.gui.widgets.SocketWidget; import forestry.core.gui.widgets.TankWidget; import forestry.farming.multiblock.IFarmControllerInternal; import forestry.farming.tiles.TileFarm; -import net.minecraft.entity.player.EntityPlayer; public class GuiFarm extends GuiForestryTitled { private final TileFarm tile; diff --git a/src/main/java/forestry/farming/items/ItemBlockFarm.java b/src/main/java/forestry/farming/items/ItemBlockFarm.java old mode 100644 new mode 100755 index dfca8db5f..41be2021d --- a/src/main/java/forestry/farming/items/ItemBlockFarm.java +++ b/src/main/java/forestry/farming/items/ItemBlockFarm.java @@ -10,15 +10,18 @@ ******************************************************************************/ package forestry.farming.items; +import javax.annotation.Nullable; import java.util.List; -import forestry.core.utils.Translator; -import forestry.farming.models.EnumFarmBlockTexture; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; + +import forestry.core.utils.Translator; +import forestry.farming.models.EnumFarmBlockTexture; public class ItemBlockFarm extends ItemBlock { @@ -33,7 +36,7 @@ public class ItemBlockFarm extends ItemBlock { } @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean par4) { + public void addInformation(ItemStack itemstack, @Nullable World world, List info, ITooltipFlag par4) { info.add(Translator.translateToLocal("tile.for.ffarm.tooltip")); if (itemstack.getTagCompound() == null) { return; diff --git a/src/main/java/forestry/farming/logic/Crop.java b/src/main/java/forestry/farming/logic/Crop.java index 560ea19e8..fc2e1636a 100755 --- a/src/main/java/forestry/farming/logic/Crop.java +++ b/src/main/java/forestry/farming/logic/Crop.java @@ -12,12 +12,13 @@ package forestry.farming.logic; import javax.annotation.Nullable; -import forestry.api.farming.ICrop; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.ICrop; + public abstract class Crop implements ICrop { private final World world; protected final BlockPos position; diff --git a/src/main/java/forestry/farming/logic/CropFruit.java b/src/main/java/forestry/farming/logic/CropFruit.java index ba162b073..880cee929 100755 --- a/src/main/java/forestry/farming/logic/CropFruit.java +++ b/src/main/java/forestry/farming/logic/CropFruit.java @@ -10,16 +10,17 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.genetics.IFruitBearer; -import forestry.core.network.packets.PacketFXSignal; -import forestry.core.tiles.TileUtil; -import forestry.core.utils.NetworkUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.genetics.IFruitBearer; +import forestry.core.network.packets.PacketFXSignal; +import forestry.core.tiles.TileUtil; +import forestry.core.utils.NetworkUtil; + public class CropFruit extends Crop { public CropFruit(World world, BlockPos position) { diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index 55192cfa2..5c211cba9 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -10,11 +10,6 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.core.PluginCore; -import forestry.core.blocks.BlockBogEarth; -import forestry.core.config.Constants; -import forestry.core.network.packets.PacketFXSignal; -import forestry.core.utils.NetworkUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -23,6 +18,12 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.core.PluginCore; +import forestry.core.blocks.BlockBogEarth; +import forestry.core.config.Constants; +import forestry.core.network.packets.PacketFXSignal; +import forestry.core.utils.NetworkUtil; + public class CropPeat extends Crop { public CropPeat(World world, BlockPos position) { diff --git a/src/main/java/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java index b49a5c033..8fd73d4ef 100755 --- a/src/main/java/forestry/farming/logic/CropRubber.java +++ b/src/main/java/forestry/farming/logic/CropRubber.java @@ -10,20 +10,12 @@ ******************************************************************************/ package forestry.farming.logic; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableCollection; -import forestry.core.config.Constants; -import forestry.core.network.PacketHandler; -import forestry.core.network.packets.PacketFXSignal; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.NetworkUtil; -import forestry.plugins.compat.PluginIC2; + +import javax.annotation.Nullable; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; @@ -32,6 +24,12 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.core.config.Constants; +import forestry.core.network.packets.PacketFXSignal; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.NetworkUtil; +import forestry.plugins.compat.PluginIC2; + public class CropRubber extends CropDestroy { public CropRubber(World world, IBlockState blockState, BlockPos position) { diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index 2f64b6713..b5318b478 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -10,14 +10,11 @@ ******************************************************************************/ package forestry.farming.logic; +import com.google.common.base.Predicate; + import javax.annotation.Nullable; import java.util.List; -import com.google.common.base.Predicate; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmLogic; -import forestry.core.utils.VectUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureMap; @@ -30,9 +27,15 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmLogic; +import forestry.core.utils.VectUtil; + public abstract class FarmLogic implements IFarmLogic { private final EntitySelectorFarm entitySelectorFarm = new EntitySelectorFarm(this); protected boolean isManual; @@ -86,7 +89,7 @@ public abstract class FarmLogic implements IFarmLogic { List entityItems = world.getEntitiesWithinAABB(EntityItem.class, harvestBox, entitySelectorFarm); NonNullList stacks = NonNullList.create(); for (EntityItem entity : entityItems) { - ItemStack contained = entity.getEntityItem(); + ItemStack contained = entity.getItem(); stacks.add(contained.copy()); entity.setDead(); } @@ -109,8 +112,8 @@ public abstract class FarmLogic implements IFarmLogic { if (entity.getEntityData().getBoolean("PreventRemoteMovement")) { return false; } - - ItemStack contained = entity.getEntityItem(); + + ItemStack contained = entity.getItem(); return farmLogic.isAcceptedGermling(contained) || farmLogic.isAcceptedWindfall(contained); } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index a6cbcd980..5705544cb 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -19,12 +19,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.PluginCore; -import forestry.farming.FarmRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -32,6 +26,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.PluginCore; +import forestry.farming.FarmRegistry; + public class FarmLogicArboreal extends FarmLogicHomogeneous { public FarmLogicArboreal(ItemStack resource, IBlockState ground, Collection germlings) { super(resource, ground, germlings); diff --git a/src/main/java/forestry/farming/logic/FarmLogicCereal.java b/src/main/java/forestry/farming/logic/FarmLogicCereal.java index fa0192959..5a15f5495 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCereal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCereal.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.farming.FarmRegistry; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import forestry.farming.FarmRegistry; + public class FarmLogicCereal extends FarmLogicCrops { public FarmLogicCereal() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 7188be2db..8332f0959 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -19,10 +19,6 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; import net.minecraft.block.Block; import net.minecraft.block.BlockOldLog; import net.minecraft.block.BlockPlanks; @@ -35,6 +31,11 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; + public class FarmLogicCocoa extends FarmLogic { private final IFarmable cocoa = new FarmableCocoa(); diff --git a/src/main/java/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java index 024e3ab69..3e77448cf 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCrops.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCrops.java @@ -13,11 +13,6 @@ package forestry.farming.logic; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.utils.BlockUtil; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -25,6 +20,12 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; + public abstract class FarmLogicCrops extends FarmLogicWatered { private final Iterable seeds; diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 444756809..4aacc518b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -13,11 +13,6 @@ package forestry.farming.logic; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.farming.FarmRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -25,6 +20,12 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.farming.FarmRegistry; + public class FarmLogicGourd extends FarmLogic { private final IFarmable[] seeds; diff --git a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java index d8cd6780e..ada4a287f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicInfernal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java @@ -13,12 +13,6 @@ package forestry.farming.logic; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.utils.BlockUtil; -import forestry.farming.FarmRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,6 +21,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; +import forestry.farming.FarmRegistry; + public class FarmLogicInfernal extends FarmLogicHomogeneous { public FarmLogicInfernal() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 10dcca094..7191c0b54 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -13,16 +13,17 @@ package forestry.farming.logic; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.core.PluginCore; -import forestry.core.blocks.BlockBogEarth; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.core.PluginCore; +import forestry.core.blocks.BlockBogEarth; + public class FarmLogicPeat extends FarmLogicWatered { private static final ItemStack bogEarth = PluginCore.getBlocks().bogEarth.get(BlockBogEarth.SoilType.BOG_EARTH, 1); diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index a392d4534..23425d204 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -15,12 +15,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.Log; -import forestry.plugins.compat.PluginIC2; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -28,6 +22,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.core.utils.ItemStackUtil; +import forestry.core.utils.Log; +import forestry.plugins.compat.PluginIC2; + public class FarmLogicRubber extends FarmLogic { private boolean active = true; diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index c7c9f484a..e685bd49d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -13,12 +13,6 @@ package forestry.farming.logic; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.utils.ItemStackUtil; -import forestry.farming.FarmRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,6 +21,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.utils.ItemStackUtil; +import forestry.farming.FarmRegistry; + public class FarmLogicSucculent extends FarmLogic { private final Collection germlings = FarmRegistry.getInstance().getFarmables("farmSucculentes"); diff --git a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java index a33689bc4..7a7fda24f 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicVegetable.java +++ b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.farming.FarmRegistry; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import forestry.farming.FarmRegistry; + public class FarmLogicVegetable extends FarmLogicCrops { public FarmLogicVegetable() { diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index 43c6152c3..1fcc5ba5a 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -10,20 +10,22 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.IFarmHousing; -import forestry.core.utils.BlockUtil; -import forestry.farming.FarmHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.IFarmHousing; +import forestry.core.utils.BlockUtil; +import forestry.farming.FarmHelper; + public abstract class FarmLogicWatered extends FarmLogic { protected final IBlockState ground; diff --git a/src/main/java/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java index e76f40974..0f821f020 100755 --- a/src/main/java/forestry/farming/logic/FarmableCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmableCocoa.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.core.utils.BlockUtil; import net.minecraft.block.BlockCocoa; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -20,6 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.core.utils.BlockUtil; + public class FarmableCocoa extends FarmableAgingCrop { public static final Item COCOA_SEED = Items.DYE; diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index b7ce738a4..a744dad56 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -10,6 +10,13 @@ ******************************************************************************/ package forestry.farming.logic; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; @@ -17,12 +24,6 @@ import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.arboriculture.PluginArboriculture; import forestry.core.utils.GeneticsUtil; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class FarmableGE implements IFarmable { diff --git a/src/main/java/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java index e9bfcec81..3c1efe3b2 100755 --- a/src/main/java/forestry/farming/logic/FarmableGourd.java +++ b/src/main/java/forestry/farming/logic/FarmableGourd.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; -import forestry.core.utils.BlockUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +17,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; + public class FarmableGourd implements IFarmable { private final ItemStack seed; diff --git a/src/main/java/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java index c44062b63..2bc8bea39 100755 --- a/src/main/java/forestry/farming/logic/FarmableStacked.java +++ b/src/main/java/forestry/farming/logic/FarmableStacked.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; -import forestry.core.utils.BlockUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +17,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; +import forestry.core.utils.BlockUtil; + public class FarmableStacked implements IFarmable { protected final ItemStack germling; protected final Block cropBlock; diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java index c8bf88bcf..74fbedf35 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java @@ -10,16 +10,6 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.TreeManager; -import forestry.api.core.ForestryAPI; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmable; -import forestry.api.genetics.IIndividual; -import forestry.core.network.packets.PacketFXSignal; -import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.NetworkUtil; -import forestry.plugins.ForestryPluginUids; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -32,6 +22,17 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.TreeManager; +import forestry.api.core.ForestryAPI; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmable; +import forestry.api.genetics.IIndividual; +import forestry.core.network.packets.PacketFXSignal; +import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.NetworkUtil; +import forestry.plugins.ForestryPluginUids; + public class FarmableVanillaSapling implements IFarmable { protected final ItemStack germling; diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java old mode 100644 new mode 100755 index 35aa71dae..b98445f72 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.farming.multiblock; +import com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; @@ -26,8 +29,18 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; +import net.minecraft.world.World; + +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitBoard; @@ -68,16 +81,6 @@ import forestry.farming.gui.IFarmLedgerDelegate; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.tiles.TileFarmGearbox; import forestry.farming.tiles.TileFarmPlain; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class FarmController extends RectangularMultiblockControllerBase implements IFarmControllerInternal, ILiquidTankTile { @@ -835,7 +838,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen // for debugging @Override public String toString() { - return Objects.toStringHelper(this).add("stage", stage).add("logic", farmLogics.toString()).toString(); + return MoreObjects.toStringHelper(this).add("stage", stage).add("logic", farmLogics.toString()).toString(); } private static class TopDownICropComparator implements Comparator { diff --git a/src/main/java/forestry/food/items/ItemAmbrosia.java b/src/main/java/forestry/food/items/ItemAmbrosia.java index 6c6bbaf35..31f1cab2b 100755 --- a/src/main/java/forestry/food/items/ItemAmbrosia.java +++ b/src/main/java/forestry/food/items/ItemAmbrosia.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.food.items; -import forestry.core.config.Constants; -import forestry.core.items.ItemForestryFood; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import forestry.core.config.Constants; +import forestry.core.items.ItemForestryFood; + public class ItemAmbrosia extends ItemForestryFood { public ItemAmbrosia() { diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java old mode 100644 new mode 100755 index 8a0fa2def..f052405af --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -16,6 +16,44 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumFacing.Plane; +import net.minecraft.util.EnumHand; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.Rotation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.ForestryAPI; import forestry.api.core.ICamouflagedTile; import forestry.api.core.IModelManager; @@ -36,7 +74,6 @@ import forestry.core.utils.CamouflageUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Translator; -import forestry.greenhouse.tiles.TileGreenhouseNursery; import forestry.greenhouse.tiles.TileGreenhouseClimateControl; import forestry.greenhouse.tiles.TileGreenhouseControl; import forestry.greenhouse.tiles.TileGreenhouseDoor; @@ -46,46 +83,12 @@ import forestry.greenhouse.tiles.TileGreenhouseGearbox; import forestry.greenhouse.tiles.TileGreenhouseHatch; import forestry.greenhouse.tiles.TileGreenhouseHeater; import forestry.greenhouse.tiles.TileGreenhouseHumidifier; +import forestry.greenhouse.tiles.TileGreenhouseNursery; import forestry.greenhouse.tiles.TileGreenhousePlain; import forestry.greenhouse.tiles.TileGreenhouseValve; import forestry.greenhouse.tiles.TileGreenhouseWindow; import forestry.greenhouse.tiles.TileGreenhouseWindow.WindowMode; import forestry.plugins.ForestryPluginUids; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumFacing.Plane; -import net.minecraft.util.EnumHand; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockGreenhouse extends BlockStructure implements ISpriteRegister, IColoredBlock, IBlockRotatable { private static final AxisAlignedBB SPRINKLER_BOUNDS = new AxisAlignedBB(0.3125F, 0.25F, 0.3125F, 0.6875F, 1F, 0.6875F); @@ -450,7 +453,7 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag advanced) { tooltip.add(Translator.translateToLocal("tile.for.greenhouse.tooltip")); tooltip.add(TextFormatting.GREEN.toString() + TextFormatting.ITALIC.toString() + Translator.translateToLocal("tile.for.greenhouse.camouflage.tooltip")); } diff --git a/src/main/java/forestry/greenhouse/entities/SprinklerWater.java b/src/main/java/forestry/greenhouse/entities/SprinklerWater.java old mode 100644 new mode 100755 index b7fbd477e..0c39c8536 --- a/src/main/java/forestry/greenhouse/entities/SprinklerWater.java +++ b/src/main/java/forestry/greenhouse/entities/SprinklerWater.java @@ -2,12 +2,13 @@ package forestry.greenhouse.entities; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; + import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -18,9 +19,9 @@ public abstract class SprinklerWater extends Particle { public SprinklerWater(World world, double x, double y, double z, Vec3d vector, ResourceLocation texture) { super(world, x, y, z, 0, 0, 0); this.particleScale = 0.3F; - this.motionX = vector.xCoord; - this.motionY = vector.yCoord; - this.motionZ = vector.zCoord; + this.motionX = vector.x; + this.motionY = vector.y; + this.motionZ = vector.z; this.particleMaxAge = 15; this.setSize(0.2f, 0.2f); } @@ -31,24 +32,24 @@ public abstract class SprinklerWater extends Particle { } @Override - public void renderParticle(VertexBuffer worldRenderer, Entity entity, float partialTicks, float f0, float f1, float f2, float f3, float f4) { + public void renderParticle(BufferBuilder buffer, Entity entity, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { float f6 = 0; float f7 = 1; float f8 = 0; float f9 = 1; float f10 = 0.1F * this.particleScale; - float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * f0 - interpPosX); - float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * f0 - interpPosY); - float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * f0 - interpPosZ); + float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * rotationX - interpPosX); + float f12 = (float) (this.prevPosY + (this.posY - this.prevPosY) * rotationX - interpPosY); + float f13 = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * rotationX - interpPosZ); TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); textureManager.bindTexture(FluidRegistry.WATER.getStill()); int i = this.getBrightnessForRender(partialTicks); int j = i >> 16 & 65535; int k = i & 65535; - worldRenderer.pos((f11 - f1 * f10 - f4 * f10), (f12 - f2 * f10), (f13 - f3 * f10 - f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f7, f9).lightmap(j, k).endVertex(); - worldRenderer.pos((f11 - f1 * f10 + f4 * f10), (f12 + f2 * f10), (f13 - f3 * f10 + f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f7, f8).lightmap(j, k).endVertex(); - worldRenderer.pos((f11 + f1 * f10 + f4 * f10), (f12 + f2 * f10), (f13 + f3 * f10 + f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f6, f8).lightmap(j, k).endVertex(); - worldRenderer.pos((f11 + f1 * f10 - f4 * f10), (f12 - f2 * f10), (f13 + f3 * f10 - f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f6, f9).lightmap(j, k).endVertex(); + buffer.pos((f11 - rotationZ * f10 - rotationXZ * f10), (f12 - rotationYZ * f10), (f13 - rotationXY * f10 - f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f7, f9).lightmap(j, k).endVertex(); + buffer.pos((f11 - rotationZ * f10 + rotationXZ * f10), (f12 + rotationYZ * f10), (f13 - rotationXY * f10 + f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f7, f8).lightmap(j, k).endVertex(); + buffer.pos((f11 + rotationZ * f10 + rotationXZ * f10), (f12 + rotationYZ * f10), (f13 + rotationXY * f10 + f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f6, f8).lightmap(j, k).endVertex(); + buffer.pos((f11 + rotationZ * f10 - rotationXZ * f10), (f12 - rotationYZ * f10), (f13 + rotationXY * f10 - f6 * f10)).color(1F, 1F, 1F, 0.5F).tex(f6, f9).lightmap(j, k).endVertex(); } // avoid calculating lighting for water, it is too much processing diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java old mode 100644 new mode 100755 index a3a4f4a55..98854d785 --- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java +++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java @@ -12,6 +12,8 @@ package forestry.greenhouse.gui; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.core.CamouflageManager; import forestry.core.climate.ClimateInfo; import forestry.core.config.Constants; @@ -21,7 +23,6 @@ import forestry.core.gui.widgets.TankWidget; import forestry.core.owner.IOwnedTile; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; import forestry.greenhouse.tiles.TileGreenhouse; -import net.minecraft.entity.player.EntityPlayer; public class GuiGreenhouse extends GuiForestryTitled { @@ -59,7 +60,7 @@ public class GuiGreenhouse extends GuiForestryTitled { super.initGui(); if(hasFields()){ - fields = new ClimateTextFields(controller, fontRendererObj, guiLeft, guiTop); + fields = new ClimateTextFields(controller, fontRenderer, guiLeft, guiTop); }else{ fields = null; } diff --git a/src/main/java/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java index 4ae989798..39c76f3e6 100755 --- a/src/main/java/forestry/lepidopterology/ButterflySpawner.java +++ b/src/main/java/forestry/lepidopterology/ButterflySpawner.java @@ -12,13 +12,14 @@ package forestry.lepidopterology; import java.util.Random; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.lepidopterology.entities.EntityButterfly; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class ButterflySpawner implements ILeafTickHandler { diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java old mode 100644 new mode 100755 index fd729a92c..e65054944 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.lepidopterology; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import javax.annotation.Nullable; import java.io.File; import java.util.ArrayList; @@ -21,9 +25,23 @@ import java.util.Map.Entry; import java.util.Random; import java.util.Set; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Property; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; + import forestry.Forestry; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; @@ -59,21 +77,6 @@ import forestry.lepidopterology.worldgen.CocoonDecorator; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Property; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; @ForestryPlugin(pluginID = ForestryPluginUids.LEPIDOPTEROLOGY, name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.lepidopterology.description") public class PluginLepidopterology extends BlankForestryPlugin { @@ -293,7 +296,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { BlockRegistryLepidopterology blocks = getBlocks(); ItemRegistryLepidopterology items = getItems(); - CraftingManager.getInstance().getRecipeList().add(new MatingRecipe()); + ForgeRegistries.RECIPES.register(new MatingRecipe()); RecipeUtil.addRecipe(blocks.butterflyChest, " # ", "XYX", "XXX", '#', "blockGlass", 'X', new ItemStack(items.butterflyGE, 1, OreDictionary.WILDCARD_VALUE), 'Y', "chestWood"); diff --git a/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java b/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java old mode 100644 new mode 100755 index 3b3e40f5d..a8a0bb53f --- a/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/PropertyCocoon.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.lepidopterology.blocks; +import com.google.common.base.MoreObjects; + import java.util.ArrayList; import java.util.List; -import com.google.common.base.Objects; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -33,7 +34,7 @@ public class PropertyCocoon extends PropertyAllele { @Override public String toString() { - return Objects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleButterflyCocoon.class).add("values", this.getAllowedValues()).toString(); + return MoreObjects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleButterflyCocoon.class).add("values", this.getAllowedValues()).toString(); } @Override diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java index 0cef4cd0d..cb32f31a9 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java @@ -53,7 +53,7 @@ public abstract class AIButterflyBase extends EntityAIBase { } private boolean validateDestination(Vec3d dest, boolean allowFluids) { - if (dest.yCoord < 1) { + if (dest.y < 1) { return false; } BlockPos pos = new BlockPos(dest); @@ -68,7 +68,7 @@ public abstract class AIButterflyBase extends EntityAIBase { if (!block.isPassable(entity.world, pos)) { return false; } - return entity.getButterfly().isAcceptedEnvironment(entity.world, dest.xCoord, dest.yCoord, dest.zCoord); + return entity.getButterfly().isAcceptedEnvironment(entity.world, dest.x, dest.y, dest.z); } } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java index e754b2261..71c80ad91 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java @@ -37,7 +37,7 @@ public class AIButterflyFlee extends AIButterflyMovement { return false; } - if (player.getDistanceSq(flightTarget.xCoord, flightTarget.yCoord, flightTarget.zCoord) < player.getDistanceSqToEntity(entity)) { + if (player.getDistanceSq(flightTarget.x, flightTarget.y, flightTarget.z) < player.getDistanceSqToEntity(entity)) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java index b92438002..79b2bd458 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java @@ -45,7 +45,7 @@ public abstract class AIButterflyInteract extends AIButterflyBase { protected abstract boolean canInteract(); @Override - public boolean continueExecuting() { + public boolean shouldContinueExecuting() { return canInteract && !hasInteracted; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java old mode 100644 new mode 100755 index 6e7aa1abe..9b624069f --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -47,7 +47,7 @@ public class AIButterflyMate extends AIButterflyInteract { @Override public void updateTask() { - if (continueExecuting()) { + if (shouldContinueExecuting()) { if (entity.getButterfly().getMate() == null && targetMate != null) { if (entity.cooldownMate <= 0 && entity.getDistanceSqToEntity(targetMate) < 9.0D) { entity.getButterfly().mate(targetMate.getButterfly()); @@ -88,8 +88,8 @@ public class AIButterflyMate extends AIButterflyInteract { } @Override - public boolean continueExecuting() { - if (!super.continueExecuting()) { + public boolean shouldContinueExecuting() { + if (!super.shouldContinueExecuting()) { return false; } if (entity.getButterfly().getMate() == null) { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java old mode 100644 new mode 100755 index 97d759ea7..7ea0f560f --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMovement.java @@ -26,7 +26,7 @@ public abstract class AIButterflyMovement extends AIButterflyBase { } @Override - public boolean continueExecuting() { + public boolean shouldContinueExecuting() { if (entity.getState() != EnumButterflyState.FLYING) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java old mode 100644 new mode 100755 index e28f52810..eb1758571 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -48,7 +48,7 @@ public class AIButterflyPollinate extends AIButterflyInteract { @Override public void updateTask() { - if (continueExecuting() && rest != null) { + if (shouldContinueExecuting() && rest != null) { ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(entity.world, rest); if (checkPollinatable != null) { if (entity.getPollen() == null) { diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java index 94b8e0863..659e22a98 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java @@ -18,6 +18,7 @@ import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; + import net.minecraftforge.common.IPlantable; public class AIButterflyRest extends AIButterflyBase { @@ -62,7 +63,7 @@ public class AIButterflyRest extends AIButterflyBase { } @Override - public boolean continueExecuting() { + public boolean shouldContinueExecuting() { if (entity.getExhaustion() <= 0 && entity.canFly()) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java old mode 100644 new mode 100755 index a1ce723c3..963110d76 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyRise.java @@ -41,7 +41,7 @@ public class AIButterflyRise extends AIButterflyMovement { } @Override - public boolean continueExecuting() { + public boolean shouldContinueExecuting() { if (entity.getState() != EnumButterflyState.RISING) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index a443d74cd..9e7b87d54 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -12,24 +12,6 @@ package forestry.lepidopterology.entities; import javax.annotation.Nullable; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.core.IToolScoop; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyRoot; -import forestry.api.lepidopterology.IEntityButterfly; -import forestry.api.lepidopterology.ILepidopteristTracker; -import forestry.core.utils.ItemStackUtil; -import forestry.lepidopterology.PluginLepidopterology; -import forestry.lepidopterology.genetics.Butterfly; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFlower; @@ -57,10 +39,30 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; + import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.core.IToolScoop; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyGenome; +import forestry.api.lepidopterology.IButterflyRoot; +import forestry.api.lepidopterology.IEntityButterfly; +import forestry.api.lepidopterology.ILepidopteristTracker; +import forestry.core.utils.ItemStackUtil; +import forestry.lepidopterology.PluginLepidopterology; +import forestry.lepidopterology.genetics.Butterfly; + public class EntityButterfly extends EntityCreature implements IEntityButterfly { /* CONSTANTS */ @@ -499,9 +501,9 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly super.updateAITasks(); if (getState().doesMovement && flightTarget != null) { - double diffX = flightTarget.xCoord + 0.5d - posX; - double diffY = flightTarget.yCoord + 0.1d - posY; - double diffZ = flightTarget.zCoord + 0.5d - posZ; + double diffX = flightTarget.x + 0.5d - posX; + double diffY = flightTarget.y + 0.1d - posY; + double diffZ = flightTarget.z + 0.5d - posZ; motionX += (Math.signum(diffX) * 0.5d - motionX) * 0.10000000149011612d; motionY += (Math.signum(diffY) * 0.699999988079071d - motionY) * 0.10000000149011612d; diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index eb2b9aae6..7af598ec4 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -11,7 +11,6 @@ package forestry.lepidopterology.genetics; import javax.annotation.Nullable; - import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -19,6 +18,17 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.minecraft.entity.EntityCreature; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + +import net.minecraftforge.common.BiomeDictionary; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorState; @@ -46,15 +56,6 @@ import forestry.core.genetics.IndividualLiving; import forestry.core.utils.ClimateUtil; import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; -import net.minecraft.entity.EntityCreature; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.BiomeDictionary; public class Butterfly extends IndividualLiving implements IButterfly { private static final Random rand = new Random(); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index 83d0328f1..39ca1806b 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -12,6 +12,10 @@ package forestry.lepidopterology.genetics; import com.google.common.base.Preconditions; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; @@ -29,8 +33,6 @@ import forestry.api.lepidopterology.IButterflyGenome; import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleTolerance; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class ButterflyGenome extends Genome implements IButterflyGenome { diff --git a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java index a8508043f..be736789c 100755 --- a/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java +++ b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.genetics.BreedingTracker; -import net.minecraft.entity.player.EntityPlayer; public class LepidopteristTracker extends BreedingTracker implements ILepidopteristTracker { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 51f7cdc8c..3c617a7ea 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -86,7 +86,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList subItems) { addCreativeItems(subItems, true); } @@ -129,8 +129,8 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored if (rand.nextInt(24) != 0) { return false; } - - IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(entityItem.getEntityItem()); + + IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(entityItem.getItem()); if (butterfly == null) { return false; } @@ -146,8 +146,8 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored EntityUtil.spawnEntity(entityItem.world, new EntityButterfly(entityItem.world, butterfly, entityItem.getPosition()), entityItem.posX, entityItem.posY, entityItem.posZ); - if (!entityItem.getEntityItem().isEmpty()) { - entityItem.getEntityItem().shrink(1); + if (!entityItem.getItem().isEmpty()) { + entityItem.getItem().shrink(1); } else { entityItem.setDead(); } diff --git a/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java old mode 100644 new mode 100755 index 500d4094e..bae53292e --- a/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java +++ b/src/main/java/forestry/lepidopterology/recipes/MatingRecipe.java @@ -12,16 +12,20 @@ package forestry.lepidopterology.recipes; import javax.annotation.Nullable; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IButterfly; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.common.ForgeHooks; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.config.Constants; + public class MatingRecipe implements IRecipe { private final ItemStack unknown; @@ -82,8 +86,8 @@ public class MatingRecipe implements IRecipe { } @Override - public int getRecipeSize() { - return 2; + public boolean canFit(int width, int height) { + return width * height >= 2; } @Override @@ -96,5 +100,20 @@ public class MatingRecipe implements IRecipe { } return aitemstack; } - + + @Override + public IRecipe setRegistryName(ResourceLocation name) { + throw new IllegalStateException(); + } + + @Nullable + @Override + public ResourceLocation getRegistryName() { + return new ResourceLocation(Constants.MOD_ID, "butterflyMating"); + } + + @Override + public Class getRegistryType() { + return IRecipe.class; + } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index 727d66e03..73a6842db 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -15,6 +15,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java old mode 100644 new mode 100755 index 5016e8c6b..0df07e04f --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -10,21 +10,16 @@ ******************************************************************************/ package forestry.lepidopterology.render; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.concurrent.TimeUnit; - import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IButterfly; -import forestry.core.models.BlankModel; -import forestry.core.models.DefaultTextureGetter; -import forestry.core.models.TRSRBakedModel; + +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.concurrent.TimeUnit; + import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelRotation; @@ -33,13 +28,20 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.ModelProcessingHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.models.BlankModel; +import forestry.core.models.DefaultTextureGetter; +import forestry.core.models.TRSRBakedModel; + @SideOnly(Side.CLIENT) public class ModelButterflyItem extends BlankModel { @Nullable @@ -71,7 +73,7 @@ public class ModelButterflyItem extends BlankModel { throw new IllegalArgumentException("Could not bake butterfly model"); } } - IModel retexturedModel = ModelProcessingHelper.retexture(modelButterfly, textures.build()); + IModel retexturedModel = modelButterfly.retexture(textures.build()); IBakedModel bakedModel = retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE); return new TRSRBakedModel(bakedModel, -0.03125F, 0.25F - butterfly.getSize() * 0.37F, -0.03125F, butterfly.getSize() * 1.5F); } diff --git a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java old mode 100644 new mode 100755 index d97e29742..7fab7a706 --- a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java +++ b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java @@ -15,6 +15,19 @@ import java.util.List; import java.util.Random; import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.BiomeDictionary.Type; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; +import net.minecraftforge.event.terraingen.TerrainGen; + import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.core.config.Constants; @@ -22,17 +35,6 @@ import forestry.core.tiles.TileUtil; import forestry.core.utils.BlockUtil; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.tiles.TileCocoon; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.BiomeDictionary.Type; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType; -import net.minecraftforge.event.terraingen.TerrainGen; public abstract class CocoonDecorator { diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 25ba014c8..e2a82c1d9 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -14,18 +14,20 @@ import javax.annotation.Nullable; import java.util.List; import java.util.Random; +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.ITextComponent; + import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; import forestry.core.utils.Translator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import org.apache.commons.lang3.StringUtils; public class Letter implements ILetter { private static final Random rand = new Random(); diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index 9b425e095..e7aacaeb8 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -10,21 +10,23 @@ ******************************************************************************/ package forestry.mail; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; -import com.google.common.base.Preconditions; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.storage.WorldSavedData; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.WorldSavedData; public class POBox extends WorldSavedData implements IInventory { diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index c5bc8e4a9..331955143 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -13,6 +13,12 @@ package forestry.mail; import java.io.File; import java.util.LinkedHashMap; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.world.World; +import net.minecraft.world.storage.WorldSavedData; + import forestry.api.mail.EnumPostage; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; @@ -23,11 +29,6 @@ import forestry.api.mail.IStamps; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.mail.items.EnumStampDefinition; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; public class PostOffice extends WorldSavedData implements IPostOffice { diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 7a9b19d95..f6bc22f06 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -16,7 +16,13 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; @@ -29,10 +35,6 @@ import forestry.core.utils.Log; import forestry.core.utils.NetworkUtil; import forestry.core.utils.PlayerUtil; import forestry.mail.network.packets.PacketPOBoxInfoResponse; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class PostRegistry implements IPostRegistry { @Nullable diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index 0c2d2f77e..dceb99fd0 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -10,6 +10,15 @@ ******************************************************************************/ package forestry.mail; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; import forestry.api.mail.IPostOffice; @@ -22,13 +31,6 @@ import forestry.core.utils.NetworkUtil; import forestry.core.utils.PlayerUtil; import forestry.core.utils.Translator; import forestry.mail.network.packets.PacketPOBoxInfoResponse; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PostalCarrier implements IPostalCarrier { diff --git a/src/main/java/forestry/mail/SaveEventHandlerMail.java b/src/main/java/forestry/mail/SaveEventHandlerMail.java index bc1a054d0..0e993c214 100755 --- a/src/main/java/forestry/mail/SaveEventHandlerMail.java +++ b/src/main/java/forestry/mail/SaveEventHandlerMail.java @@ -10,9 +10,10 @@ ******************************************************************************/ package forestry.mail; -import forestry.core.ISaveEventHandler; import net.minecraft.world.World; +import forestry.core.ISaveEventHandler; + public class SaveEventHandlerMail implements ISaveEventHandler { @Override diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index b87dddecc..14282a5a1 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -10,7 +10,18 @@ ******************************************************************************/ package forestry.mail; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.World; +import net.minecraft.world.storage.WorldSavedData; + import com.mojang.authlib.GameProfile; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumPostage; import forestry.api.mail.EnumTradeStationState; @@ -28,15 +39,6 @@ import forestry.core.utils.PlayerUtil; import forestry.core.utils.Translator; import forestry.mail.inventory.InventoryTradeStation; import forestry.mail.items.EnumStampDefinition; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; public class TradeStation extends WorldSavedData implements ITradeStation, IInventoryAdapter { public static final String SAVE_NAME = "TradePO_"; diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index b518951db..267fba1a3 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -18,6 +18,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumTradeStationState; import forestry.api.mail.IMailAddress; @@ -29,10 +34,6 @@ import forestry.api.mail.PostManager; import forestry.core.gui.IGuiSelectable; import forestry.core.utils.NetworkUtil; import forestry.mail.network.packets.PacketLetterInfoResponse; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; public class ContainerCatalogue extends Container implements IGuiSelectable, ILetterInfoReceiver { @@ -158,9 +159,9 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe if (needsSync) { for (IContainerListener crafter : listeners) { - crafter.sendProgressBarUpdate(this, 0, stationIndex); - crafter.sendProgressBarUpdate(this, 1, stations.size()); - crafter.sendProgressBarUpdate(this, 2, currentFilter); + crafter.sendWindowProperty(this, 0, stationIndex); + crafter.sendWindowProperty(this, 1, stations.size()); + crafter.sendWindowProperty(this, 2, currentFilter); } NetworkUtil.sendToPlayer(new PacketLetterInfoResponse(EnumAddressee.TRADER, currentTrade, null), player); diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index bacff9709..b5f316e14 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -13,7 +13,15 @@ package forestry.mail.gui; import javax.annotation.Nullable; import java.util.Iterator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.ILetter; import forestry.api.mail.IMailAddress; @@ -29,11 +37,6 @@ import forestry.mail.Letter; import forestry.mail.inventory.ItemInventoryLetter; import forestry.mail.network.packets.PacketLetterInfoResponse; import forestry.mail.network.packets.PacketLetterTextSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ContainerLetter extends ContainerItemInventory implements ILetterInfoReceiver { diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index cc9348274..69aee8192 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -12,6 +12,12 @@ package forestry.mail.gui; import javax.annotation.Nullable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ClickType; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotOutput; import forestry.core.utils.NetworkUtil; @@ -20,11 +26,6 @@ import forestry.mail.POBox; import forestry.mail.POBoxInfo; import forestry.mail.network.packets.PacketPOBoxInfoResponse; import forestry.mail.tiles.TileMailbox; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class ContainerMailbox extends ContainerTile { diff --git a/src/main/java/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java index 4db6d9972..43847d1af 100755 --- a/src/main/java/forestry/mail/gui/ContainerTradeName.java +++ b/src/main/java/forestry/mail/gui/ContainerTradeName.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.mail.gui; +import net.minecraft.entity.player.EntityPlayer; + import forestry.api.mail.IMailAddress; import forestry.core.gui.ContainerTile; import forestry.mail.tiles.TileTrader; -import net.minecraft.entity.player.EntityPlayer; public class ContainerTradeName extends ContainerTile { diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 3cd16581e..4274b4391 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.mail.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.api.mail.IMailAddress; import forestry.core.gui.ContainerTile; import forestry.core.gui.slots.SlotFiltered; @@ -17,7 +19,6 @@ import forestry.core.gui.slots.SlotForestry; import forestry.core.gui.slots.SlotOutput; import forestry.mail.TradeStation; import forestry.mail.tiles.TileTrader; -import net.minecraft.entity.player.InventoryPlayer; public class ContainerTrader extends ContainerTile { diff --git a/src/main/java/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java index 591bfdc68..dfc1e8bca 100755 --- a/src/main/java/forestry/mail/gui/GuiCatalogue.java +++ b/src/main/java/forestry/mail/gui/GuiCatalogue.java @@ -13,6 +13,14 @@ package forestry.mail.gui; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; + +import org.lwjgl.input.Keyboard; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.ITradeStationInfo; import forestry.core.config.SessionVars; @@ -23,12 +31,6 @@ import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.render.ColourProperties; import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextFormatting; -import org.lwjgl.input.Keyboard; public class GuiCatalogue extends GuiForestry { @@ -74,8 +76,8 @@ public class GuiCatalogue extends GuiForestry { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - fontRendererObj.drawString(String.format("%s / %s", container.getPageNumber(), container.getPageCount()), guiLeft + xSize - 72, guiTop + 12, ColourProperties.INSTANCE.get("gui.book")); + + fontRenderer.drawString(String.format("%s / %s", container.getPageNumber(), container.getPageCount()), guiLeft + xSize - 72, guiTop + 12, ColourProperties.INSTANCE.get("gui.book")); clearTradeInfoWidgets(); @@ -93,18 +95,18 @@ public class GuiCatalogue extends GuiForestry { } private void drawNoTrade(int x, int y) { - fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.mail.notrades"), x, y + 18, 119, ColourProperties.INSTANCE.get("gui.book")); + fontRenderer.drawSplitString(Translator.translateToLocal("for.gui.mail.notrades"), x, y + 18, 119, ColourProperties.INSTANCE.get("gui.book")); } private void drawTradePreview(ITradeStationInfo tradeInfo, int x, int y) { - - fontRendererObj.drawString(boldUnderline + tradeInfo.getAddress().getName(), x, y, ColourProperties.INSTANCE.get("gui.book")); - - fontRendererObj.drawString(String.format(Translator.translateToLocal("for.gui.mail.willtrade"), tradeInfo.getOwner().getName()), x, y + 18, ColourProperties.INSTANCE.get("gui.book")); + + fontRenderer.drawString(boldUnderline + tradeInfo.getAddress().getName(), x, y, ColourProperties.INSTANCE.get("gui.book")); + + fontRenderer.drawString(String.format(Translator.translateToLocal("for.gui.mail.willtrade"), tradeInfo.getOwner().getName()), x, y + 18, ColourProperties.INSTANCE.get("gui.book")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x - guiLeft, y - guiTop + 28, tradeInfo.getTradegood())); - - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.tradefor"), x, y + 46, ColourProperties.INSTANCE.get("gui.book")); + + fontRenderer.drawString(Translator.translateToLocal("for.gui.mail.tradefor"), x, y + 46, ColourProperties.INSTANCE.get("gui.book")); for (int i = 0; i < tradeInfo.getRequired().size(); i++) { ItemStack itemStack = tradeInfo.getRequired().get(i); @@ -112,9 +114,9 @@ public class GuiCatalogue extends GuiForestry { } if (tradeInfo.getState().isOk()) { - fontRendererObj.drawSplitString(TextFormatting.DARK_GREEN + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); + fontRenderer.drawSplitString(TextFormatting.DARK_GREEN + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); } else { - fontRendererObj.drawSplitString(TextFormatting.DARK_RED + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); + fontRenderer.drawSplitString(TextFormatting.DARK_RED + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); } } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index fcde59f3f..cd3d9cc65 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -13,6 +13,17 @@ package forestry.mail.gui; import java.io.IOException; import java.util.ArrayList; +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.lwjgl.input.Keyboard; + import forestry.api.mail.EnumAddressee; import forestry.api.mail.IMailAddress; import forestry.core.config.Constants; @@ -26,13 +37,6 @@ import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; import forestry.mail.inventory.ItemInventoryLetter; import forestry.mail.network.packets.PacketLetterInfoRequest; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.StringUtils; -import org.lwjgl.input.Keyboard; public class GuiLetter extends GuiForestry { private final ItemInventoryLetter itemInventory; @@ -57,9 +61,9 @@ public class GuiLetter extends GuiForestry { this.isProcessedLetter = container.getLetter().isProcessed(); this.widgetManager.add(new AddresseeSlot(widgetManager, 16, 12, container)); this.tradeInfoWidgets = new ArrayList<>(); - - address = new GuiTextField(0, this.fontRendererObj, guiLeft + 46, guiTop + 13, 93, 13); - text = new GuiTextBox(1, this.fontRendererObj, guiLeft + 17, guiTop + 31, 122, 57); + + address = new GuiTextField(0, this.fontRenderer, guiLeft + 46, guiTop + 13, 93, 13); + text = new GuiTextBox(1, this.fontRenderer, guiLeft + 17, guiTop + 31, 122, 57); } @Override @@ -67,14 +71,14 @@ public class GuiLetter extends GuiForestry { super.initGui(); Keyboard.enableRepeatEvents(true); - - address = new GuiTextField(0, this.fontRendererObj, guiLeft + 46, guiTop + 13, 93, 13); + + address = new GuiTextField(0, this.fontRenderer, guiLeft + 46, guiTop + 13, 93, 13); IMailAddress recipient = container.getRecipient(); if (recipient != null) { address.setText(recipient.getName()); } - - text = new GuiTextBox(1, this.fontRendererObj, guiLeft + 17, guiTop + 31, 122, 57); + + text = new GuiTextBox(1, this.fontRenderer, guiLeft + 17, guiTop + 31, 122, 57); text.setMaxStringLength(128); if (!container.getText().isEmpty()) { text.setText(container.getText()); @@ -151,8 +155,8 @@ public class GuiLetter extends GuiForestry { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); if (this.isProcessedLetter) { - fontRendererObj.drawString(address.getText(), guiLeft + 49, guiTop + 16, ColourProperties.INSTANCE.get("gui.mail.lettertext")); - fontRendererObj.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + fontRenderer.drawString(address.getText(), guiLeft + 49, guiTop + 16, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + fontRenderer.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); } else { clearTradeInfoWidgets(); address.drawTextBox(); @@ -176,15 +180,15 @@ public class GuiLetter extends GuiForestry { } if (infoString != null) { - fontRendererObj.drawSplitString(infoString, guiLeft + x, guiTop + y, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + fontRenderer.drawSplitString(infoString, guiLeft + x, guiTop + y, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); return; } - - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.pleasesend"), guiLeft + x, guiTop + y, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + + fontRenderer.drawString(Translator.translateToLocal("for.gui.mail.pleasesend"), guiLeft + x, guiTop + y, ColourProperties.INSTANCE.get("gui.mail.lettertext")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x, y + 10, container.getTradeInfo().getTradegood())); - - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + + fontRenderer.drawString(Translator.translateToLocal("for.gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, ColourProperties.INSTANCE.get("gui.mail.lettertext")); for (int i = 0; i < container.getTradeInfo().getRequired().size(); i++) { addTradeInfoWidget(new ItemStackWidget(widgetManager, x + i * 18, y + 38, container.getTradeInfo().getRequired().get(i))); diff --git a/src/main/java/forestry/mail/gui/GuiMailbox.java b/src/main/java/forestry/mail/gui/GuiMailbox.java index 540af363d..9c73689b7 100755 --- a/src/main/java/forestry/mail/gui/GuiMailbox.java +++ b/src/main/java/forestry/mail/gui/GuiMailbox.java @@ -10,10 +10,11 @@ ******************************************************************************/ package forestry.mail.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.mail.tiles.TileMailbox; -import net.minecraft.entity.player.InventoryPlayer; public class GuiMailbox extends GuiForestry { private final TileMailbox tile; diff --git a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java index e111af8a7..e472ea89f 100755 --- a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java +++ b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java @@ -12,11 +12,6 @@ package forestry.mail.gui; import javax.annotation.Nullable; -import forestry.core.config.Config; -import forestry.core.config.Constants; -import forestry.core.render.ForestryResource; -import forestry.core.utils.SoundUtil; -import forestry.mail.POBoxInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -26,9 +21,16 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.config.Config; +import forestry.core.config.Constants; +import forestry.core.render.ForestryResource; +import forestry.core.utils.SoundUtil; +import forestry.mail.POBoxInfo; + public class GuiMailboxInfo extends Gui { public enum XPosition { @@ -42,15 +44,15 @@ public class GuiMailboxInfo extends Gui { public static final GuiMailboxInfo instance = new GuiMailboxInfo(); private static final int WIDTH = 98; private static final int HEIGHT = 17; - - private final FontRenderer fontRendererObj; + + private final FontRenderer fontRenderer; @Nullable private POBoxInfo poInfo; // TODO: this texture is a terrible waste of space in graphics memory, find a better way to do it. private final ResourceLocation textureAlert = new ForestryResource(Constants.TEXTURE_PATH_GUI + "/mailalert.png"); private GuiMailboxInfo() { - fontRendererObj = Minecraft.getMinecraft().fontRendererObj; + fontRenderer = Minecraft.getMinecraft().fontRenderer; } public void render() { @@ -76,13 +78,13 @@ public class GuiMailboxInfo extends Gui { textureManager.bindTexture(textureAlert); this.drawTexturedModalRect(x, y, 0, 0, WIDTH, HEIGHT); - - fontRendererObj.drawString(Integer.toString(poInfo.playerLetters), x + 27 + getCenteredOffset(Integer.toString(poInfo.playerLetters), 22), y + 5, 0xffffff); - fontRendererObj.drawString(Integer.toString(poInfo.tradeLetters), x + 75 + getCenteredOffset(Integer.toString(poInfo.tradeLetters), 22), y + 5, 0xffffff); + + fontRenderer.drawString(Integer.toString(poInfo.playerLetters), x + 27 + getCenteredOffset(Integer.toString(poInfo.playerLetters), 22), y + 5, 0xffffff); + fontRenderer.drawString(Integer.toString(poInfo.tradeLetters), x + 75 + getCenteredOffset(Integer.toString(poInfo.tradeLetters), 22), y + 5, 0xffffff); } protected int getCenteredOffset(String string, int xWidth) { - return (xWidth - fontRendererObj.getStringWidth(string)) / 2; + return (xWidth - fontRenderer.getStringWidth(string)) / 2; } public boolean hasPOBoxInfo() { diff --git a/src/main/java/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java index cee53b9a9..bdf91560d 100755 --- a/src/main/java/forestry/mail/gui/GuiTradeName.java +++ b/src/main/java/forestry/mail/gui/GuiTradeName.java @@ -12,6 +12,12 @@ package forestry.mail.gui; import java.io.IOException; +import org.apache.commons.lang3.StringUtils; + +import net.minecraft.client.gui.GuiTextField; + +import org.lwjgl.input.Keyboard; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.render.ColourProperties; @@ -19,9 +25,6 @@ import forestry.core.utils.NetworkUtil; import forestry.core.utils.Translator; import forestry.mail.network.packets.PacketTraderAddressRequest; import forestry.mail.tiles.TileTrader; -import net.minecraft.client.gui.GuiTextField; -import org.apache.commons.lang3.StringUtils; -import org.lwjgl.input.Keyboard; public class GuiTradeName extends GuiForestry { private final TileTrader tile; @@ -32,15 +35,15 @@ public class GuiTradeName extends GuiForestry { this.tile = tile; this.xSize = 176; this.ySize = 90; - - addressNameField = new GuiTextField(0, this.fontRendererObj, guiLeft + 44, guiTop + 39, 90, 14); + + addressNameField = new GuiTextField(0, this.fontRenderer, guiLeft + 44, guiTop + 39, 90, 14); } @Override public void initGui() { super.initGui(); - - addressNameField = new GuiTextField(0, this.fontRendererObj, guiLeft + 44, guiTop + 39, 90, 14); + + addressNameField = new GuiTextField(0, this.fontRenderer, guiLeft + 44, guiTop + 39, 90, 14); addressNameField.setText(container.getAddress().getName()); addressNameField.setFocused(true); } diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 3994a8921..36f6d49d5 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.mail.gui; +import net.minecraft.entity.player.InventoryPlayer; + import forestry.core.config.Constants; import forestry.core.gui.GuiForestry; import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; import forestry.mail.tiles.TileTrader; -import net.minecraft.entity.player.InventoryPlayer; public class GuiTrader extends GuiForestry { private final TileTrader tile; @@ -30,13 +31,13 @@ public class GuiTrader extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { String name = Translator.translateToLocal(tile.getUnlocalizedTitle()); - this.fontRendererObj.drawString(name, textLayout.getCenteredOffset(name), 6, ColourProperties.INSTANCE.get("gui.mail.text")); + this.fontRenderer.drawString(name, textLayout.getCenteredOffset(name), 6, ColourProperties.INSTANCE.get("gui.mail.text")); String receive = Translator.translateToLocal("for.gui.mail.receive"); - this.fontRendererObj.drawString(receive, textLayout.getCenteredOffset(receive, 70) + 51, 45, ColourProperties.INSTANCE.get("gui.mail.text")); + this.fontRenderer.drawString(receive, textLayout.getCenteredOffset(receive, 70) + 51, 45, ColourProperties.INSTANCE.get("gui.mail.text")); String send = Translator.translateToLocal("for.gui.mail.send"); - this.fontRendererObj.drawString(send, textLayout.getCenteredOffset(send, 70) + 51, 99, ColourProperties.INSTANCE.get("gui.mail.text")); + this.fontRenderer.drawString(send, textLayout.getCenteredOffset(send, 70) + 51, 99, ColourProperties.INSTANCE.get("gui.mail.text")); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -44,8 +45,8 @@ public class GuiTrader extends GuiForestry { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - fontRendererObj.drawString(container.getAddress().getName(), guiLeft + 19, guiTop + 22, ColourProperties.INSTANCE.get("gui.mail.text")); + + fontRenderer.drawString(container.getAddress().getName(), guiLeft + 19, guiTop + 22, ColourProperties.INSTANCE.get("gui.mail.text")); } @Override diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index 2e6797732..84dd6efff 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -10,18 +10,11 @@ ******************************************************************************/ package forestry.mail.items; +import javax.annotation.Nullable; import java.util.List; -import forestry.api.core.IModelManager; -import forestry.api.mail.ILetter; -import forestry.core.items.ItemWithGui; -import forestry.core.utils.Translator; -import forestry.mail.Letter; -import forestry.mail.LetterProperties; -import forestry.mail.gui.ContainerLetter; -import forestry.mail.gui.GuiLetter; -import forestry.mail.inventory.ItemInventoryLetter; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -34,9 +27,20 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.core.IModelManager; +import forestry.api.mail.ILetter; +import forestry.core.items.ItemWithGui; +import forestry.core.utils.Translator; +import forestry.mail.Letter; +import forestry.mail.LetterProperties; +import forestry.mail.gui.ContainerLetter; +import forestry.mail.gui.GuiLetter; +import forestry.mail.inventory.ItemInventoryLetter; + public class ItemLetter extends ItemWithGui { public ItemLetter() { setMaxStackSize(64); @@ -67,8 +71,8 @@ public class ItemLetter extends ItemWithGui { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); NBTTagCompound nbttagcompound = itemstack.getTagCompound(); if (nbttagcompound == null) { @@ -81,8 +85,8 @@ public class ItemLetter extends ItemWithGui { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { - LetterProperties.getSubItems(item, tab, subItems); + public void getSubItems(CreativeTabs tab, NonNullList subItems) { + LetterProperties.getSubItems(this, tab, subItems); } public List getEmptiedLetters() { diff --git a/src/main/java/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java index 7095eccac..5ad941919 100755 --- a/src/main/java/forestry/mail/items/ItemStamps.java +++ b/src/main/java/forestry/mail/items/ItemStamps.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.mail.items; +import net.minecraft.item.ItemStack; + import forestry.api.mail.EnumPostage; import forestry.api.mail.IStamps; import forestry.core.CreativeTabForestry; import forestry.core.items.ItemOverlay; -import net.minecraft.item.ItemStack; public class ItemStamps extends ItemOverlay implements IStamps { public ItemStamps() { diff --git a/src/main/java/forestry/plugins/BlankForestryPlugin.java b/src/main/java/forestry/plugins/BlankForestryPlugin.java old mode 100644 new mode 100755 index 810d73445..499b1566b --- a/src/main/java/forestry/plugins/BlankForestryPlugin.java +++ b/src/main/java/forestry/plugins/BlankForestryPlugin.java @@ -16,16 +16,18 @@ import java.util.List; import java.util.Random; import java.util.Set; +import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; + import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; import forestry.core.network.IPacketRegistry; -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; public abstract class BlankForestryPlugin implements IForestryPlugin { diff --git a/src/main/java/forestry/plugins/IForestryPlugin.java b/src/main/java/forestry/plugins/IForestryPlugin.java old mode 100644 new mode 100755 index ba97de822..dd7a2f446 --- a/src/main/java/forestry/plugins/IForestryPlugin.java +++ b/src/main/java/forestry/plugins/IForestryPlugin.java @@ -5,16 +5,18 @@ import java.util.List; import java.util.Random; import java.util.Set; +import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.event.FMLInterModComms; + import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; import forestry.core.network.IPacketRegistry; -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.event.FMLInterModComms; public interface IForestryPlugin { boolean isAvailable(); diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java old mode 100644 new mode 100755 index e0f966ed7..70f8ed051 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.plugins; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; + import java.io.File; import java.util.ArrayList; import java.util.HashSet; @@ -20,9 +24,22 @@ import java.util.Locale; import java.util.Random; import java.util.Set; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; +import net.minecraft.command.CommandHandler; +import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraft.world.gen.IChunkGenerator; + +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; + import forestry.Forestry; import forestry.api.core.ForestryAPI; import forestry.core.IPickupHandler; @@ -32,20 +49,6 @@ import forestry.core.PluginCore; import forestry.core.network.IPacketRegistry; import forestry.core.utils.Log; import forestry.core.utils.Translator; -import net.minecraft.command.CommandHandler; -import net.minecraft.command.ICommand; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.discovery.ASMDataTable; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; public class PluginManager { diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java old mode 100644 new mode 100755 index 004798fc2..96b0b7896 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -10,16 +10,24 @@ ******************************************************************************/ package forestry.plugins.compat; -import java.util.Set; +import com.google.common.collect.ImmutableMap; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Set; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.event.FMLInterModComms; -import com.google.common.collect.ImmutableMap; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; import forestry.api.recipes.RecipeManagers; @@ -31,7 +39,6 @@ import forestry.apiculture.items.EnumPropolis; import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.PluginCore; import forestry.core.blocks.BlockBogEarth; -import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.circuits.Circuits; import forestry.core.config.Constants; @@ -42,7 +49,6 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; -import forestry.core.utils.OreDictUtil; import forestry.energy.PluginEnergy; import forestry.energy.blocks.BlockRegistryEnergy; import forestry.energy.circuits.CircuitElectricBoost; @@ -55,34 +61,28 @@ import forestry.farming.logic.FarmableBasicIC2Crop; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; + import ic2.api.item.IC2Items; import ic2.api.recipe.Recipes; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.event.FMLInterModComms; @ForestryPlugin(pluginID = ForestryPluginUids.INDUSTRIALCRAFT2, name = "IndustrialCraft2", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.ic2.description") public class PluginIC2 extends BlankForestryPlugin { public static final String modId = "ic2"; - public static PluginIC2 instance; - + + @Nullable private static ItemStack rubberSapling; + @Nullable private static ItemStack rubber; + @Nullable public static ItemStack rubberWood; + @Nullable public static ItemStack resin; + @Nullable public static ItemStack fertilizer; - + + @Nullable public BlockRegistryIC2 blocks; - public PluginIC2() { - if (PluginIC2.instance == null) { - PluginIC2.instance = this; - } - } - @Override public boolean isAvailable() { return ModUtil.isModLoaded(PluginIC2.modId); diff --git a/src/main/java/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java index cbd1f49c2..2bb0cf87a 100755 --- a/src/main/java/forestry/storage/BackpackDefinition.java +++ b/src/main/java/forestry/storage/BackpackDefinition.java @@ -13,13 +13,14 @@ package forestry.storage; import java.awt.Color; import java.util.function.Predicate; -import forestry.api.storage.BackpackManager; -import forestry.api.storage.IBackpackDefinition; -import forestry.core.utils.Translator; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.storage.BackpackManager; +import forestry.api.storage.IBackpackDefinition; +import forestry.core.utils.Translator; + public class BackpackDefinition implements IBackpackDefinition { private final int primaryColor; private final int secondaryColor; diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java old mode 100644 new mode 100755 index 67c6a9979..e3fde8c1a --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -12,17 +12,19 @@ package forestry.storage; import javax.annotation.Nullable; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.oredict.OreDictionary; + import forestry.api.storage.ICrateRegistry; import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.MigrationHelper; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; public class CrateRegistry implements ICrateRegistry { @@ -51,7 +53,7 @@ public class CrateRegistry implements ICrateRegistry { MigrationHelper.addItemName(crateName); - GameRegistry.register(crate); + ForgeRegistries.ITEMS.register(crate); Proxies.common.registerItem(crate); PluginStorage.registerCrate(crate); } diff --git a/src/main/java/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java index c8687c0df..71c2a0a75 100755 --- a/src/main/java/forestry/storage/PickupHandlerStorage.java +++ b/src/main/java/forestry/storage/PickupHandlerStorage.java @@ -10,21 +10,22 @@ ******************************************************************************/ package forestry.storage; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.storage.IBackpackDefinition; import forestry.core.IPickupHandler; import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.items.ItemBackpack; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class PickupHandlerStorage implements IPickupHandler { @Override public boolean onItemPickup(EntityPlayer player, EntityItem entityitem) { - ItemStack itemstack = entityitem.getEntityItem(); + ItemStack itemstack = entityitem.getItem(); if (itemstack.isEmpty()) { return false; } diff --git a/src/main/java/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java index 47cfe3fcb..fdc8c1466 100755 --- a/src/main/java/forestry/storage/ResupplyHandler.java +++ b/src/main/java/forestry/storage/ResupplyHandler.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.common.MinecraftForge; - import net.minecraftforge.fml.common.eventhandler.Event; import forestry.api.storage.BackpackResupplyEvent; diff --git a/src/main/java/forestry/storage/gui/ContainerBackpack.java b/src/main/java/forestry/storage/gui/ContainerBackpack.java index 37ee832a5..196ca6c0b 100755 --- a/src/main/java/forestry/storage/gui/ContainerBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerBackpack.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.storage.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotFilteredInventory; import forestry.storage.inventory.ItemInventoryBackpack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class ContainerBackpack extends ContainerItemInventory { diff --git a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java index f5a8f69b6..bf844ddc0 100755 --- a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java @@ -10,12 +10,13 @@ ******************************************************************************/ package forestry.storage.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; + import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.ContainerNaturalistInventory; import forestry.core.gui.IGuiSelectable; import forestry.storage.inventory.ItemInventoryBackpackPaged; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; public class ContainerNaturalistBackpack extends ContainerItemInventory implements IGuiSelectable { diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index a18b8b985..51a2716b0 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -10,11 +10,35 @@ ******************************************************************************/ package forestry.storage.items; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.List; import java.util.Locale; -import com.google.common.base.Preconditions; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; + import forestry.api.core.IModelManager; import forestry.api.storage.BackpackStowEvent; import forestry.api.storage.EnumBackpackType; @@ -34,26 +58,6 @@ import forestry.storage.gui.ContainerBackpack; import forestry.storage.gui.GuiBackpack; import forestry.storage.gui.GuiBackpackT2; import forestry.storage.inventory.ItemInventoryBackpack; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandler; public class ItemBackpack extends ItemWithGui implements IColoredItem { private final IBackpackDefinition definition; @@ -195,8 +199,8 @@ public class ItemBackpack extends ItemWithGui implements IColoredItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - super.addInformation(itemstack, player, list, flag); + public void addInformation(ItemStack itemstack, @Nullable World world, List list, ITooltipFlag flag) { + super.addInformation(itemstack, world, list, flag); if (type == EnumBackpackType.WOVEN) { list.add(Translator.translateToLocalFormatted("item.for.bag.woven.tooltip"));