diff --git a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java index c18120df0..8de528579 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerRegistry.java @@ -225,7 +225,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe if (PluginManager.Module.AGRICRAFT.isEnabled()) { Block cropBlock = GameRegistry.findBlock("AgriCraft", "crops"); if (block == cropBlock) { - if(block instanceof IPlantable) { + if (block instanceof IPlantable) { //For agricraft versions which implement IPlantable in the BlockCrop class block = ((IPlantable) block).getPlant(world, x, y, z); } else { diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 89a044ddf..7ec9e3de1 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -36,6 +36,7 @@ public class FruitProviderPod extends FruitProviderNone { PAPAYA((short) 2013, (short) 2014, (short) 2015);//, COCONUT((short)2016, (short)2017, (short)2018); public final short[] uids; + EnumPodType(short stage1, short stage2, short stage3) { uids = new short[]{stage1, stage2, stage3}; } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java index 7960f035c..e728b556f 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboricultureType.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.blocks; -import javax.annotation.Nullable; - import forestry.arboriculture.tiles.TileArboristChest; import forestry.core.blocks.IMachinePropertiesTESR; import forestry.core.proxy.Proxies; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java index ade5fce00..c51e264bb 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java @@ -46,8 +46,9 @@ public class BlockPlanks extends BlockWood { @Override public IIcon getIcon(int side, int meta) { EnumWoodType woodType = EnumWoodType.LARCH; - if (meta > 0 && meta < EnumWoodType.VALUES.length) + if (meta > 0 && meta < EnumWoodType.VALUES.length) { woodType = EnumWoodType.VALUES[meta]; + } return IconProviderWood.getPlankIcon(woodType); } diff --git a/src/main/java/forestry/core/access/IRestrictedAccess.java b/src/main/java/forestry/core/access/IRestrictedAccess.java index 248444d0d..c30fca22d 100644 --- a/src/main/java/forestry/core/access/IRestrictedAccess.java +++ b/src/main/java/forestry/core/access/IRestrictedAccess.java @@ -12,5 +12,6 @@ package forestry.core.access; public interface IRestrictedAccess { IAccessHandler getAccessHandler(); + void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess); } diff --git a/src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java b/src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java index 1813ce7b3..ddb88d9a0 100755 --- a/src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java +++ b/src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java @@ -16,9 +16,11 @@ package forestry.core.gui.buttons; public interface IButtonTextureSet { int getX(); + int getY(); int getHeight(); + int getWidth(); } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index d07d10d6d..e40354391 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import forestry.core.config.Constants; import forestry.core.network.DataInputStreamForestry; diff --git a/src/main/java/forestry/core/inventory/InventoryPlain.java b/src/main/java/forestry/core/inventory/InventoryPlain.java index f9605e759..17e7117fc 100644 --- a/src/main/java/forestry/core/inventory/InventoryPlain.java +++ b/src/main/java/forestry/core/inventory/InventoryPlain.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import forestry.api.core.INBTTagable; import forestry.core.utils.InventoryUtil; diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 677960b56..6fbe74050 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -28,8 +28,11 @@ import forestry.core.utils.StringUtil; public class ItemOverlay extends ItemForestry { public interface IOverlayInfo { String getName(); + int getPrimaryColor(); + int getSecondaryColor(); + boolean isSecret(); } diff --git a/src/main/java/forestry/core/network/IStreamableGui.java b/src/main/java/forestry/core/network/IStreamableGui.java index 471bd6da7..d71587008 100644 --- a/src/main/java/forestry/core/network/IStreamableGui.java +++ b/src/main/java/forestry/core/network/IStreamableGui.java @@ -14,5 +14,6 @@ import java.io.IOException; public interface IStreamableGui { void writeGuiData(DataOutputStreamForestry data) throws IOException; + void readGuiData(DataInputStreamForestry data) throws IOException; } diff --git a/src/main/java/forestry/core/utils/EntityUtil.java b/src/main/java/forestry/core/utils/EntityUtil.java index 3c246c6b1..b8268a749 100644 --- a/src/main/java/forestry/core/utils/EntityUtil.java +++ b/src/main/java/forestry/core/utils/EntityUtil.java @@ -12,7 +12,6 @@ package forestry.core.utils; import java.util.List; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java index b3a4c09a7..101a46623 100644 --- a/src/main/java/forestry/core/utils/InventoryUtil.java +++ b/src/main/java/forestry/core/utils/InventoryUtil.java @@ -466,7 +466,7 @@ public abstract class InventoryUtil { int added = addStack(inventory, stack, startSlot, slots, false); boolean success = all ? (added == stack.stackSize) : (added > 0); - if (success && doAdd) { + if (success && doAdd) { addStack(inventory, stack, startSlot, slots, true); } diff --git a/src/main/java/forestry/energy/tiles/EngineDefinition.java b/src/main/java/forestry/energy/tiles/EngineDefinition.java index c48733871..23b74d231 100644 --- a/src/main/java/forestry/energy/tiles/EngineDefinition.java +++ b/src/main/java/forestry/energy/tiles/EngineDefinition.java @@ -12,12 +12,9 @@ package forestry.energy.tiles; import net.minecraft.world.IBlockAccess; -import forestry.core.blocks.IMachineProperties; import forestry.core.blocks.IMachinePropertiesTESR; -import forestry.core.render.IBlockRenderer; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileEngine; -import forestry.core.tiles.TileForestry; import forestry.core.tiles.TileUtil; public class EngineDefinition extends MachineDefinition { diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index 9e238c3cf..5cf44a59a 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -303,9 +303,9 @@ public class PluginHarvestCraft extends ForestryPlugin { } plants.add(cropName); } - ItemStack mustardCropSeed = GameRegistry.findItemStack(HC,"mustard" + "seedItem",1); - Block mustardCropBlock = GameRegistry.findBlock(HC,"pam"+"mustardseeds" + "Crop"); - ItemStack mustardFruit = GameRegistry.findItemStack(HC,"mustard" + "seedsItem",1); + ItemStack mustardCropSeed = GameRegistry.findItemStack(HC, "mustard" + "seedItem", 1); + Block mustardCropBlock = GameRegistry.findBlock(HC, "pam" + "mustardseeds" + "Crop"); + ItemStack mustardFruit = GameRegistry.findItemStack(HC, "mustard" + "seedsItem", 1); if (mustardCropSeed != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{mustardCropSeed}, Fluids.SEEDOIL.getFluid(seedamount)); } diff --git a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java index 51b4cd816..ec6848656 100644 --- a/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java +++ b/src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java @@ -158,7 +158,7 @@ public class PluginPlantMegaPack extends ForestryPlugin { .put("cropRice", 4) .put("cropWaterSpinach", 4) .put("cropWildRice", 4) - + .put("immersedArrowArum", 4) .put("immersedCommonReed", 4) .put("immersedDuckPotato", 4) diff --git a/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java b/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java index ddb3f135f..f5828253a 100644 --- a/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginRotaryCraft.java @@ -47,7 +47,7 @@ public class PluginRotaryCraft extends ForestryPlugin { ItemStack canolaSeed = GameRegistry.findItemStack(RC, "rotarycraft_item_canola", 1); Block canolaCrop = GameRegistry.findBlock(RC, "rotarycraft_block_canola"); - int seedAmount = (ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed")/16); + int seedAmount = (ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed") / 16); seedAmount = Math.max(seedAmount, 1); // Produce at least 1 mb. if (canolaSeed != null && canolaCrop != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{canolaSeed}, Fluids.SEEDOIL.getFluid(seedAmount));