diff --git a/gradle.properties b/gradle.properties index 6e6f99c2d..098f061db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ jei_version=4.3.0.252 version_major=5 version_minor=3 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/api/farming/Farmables.java b/src/main/java/forestry/api/farming/Farmables.java index 9dc94f9d8..3595d5061 100644 --- a/src/main/java/forestry/api/farming/Farmables.java +++ b/src/main/java/forestry/api/farming/Farmables.java @@ -11,7 +11,6 @@ import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import forestry.api.core.ForestryAPI; import net.minecraft.item.ItemStack; public class Farmables { diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 8216d4878..825b96983 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -103,7 +103,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.PotionTypes; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionType; import net.minecraft.potion.PotionUtils; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/forestry/core/utils/MigrationHelper.java b/src/main/java/forestry/core/utils/MigrationHelper.java index f543a41d3..5660a7f5c 100644 --- a/src/main/java/forestry/core/utils/MigrationHelper.java +++ b/src/main/java/forestry/core/utils/MigrationHelper.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import forestry.greenhouse.tiles.TileGreenhouseNursery; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/forestry/farming/FarmRegistry.java b/src/main/java/forestry/farming/FarmRegistry.java index fec54bba6..28b2d4faa 100644 --- a/src/main/java/forestry/farming/FarmRegistry.java +++ b/src/main/java/forestry/farming/FarmRegistry.java @@ -14,15 +14,11 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import forestry.api.core.ForestryAPI; -import forestry.api.core.ISpriteRegister; -import forestry.api.farming.Farmables; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmRegistry; import forestry.api.farming.IFarmable; import forestry.api.farming.ISimpleFarmLogic; import forestry.core.config.LocalizedConfiguration; -import forestry.core.render.TextureManagerForestry; -import forestry.core.render.TextureMapForestry; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Translator; diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index 6b2450153..67cd7d8b0 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -13,22 +13,13 @@ package forestry.farming; import javax.annotation.Nullable; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.base.Preconditions; import forestry.Forestry; 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.farming.IFarmRegistry; import forestry.core.PluginCore; import forestry.core.circuits.CircuitLayout; @@ -39,10 +30,7 @@ import forestry.core.config.LocalizedConfiguration; import forestry.core.items.EnumElectronTube; import forestry.core.items.ItemRegistryCore; import forestry.core.recipes.RecipeUtil; -import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.Log; import forestry.core.utils.OreDictUtil; -import forestry.core.utils.Translator; import forestry.farming.blocks.BlockMushroom; import forestry.farming.blocks.BlockRegistryFarming; import forestry.farming.blocks.EnumFarmBlockType; @@ -85,7 +73,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.client.event.TextureStitchEvent; 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; diff --git a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java index a9a2a5785..a6cbcd980 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicArboreal.java +++ b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.Stack; import forestry.api.farming.FarmDirection; -import forestry.api.farming.Farmables; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; import forestry.api.farming.IFarmable; diff --git a/src/main/java/forestry/farming/logic/FarmLogicSimple.java b/src/main/java/forestry/farming/logic/FarmLogicSimple.java index d4a5093e5..feb2f3a5b 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicSimple.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSimple.java @@ -1,6 +1,5 @@ package forestry.farming.logic; -import forestry.api.farming.IFarmable; import forestry.api.farming.ISimpleFarmLogic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index b7833bf60..904598585 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -10,12 +10,10 @@ ******************************************************************************/ package forestry.farming.multiblock; -import java.util.Map.Entry; import java.util.Stack; import forestry.api.core.ForestryAPI; import forestry.api.farming.FarmDirection; -import forestry.api.farming.Farmables; import forestry.api.farming.IFarmInventory; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; @@ -35,7 +33,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.oredict.OreDictionary; public class InventoryFarm extends InventoryAdapterRestricted implements IFarmInventory { public static final int SLOT_RESOURCES_1 = 0; diff --git a/src/main/java/forestry/food/PluginFood.java b/src/main/java/forestry/food/PluginFood.java index afd2cd599..8c17804ae 100644 --- a/src/main/java/forestry/food/PluginFood.java +++ b/src/main/java/forestry/food/PluginFood.java @@ -13,17 +13,11 @@ package forestry.food; import javax.annotation.Nullable; import com.google.common.base.Preconditions; -import forestry.api.core.ForestryAPI; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.items.EnumPollenCluster; -import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.config.Constants; -import forestry.core.recipes.RecipeUtil; import forestry.food.items.ItemRegistryFood; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.ItemStack; @ForestryPlugin(pluginID = ForestryPluginUids.FOOD, name = "Food", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.food.description") public class PluginFood extends BlankForestryPlugin { diff --git a/src/main/java/forestry/food/items/ItemRegistryFood.java b/src/main/java/forestry/food/items/ItemRegistryFood.java index 454ef01c4..69382f893 100644 --- a/src/main/java/forestry/food/items/ItemRegistryFood.java +++ b/src/main/java/forestry/food/items/ItemRegistryFood.java @@ -10,11 +10,8 @@ ******************************************************************************/ package forestry.food.items; -import java.util.Collections; - import forestry.core.items.ItemForestryFood; import forestry.core.items.ItemRegistry; -import net.minecraft.item.ItemStack; public class ItemRegistryFood extends ItemRegistry { public final ItemForestryFood honeyedSlice; diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index 3540e478d..8a0fa2def 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -69,7 +69,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Plane; import net.minecraft.util.EnumHand; diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouseNursery.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouseNursery.java index 5930315ba..f721dd8af 100644 --- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouseNursery.java +++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouseNursery.java @@ -12,7 +12,6 @@ package forestry.greenhouse.gui; import forestry.api.core.CamouflageManager; import forestry.core.config.Constants; -import forestry.core.gui.GuiAnalyzer; import forestry.core.gui.GuiForestryTitled; import forestry.core.render.EnumTankLevel; import forestry.greenhouse.multiblock.IGreenhouseControllerInternal; diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java index 7bdc36f10..b15827b78 100644 --- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java +++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.greenhouse.models; -import java.time.chrono.MinguoEra; - import javax.annotation.Nullable; import forestry.api.core.CamouflageManager; diff --git a/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java b/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java index 5700302d8..818d99491 100644 --- a/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java +++ b/src/main/java/forestry/plugins/compat/PluginActuallyAdditions.java @@ -4,7 +4,6 @@ import javax.annotation.Nullable; import java.util.Arrays; import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.core.fluids.Fluids; import forestry.core.utils.Log; diff --git a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java index 84da4a298..383b188bb 100644 --- a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java +++ b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java @@ -15,7 +15,6 @@ import java.util.Collections; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; import forestry.core.PluginCore; import forestry.core.circuits.Circuits; import forestry.core.config.Config; diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index 1bc1a6a50..20716cb50 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -14,7 +14,6 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; import forestry.api.farming.IFarmRegistry; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel;