From 6549282ea057b93ec08d74e7c70f412126afdd00 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Fri, 26 Feb 2016 13:03:30 +0000 Subject: [PATCH] Cleaned up imports --- src/main/java/techreborn/Core.java | 15 ++- .../achievement/AchievementMod.java | 6 +- .../techreborn/api/RollingMachineRecipe.java | 8 +- .../techreborn/api/recipe/BaseRecipe.java | 6 +- .../api/recipe/IBaseRecipeType.java | 4 +- .../techreborn/api/recipe/RecipeCrafter.java | 4 +- .../techreborn/api/recipe/RecipeHandler.java | 11 +- .../recipeConfig/RecipeConfigManager.java | 11 +- .../api/upgrade/UpgradeHandler.java | 4 +- .../java/techreborn/asm/LoadingPlugin.java | 4 +- .../techreborn/blocks/BlockMachineCasing.java | 6 +- .../techreborn/blocks/BlockMachineFrame.java | 6 +- src/main/java/techreborn/blocks/BlockOre.java | 10 +- .../java/techreborn/blocks/BlockOre2.java | 15 +-- .../blocks/BlockPlayerDetector.java | 6 +- .../techreborn/blocks/BlockRubberLeaves.java | 6 +- .../techreborn/blocks/BlockRubberLog.java | 8 +- .../techreborn/blocks/BlockRubberSapling.java | 6 +- .../java/techreborn/blocks/BlockStorage.java | 6 +- .../java/techreborn/blocks/BlockStorage2.java | 8 +- .../blocks/generator/BlockSolarPanel.java | 1 - .../java/techreborn/client/GuiHandler.java | 87 ++++++++++++++- .../techreborn/client/StackToolTipEvent.java | 4 +- .../client/VersionCheckerClient.java | 6 +- .../java/techreborn/client/gui/GuiAesu.java | 6 +- .../client/gui/GuiBlastFurnace.java | 4 +- .../client/gui/GuiFusionReactor.java | 4 +- .../techreborn/client/gui/GuiGenerator.java | 1 - .../java/techreborn/client/gui/GuiIDSU.java | 6 +- .../java/techreborn/client/gui/GuiLesu.java | 4 +- .../client/gui/GuiVacuumFreezer.java | 4 +- .../java/techreborn/client/hud/ChargeHud.java | 3 +- .../client/keybindings/KeyBindings.java | 3 +- .../CasingConnectedTextureGenerator.java | 9 +- .../LesuConnectedTextureGenerator.java | 9 +- .../java/techreborn/compat/CompatManager.java | 4 +- .../compat/jei/BaseRecipeWrapper.java | 11 +- .../techreborn/compat/jei/RecipeUtil.java | 13 +-- .../compat/jei/TechRebornJeiPlugin.java | 39 +++++-- .../AlloySmelterRecipeCategory.java | 10 +- .../AlloySmelterRecipeHandler.java | 4 +- .../AlloySmelterRecipeWrapper.java | 4 +- .../AssemblingMachineRecipeCategory.java | 10 +- .../AssemblingMachineRecipeHandler.java | 4 +- .../AssemblingMachineRecipeWrapper.java | 4 +- .../BlastFurnaceRecipeCategory.java | 4 +- .../BlastFurnaceRecipeHandler.java | 4 +- .../BlastFurnaceRecipeWrapper.java | 4 +- .../centrifuge/CentrifugeRecipeCategory.java | 4 +- .../centrifuge/CentrifugeRecipeHandler.java | 4 +- .../centrifuge/CentrifugeRecipeWrapper.java | 4 +- .../ChemicalReactorRecipeCategory.java | 4 +- .../ChemicalReactorRecipeHandler.java | 4 +- .../ChemicalReactorRecipeWrapper.java | 4 +- .../FusionReactorRecipeCategory.java | 4 +- .../FusionReactorRecipeHandler.java | 4 +- .../FusionReactorRecipeWrapper.java | 11 +- .../jei/grinder/GrinderRecipeCategory.java | 5 +- .../jei/grinder/GrinderRecipeHandler.java | 5 +- .../jei/grinder/GrinderRecipeWrapper.java | 6 +- .../ImplosionCompressorRecipeCategory.java | 10 +- .../ImplosionCompressorRecipeHandler.java | 4 +- .../ImplosionCompressorRecipeWrapper.java | 4 +- .../IndustrialElectrolyzerRecipeCategory.java | 4 +- .../IndustrialElectrolyzerRecipeHandler.java | 4 +- .../IndustrialElectrolyzerRecipeWrapper.java | 4 +- .../IndustrialGrinderRecipeCategory.java | 4 +- .../IndustrialGrinderRecipeHandler.java | 4 +- .../IndustrialGrinderRecipeWrapper.java | 9 +- .../IndustrialSawmillRecipeCategory.java | 4 +- .../IndustrialSawmillRecipeHandler.java | 4 +- .../IndustrialSawmillRecipeWrapper.java | 9 +- .../RollingMachineRecipeCategory.java | 11 +- .../RollingMachineRecipeHandler.java | 4 +- .../RollingMachineRecipeMaker.java | 6 +- .../RollingMachineRecipeWrapper.java | 9 +- .../VacuumFreezerRecipeCategory.java | 4 +- .../VacuumFreezerRecipeHandler.java | 4 +- .../VacuumFreezerRecipeWrapper.java | 4 +- .../compat/minetweaker/MTFusionReactor.java | 6 +- .../compat/minetweaker/MTGeneric.java | 6 +- .../compat/minetweaker/MinetweakerCompat.java | 6 +- .../compat/waila/CompatModuleWaila.java | 6 +- .../compat/waila/WailaProviderMachines.java | 6 +- .../techreborn/config/ConfigTechReborn.java | 4 +- .../config/TechRebornConfigGui.java | 6 +- .../config/TechRebornGUIFactory.java | 4 +- .../java/techreborn/events/OreUnifier.java | 4 +- src/main/java/techreborn/init/ModBlocks.java | 100 ++++++++++++++++-- src/main/java/techreborn/init/ModItems.java | 30 +++++- src/main/java/techreborn/init/ModLoot.java | 4 +- src/main/java/techreborn/init/ModParts.java | 4 +- src/main/java/techreborn/init/ModRecipes.java | 28 ++++- .../java/techreborn/init/RecipeCompact.java | 14 +-- .../techreborn/itemblocks/ItemBlockAesu.java | 4 +- .../itemblocks/ItemBlockDigitalChest.java | 4 +- .../techreborn/itemblocks/ItemBlockOre2.java | 1 - .../itemblocks/ItemBlockQuantumChest.java | 4 +- src/main/java/techreborn/items/ItemCells.java | 4 +- .../java/techreborn/items/ItemCrushedOre.java | 6 +- src/main/java/techreborn/items/ItemDusts.java | 6 +- .../java/techreborn/items/ItemDustsSmall.java | 6 +- src/main/java/techreborn/items/ItemGems.java | 6 +- .../java/techreborn/items/ItemIngots.java | 6 +- .../techreborn/items/ItemLithiumBattery.java | 4 +- .../java/techreborn/items/ItemNuggets.java | 6 +- src/main/java/techreborn/items/ItemParts.java | 6 +- .../java/techreborn/items/ItemPlates.java | 6 +- .../items/ItemPurifiedCrushedOre.java | 6 +- .../java/techreborn/items/ItemReBattery.java | 4 +- .../java/techreborn/items/ItemUpgrade.java | 6 +- .../items/armor/ItemLapotronPack.java | 4 +- .../items/armor/ItemLithiumBatpack.java | 4 +- .../items/tools/ItemAdvancedChainsaw.java | 1 - .../items/tools/ItemAdvancedDrill.java | 4 +- .../techreborn/items/tools/ItemChainsaw.java | 1 - .../items/tools/ItemCloakingDevice.java | 4 +- .../items/tools/ItemDiamondChainsaw.java | 1 - .../items/tools/ItemDiamondDrill.java | 4 +- .../techreborn/items/tools/ItemDrill.java | 4 +- .../techreborn/items/tools/ItemOmniTool.java | 4 +- .../items/tools/ItemRockCutter.java | 4 +- .../items/tools/ItemTechManual.java | 1 - .../techreborn/manual/pages/BasePage.java | 4 +- .../techreborn/manual/pages/ContentsPage.java | 2 - .../manual/pages/CraftingInfoPage.java | 1 - .../manual/pages/DescriptionPage.java | 2 - .../manual/pages/GeneratingPowerPage.java | 2 - .../manual/util/GuiButtonAHeight.java | 3 +- .../manual/util/GuiButtonCustomTexture.java | 2 - .../manual/util/GuiButtonItemTexture.java | 7 +- .../manual/util/GuiButtonTextOnly.java | 7 +- .../java/techreborn/packets/PacketAesu.java | 4 +- .../java/techreborn/packets/PacketIdsu.java | 4 +- .../java/techreborn/proxies/ClientProxy.java | 6 +- .../techreborn/tiles/TileAlloyFurnace.java | 6 +- .../java/techreborn/tiles/TileCentrifuge.java | 4 +- .../techreborn/tiles/TileDigitalChest.java | 4 +- .../tiles/TileIndustrialGrinder.java | 6 +- .../tiles/TileIndustrialSawmill.java | 6 +- .../techreborn/tiles/TilePlayerDectector.java | 4 +- .../techreborn/tiles/TileQuantumChest.java | 4 +- .../techreborn/tiles/TileQuantumTank.java | 4 +- .../tiles/TileThermalGenerator.java | 7 +- .../tiles/generator/TileDieselGenerator.java | 6 +- .../tiles/generator/TileGasTurbine.java | 13 ++- .../tiles/generator/TileGenerator.java | 8 +- .../generator/TileSemifluidGenerator.java | 13 ++- .../tiles/generator/TileSolarPanel.java | 6 +- .../techreborn/tiles/idsu/IDSUManager.java | 15 ++- .../java/techreborn/tiles/idsu/TileIDSU.java | 3 +- .../java/techreborn/tiles/lesu/TileLesu.java | 4 +- .../techreborn/world/RubberTreeGenerator.java | 4 +- src/main/java/techreborn/world/TROreGen.java | 4 +- .../java/techreborn/world/TreeGenerator.java | 4 +- 155 files changed, 696 insertions(+), 403 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 2bc22804e..b42d78301 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,5 +1,9 @@ package techreborn; +import java.io.File; + +import org.apache.commons.lang3.time.StopWatch; + import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -12,7 +16,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.commons.lang3.time.StopWatch; import reborncore.common.multiblock.MultiblockEventHandler; import reborncore.common.multiblock.MultiblockServerTickHandler; import reborncore.common.packets.AddDiscriminatorEvent; @@ -29,7 +32,13 @@ import techreborn.compat.ICompatModule; import techreborn.config.ConfigTechReborn; import techreborn.events.OreUnifier; import techreborn.events.TRTickHandler; -import techreborn.init.*; +import techreborn.init.ModBlocks; +import techreborn.init.ModFluids; +import techreborn.init.ModItems; +import techreborn.init.ModLoot; +import techreborn.init.ModParts; +import techreborn.init.ModRecipes; +import techreborn.init.RecipeCompact; import techreborn.lib.ModInfo; import techreborn.packets.PacketAesu; import techreborn.packets.PacketIdsu; @@ -38,8 +47,6 @@ import techreborn.tiles.idsu.IDSUManager; import techreborn.world.TROreGen; import techreborn.world.TreeGenerator; -import java.io.File; - @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS, acceptedMinecraftVersions = "[1.8.8,1.8.9]") public class Core { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/achievement/AchievementMod.java b/src/main/java/techreborn/achievement/AchievementMod.java index 4cc7e9f6b..1b6864748 100644 --- a/src/main/java/techreborn/achievement/AchievementMod.java +++ b/src/main/java/techreborn/achievement/AchievementMod.java @@ -1,13 +1,13 @@ package techreborn.achievement; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import java.util.ArrayList; -import java.util.List; - public class AchievementMod extends Achievement { public static List achievements = new ArrayList(); diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index 4ca34459b..50e840180 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -1,5 +1,9 @@ package techreborn.api; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -11,10 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - public class RollingMachineRecipe { private final List recipes = new ArrayList(); diff --git a/src/main/java/techreborn/api/recipe/BaseRecipe.java b/src/main/java/techreborn/api/recipe/BaseRecipe.java index da81cd469..2a944013d 100644 --- a/src/main/java/techreborn/api/recipe/BaseRecipe.java +++ b/src/main/java/techreborn/api/recipe/BaseRecipe.java @@ -1,11 +1,11 @@ package techreborn.api.recipe; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + /** * Extend this to add a recipe */ diff --git a/src/main/java/techreborn/api/recipe/IBaseRecipeType.java b/src/main/java/techreborn/api/recipe/IBaseRecipeType.java index cd47e0dfe..ff7d014bf 100644 --- a/src/main/java/techreborn/api/recipe/IBaseRecipeType.java +++ b/src/main/java/techreborn/api/recipe/IBaseRecipeType.java @@ -1,10 +1,10 @@ package techreborn.api.recipe; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import java.util.List; - /** * This is the base recipe class implement this to make a recipe handler */ diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index c4e41614c..9bbd4fa57 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -1,5 +1,7 @@ package techreborn.api.recipe; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import reborncore.api.power.IEnergyInterfaceTile; @@ -8,8 +10,6 @@ import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; -import java.util.ArrayList; - /** * Use this in your tile entity to craft things */ diff --git a/src/main/java/techreborn/api/recipe/RecipeHandler.java b/src/main/java/techreborn/api/recipe/RecipeHandler.java index c07097342..1b16d70d8 100644 --- a/src/main/java/techreborn/api/recipe/RecipeHandler.java +++ b/src/main/java/techreborn/api/recipe/RecipeHandler.java @@ -1,14 +1,15 @@ package techreborn.api.recipe; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.time.StopWatch; -import reborncore.common.util.ItemUtils; -import techreborn.Core; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.apache.commons.lang3.time.StopWatch; + +import net.minecraft.item.ItemStack; +import reborncore.common.util.ItemUtils; +import techreborn.Core; + public class RecipeHandler { diff --git a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java index cb5e9f505..224b3b154 100644 --- a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java +++ b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java @@ -1,15 +1,16 @@ package techreborn.api.recipe.recipeConfig; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.item.ItemStack; -import techreborn.api.recipe.IBaseRecipeType; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.IBaseRecipeType; + public class RecipeConfigManager { public static ArrayList configs = new ArrayList(); diff --git a/src/main/java/techreborn/api/upgrade/UpgradeHandler.java b/src/main/java/techreborn/api/upgrade/UpgradeHandler.java index 575a18b26..210cc774c 100644 --- a/src/main/java/techreborn/api/upgrade/UpgradeHandler.java +++ b/src/main/java/techreborn/api/upgrade/UpgradeHandler.java @@ -1,11 +1,11 @@ package techreborn.api.upgrade; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; -import java.util.ArrayList; - public class UpgradeHandler { RecipeCrafter crafter; diff --git a/src/main/java/techreborn/asm/LoadingPlugin.java b/src/main/java/techreborn/asm/LoadingPlugin.java index d919b9547..657e87891 100644 --- a/src/main/java/techreborn/asm/LoadingPlugin.java +++ b/src/main/java/techreborn/asm/LoadingPlugin.java @@ -1,13 +1,13 @@ package techreborn.asm; +import java.util.Map; + import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.ModMetadata; import net.minecraftforge.fml.relauncher.IFMLCallHook; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import techreborn.lib.ModInfo; -import java.util.Map; - @IFMLLoadingPlugin.MCVersion("1.7.10") public class LoadingPlugin implements IFMLLoadingPlugin { diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index c50e31169..b52bbd0b9 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,9 +23,6 @@ import reborncore.common.multiblock.BlockMultiblockBase; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileMachineCasing; -import java.util.List; -import java.util.Random; - public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock { public static final String[] types = new String[] diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index e9116c603..a1ec2674e 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,9 +18,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; -import java.security.InvalidParameterException; -import java.util.List; - public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { public PropertyInteger METADATA; diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index c7bf12ce1..db89231dd 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,5 +1,10 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -26,11 +31,6 @@ import techreborn.init.ModBlocks; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public class BlockOre extends BaseBlock implements ITexturedBlock { public static ItemStack getOreByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 071e10681..1e4267286 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -7,29 +10,17 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.BaseBlock; -import reborncore.common.util.OreDrop; -import reborncore.common.util.OreDropSet; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import techreborn.items.ItemDusts; -import techreborn.items.ItemGems; - -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; public class BlockOre2 extends BaseBlock implements ITexturedBlock { diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index c66416bcf..cf1e1c7bc 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -1,6 +1,9 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -24,9 +27,6 @@ import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TilePlayerDectector; -import java.util.List; -import java.util.Random; - public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock { public PropertyInteger METADATA; diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index fad2afebd..d3fd72b4f 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.IOpaqueBlock; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.BlockLeaves; @@ -20,9 +23,6 @@ import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.util.List; -import java.util.Random; - /** * Created by mark on 20/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 8f1d66a61..cb3b89ff8 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -1,5 +1,9 @@ package techreborn.blocks; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -19,10 +23,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.items.ItemParts; import techreborn.items.tools.ItemTreeTap; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - /** * Created by mark on 19/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 0c8323d7f..99e6041b2 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import net.minecraft.block.BlockSapling; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -10,9 +13,6 @@ import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.world.RubberTreeGenerator; -import java.util.List; -import java.util.Random; - /** * Created by Mark on 20/02/2016. */ diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 98a8ed1c0..4eb24aacc 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -1,5 +1,8 @@ package techreborn.blocks; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,9 +18,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.util.List; -import java.util.Random; - public class BlockStorage extends BaseBlock implements ITexturedBlock { public static ItemStack getStorageBlockByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index bb44dc083..fcbf1bae3 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -1,5 +1,9 @@ package techreborn.blocks; +import java.security.InvalidParameterException; +import java.util.List; +import java.util.Random; + import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -15,10 +19,6 @@ import reborncore.common.BaseBlock; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; -import java.security.InvalidParameterException; -import java.util.List; -import java.util.Random; - public class BlockStorage2 extends BaseBlock implements ITexturedBlock { public static ItemStack getStorageBlockByName(String name, int count) { diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 7abec0514..4ac956f59 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -3,7 +3,6 @@ package techreborn.blocks.generator; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 04bb77aad..b303bcee2 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -4,10 +4,91 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import techreborn.client.container.*; -import techreborn.client.gui.*; +import techreborn.client.container.ContainerAesu; +import techreborn.client.container.ContainerAlloyFurnace; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerAssemblingMachine; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChargeBench; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.client.container.ContainerChunkloader; +import techreborn.client.container.ContainerCompressor; +import techreborn.client.container.ContainerDestructoPack; +import techreborn.client.container.ContainerDieselGenerator; +import techreborn.client.container.ContainerDigitalChest; +import techreborn.client.container.ContainerElectricFurnace; +import techreborn.client.container.ContainerExtractor; +import techreborn.client.container.ContainerFusionReactor; +import techreborn.client.container.ContainerGasTurbine; +import techreborn.client.container.ContainerGenerator; +import techreborn.client.container.ContainerGrinder; +import techreborn.client.container.ContainerIDSU; +import techreborn.client.container.ContainerImplosionCompressor; +import techreborn.client.container.ContainerIndustrialElectrolyzer; +import techreborn.client.container.ContainerIndustrialGrinder; +import techreborn.client.container.ContainerIndustrialSawmill; +import techreborn.client.container.ContainerLesu; +import techreborn.client.container.ContainerMatterFabricator; +import techreborn.client.container.ContainerQuantumChest; +import techreborn.client.container.ContainerQuantumTank; +import techreborn.client.container.ContainerRollingMachine; +import techreborn.client.container.ContainerSemifluidGenerator; +import techreborn.client.container.ContainerThermalGenerator; +import techreborn.client.container.ContainerVacuumFreezer; +import techreborn.client.gui.GuiAesu; +import techreborn.client.gui.GuiAlloyFurnace; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiAssemblingMachine; +import techreborn.client.gui.GuiBlastFurnace; +import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChargeBench; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiChunkLoader; +import techreborn.client.gui.GuiCompressor; +import techreborn.client.gui.GuiDestructoPack; +import techreborn.client.gui.GuiDieselGenerator; +import techreborn.client.gui.GuiDigitalChest; +import techreborn.client.gui.GuiElectricFurnace; +import techreborn.client.gui.GuiExtractor; +import techreborn.client.gui.GuiFusionReactor; +import techreborn.client.gui.GuiGasTurbine; +import techreborn.client.gui.GuiGenerator; +import techreborn.client.gui.GuiGrinder; +import techreborn.client.gui.GuiIDSU; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.client.gui.GuiIndustrialElectrolyzer; +import techreborn.client.gui.GuiIndustrialGrinder; +import techreborn.client.gui.GuiIndustrialSawmill; +import techreborn.client.gui.GuiLesu; +import techreborn.client.gui.GuiMatterFabricator; +import techreborn.client.gui.GuiQuantumChest; +import techreborn.client.gui.GuiQuantumTank; +import techreborn.client.gui.GuiRollingMachine; +import techreborn.client.gui.GuiSemifluidGenerator; +import techreborn.client.gui.GuiThermalGenerator; +import techreborn.client.gui.GuiVacuumFreezer; import techreborn.manual.GuiManual; -import techreborn.tiles.*; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialGrinder; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.TileVacuumFreezer; import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.generator.TileDieselGenerator; import techreborn.tiles.generator.TileGasTurbine; diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index f5f810c71..9a3d01aa1 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -1,13 +1,15 @@ package techreborn.client; +import org.lwjgl.input.Keyboard; + import com.mojang.realmsclient.gui.ChatFormatting; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.input.Keyboard; import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.common.powerSystem.PowerSystem; diff --git a/src/main/java/techreborn/client/VersionCheckerClient.java b/src/main/java/techreborn/client/VersionCheckerClient.java index 839e69d4e..7d2e1ffc0 100644 --- a/src/main/java/techreborn/client/VersionCheckerClient.java +++ b/src/main/java/techreborn/client/VersionCheckerClient.java @@ -1,5 +1,8 @@ package techreborn.client; +import java.awt.Color; +import java.util.ArrayList; + import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.client.GuiModList; @@ -7,9 +10,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import reborncore.client.gui.GuiUtil; import techreborn.Core; -import java.awt.*; -import java.util.ArrayList; - public class VersionCheckerClient { ResourceLocation texture; diff --git a/src/main/java/techreborn/client/gui/GuiAesu.java b/src/main/java/techreborn/client/gui/GuiAesu.java index 024e4b1db..21d21c60a 100644 --- a/src/main/java/techreborn/client/gui/GuiAesu.java +++ b/src/main/java/techreborn/client/gui/GuiAesu.java @@ -1,5 +1,8 @@ package techreborn.client.gui; +import java.awt.Color; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -12,9 +15,6 @@ import techreborn.client.container.ContainerAesu; import techreborn.packets.PacketAesu; import techreborn.tiles.TileAesu; -import java.awt.*; -import java.io.IOException; - public class GuiAesu extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index d3fde51de..96f583dce 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -18,8 +20,6 @@ import techreborn.init.ModBlocks; import techreborn.proxies.ClientProxy; import techreborn.tiles.TileBlastFurnace; -import java.io.IOException; - public class GuiBlastFurnace extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 147264b99..42b17627b 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -17,8 +19,6 @@ import techreborn.client.container.ContainerFusionReactor; import techreborn.proxies.ClientProxy; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import java.io.IOException; - public class GuiFusionReactor extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index d101a2107..da6263eea 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -3,7 +3,6 @@ package techreborn.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import reborncore.common.powerSystem.PowerSystem; diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index f96265a63..94cbea00e 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -1,5 +1,8 @@ package techreborn.client.gui; +import java.awt.Color; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -12,9 +15,6 @@ import techreborn.client.container.ContainerIDSU; import techreborn.packets.PacketIdsu; import techreborn.tiles.idsu.TileIDSU; -import java.awt.*; -import java.io.IOException; - public class GuiIDSU extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiLesu.java b/src/main/java/techreborn/client/gui/GuiLesu.java index 84c3f19ea..c9b82e0b6 100644 --- a/src/main/java/techreborn/client/gui/GuiLesu.java +++ b/src/main/java/techreborn/client/gui/GuiLesu.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.awt.Color; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.client.container.ContainerLesu; import techreborn.tiles.lesu.TileLesu; -import java.awt.*; - public class GuiLesu extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index bf2f91057..7b23cb2f9 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -1,5 +1,7 @@ package techreborn.client.gui; +import java.io.IOException; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -16,8 +18,6 @@ import techreborn.client.container.ContainerVacuumFreezer; import techreborn.proxies.ClientProxy; import techreborn.tiles.TileVacuumFreezer; -import java.io.IOException; - public class GuiVacuumFreezer extends GuiContainer { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/vacuum_freezer.png"); diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 6d5f4feaa..67f09a410 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -1,5 +1,7 @@ package techreborn.client.hud; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; @@ -12,7 +14,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.Color; diff --git a/src/main/java/techreborn/client/keybindings/KeyBindings.java b/src/main/java/techreborn/client/keybindings/KeyBindings.java index 65eae60d0..210c89615 100644 --- a/src/main/java/techreborn/client/keybindings/KeyBindings.java +++ b/src/main/java/techreborn/client/keybindings/KeyBindings.java @@ -1,7 +1,8 @@ package techreborn.client.keybindings; -import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; + +import net.minecraft.client.settings.KeyBinding; import techreborn.lib.ModInfo; public class KeyBindings { diff --git a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java index 0a9acdc7c..a17f18d18 100644 --- a/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/CasingConnectedTextureGenerator.java @@ -1,5 +1,10 @@ package techreborn.client.texture; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IResource; @@ -9,10 +14,6 @@ import net.minecraft.util.ResourceLocation; import reborncore.client.texture.ConnectedTexture; import techreborn.lib.ModInfo; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; - //1.8 Nope public class CasingConnectedTextureGenerator extends TextureAtlasSprite { diff --git a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java index 5f9a3c3c3..6bd165eda 100644 --- a/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java +++ b/src/main/java/techreborn/client/texture/LesuConnectedTextureGenerator.java @@ -1,5 +1,10 @@ package techreborn.client.texture; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IResource; @@ -9,10 +14,6 @@ import net.minecraft.util.ResourceLocation; import reborncore.client.texture.ConnectedTexture; import techreborn.lib.ModInfo; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; - //TODO 1.8 nope public class LesuConnectedTextureGenerator extends TextureAtlasSprite { diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index d6ce2a7a4..9e49c2b60 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -1,13 +1,13 @@ package techreborn.compat; +import java.util.ArrayList; + import net.minecraftforge.fml.common.Loader; import techreborn.compat.minetweaker.MinetweakerCompat; import techreborn.compat.recipes.RecipesBiomesOPlenty; import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; -import java.util.ArrayList; - public class CompatManager { public ArrayList compatModules = new ArrayList(); diff --git a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index 8b93d0e54..9d530c483 100644 --- a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -1,13 +1,18 @@ package techreborn.compat.jei; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.BaseRecipe; -import javax.annotation.Nonnull; -import java.util.*; - public abstract class BaseRecipeWrapper extends BlankRecipeWrapper { protected final T baseRecipe; @Nonnull diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index c940b7c2c..e24c6be43 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -1,5 +1,12 @@ package techreborn.compat.jei; +import java.awt.Color; +import java.text.NumberFormat; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; @@ -9,12 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.*; -import java.text.NumberFormat; -import java.util.List; - public class RecipeUtil { private static final int color = Color.darkGray.getRGB(); diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 35f8de9ed..5f0639332 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -1,5 +1,10 @@ package techreborn.compat.jei; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; @@ -13,8 +18,34 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; -import techreborn.client.container.*; -import techreborn.client.gui.*; +import techreborn.client.container.ContainerAlloyFurnace; +import techreborn.client.container.ContainerAlloySmelter; +import techreborn.client.container.ContainerAssemblingMachine; +import techreborn.client.container.ContainerBlastFurnace; +import techreborn.client.container.ContainerCentrifuge; +import techreborn.client.container.ContainerChemicalReactor; +import techreborn.client.container.ContainerFusionReactor; +import techreborn.client.container.ContainerGrinder; +import techreborn.client.container.ContainerImplosionCompressor; +import techreborn.client.container.ContainerIndustrialElectrolyzer; +import techreborn.client.container.ContainerIndustrialGrinder; +import techreborn.client.container.ContainerIndustrialSawmill; +import techreborn.client.container.ContainerRollingMachine; +import techreborn.client.container.ContainerVacuumFreezer; +import techreborn.client.gui.GuiAlloyFurnace; +import techreborn.client.gui.GuiAlloySmelter; +import techreborn.client.gui.GuiAssemblingMachine; +import techreborn.client.gui.GuiBlastFurnace; +import techreborn.client.gui.GuiCentrifuge; +import techreborn.client.gui.GuiChemicalReactor; +import techreborn.client.gui.GuiFusionReactor; +import techreborn.client.gui.GuiGrinder; +import techreborn.client.gui.GuiImplosionCompressor; +import techreborn.client.gui.GuiIndustrialElectrolyzer; +import techreborn.client.gui.GuiIndustrialGrinder; +import techreborn.client.gui.GuiIndustrialSawmill; +import techreborn.client.gui.GuiRollingMachine; +import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler; import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory; @@ -43,10 +74,6 @@ import techreborn.compat.jei.rollingMachine.RollingMachineRecipeMaker; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler; -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; - @mezz.jei.api.JEIPlugin public class TechRebornJeiPlugin extends BlankModPlugin { @Override diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index d1bdeeadb..62a09c275 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiAlloySmelter; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java index a416cf0d1..f4d51a07a 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java index 6c5c9c1c2..e6402e2ea 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.alloySmelter; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.client.gui.GuiAlloySmelter; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated arrow; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java index 79f738a0b..525f7c8a2 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiAssemblingMachine; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java index 5c06e8903..fe95e6b48 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java index 075bd5973..2cfa501f7 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.assemblingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.client.gui.GuiAssemblingMachine; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class AssemblingMachineRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java index 6222fc4c1..ad7f9b29f 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiBlastFurnace; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3}; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java index b232c8b5b..cdeca5537 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.BlastFurnaceRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java index 2ec4f6c44..ca510df44 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.blastFurnace; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.BlastFurnaceRecipe; import techreborn.client.gui.GuiBlastFurnace; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java index a18ca11f6..af4ac41ad 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiCentrifuge; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class CentrifugeRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java index a48c90e4e..9f4d1fcc7 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.CentrifugeRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class CentrifugeRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java index 0b7cfb776..a01ea51ee 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.centrifuge; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.CentrifugeRecipe; import techreborn.client.gui.GuiCentrifuge; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class CentrifugeRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progressUp; private final IDrawableAnimated progressLeft; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java index 039f005e1..3ff1db3e6 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiChemicalReactor; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2}; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java index d36aaf352..9c681308e 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.ChemicalReactorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java index 191aaa23f..def0468df 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.chemicalReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.ChemicalReactorRecipe; import techreborn.client.gui.GuiChemicalReactor; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index a374ebed0..299992597 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.fusionReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -10,8 +12,6 @@ import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiFusionReactor; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class FusionReactorRecipeCategory extends BlankRecipeCategory { private static final int inputSlotTop = 0; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java index 0afe60fb8..ce9af95c2 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java @@ -1,12 +1,12 @@ package techreborn.compat.jei.fusionReactor; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class FusionReactorRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java index d68c532e7..5b2dcf54f 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java @@ -1,16 +1,17 @@ package techreborn.compat.jei.fusionReactor; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - public class FusionReactorRecipeWrapper extends BlankRecipeWrapper { private final FusionReactorRecipe baseRecipe; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java index 45632e1b2..2d8616898 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -8,12 +10,9 @@ import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class GrinderRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0}; private static final int[] OUTPUT_SLOTS = {1}; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java index 38d2a19ac..14feeedd9 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeHandler.java @@ -1,14 +1,13 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.GrinderRecipe; -import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class GrinderRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java index c0f5cf530..a29384ffe 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java @@ -1,18 +1,16 @@ package techreborn.compat.jei.grinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import net.minecraft.client.Minecraft; import techreborn.api.recipe.machines.GrinderRecipe; -import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.client.gui.GuiGrinder; -import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class GrinderRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index 60900b1a1..1e28d798a 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -1,7 +1,13 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -10,8 +16,6 @@ import techreborn.client.gui.GuiImplosionCompressor; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3}; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java index 483daaa87..d5f833660 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java index 9ddf0c061..a6705f65f 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.implosionCompressor; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.ImplosionCompressorRecipe; import techreborn.client.gui.GuiImplosionCompressor; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java index 2f78d4544..693d599ce 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiIndustrialElectrolyzer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java index e199e20de..2c8a8fb08 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java index b249e135c..6fc7544dc 100644 --- a/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialElectrolyzer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; import techreborn.client.gui.GuiIndustrialElectrolyzer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java index e5a429719..4cea09034 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialGrinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; @@ -14,8 +16,6 @@ import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; import techreborn.tiles.TileIndustrialGrinder; -import javax.annotation.Nonnull; - public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4, 5}; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java index 430f84c37..333524df5 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialGrinder; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialGrinderRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java index 16da76a38..fd7d20b03 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.industrialGrinder; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -10,10 +15,6 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.client.gui.GuiIndustrialGrinder; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java index 04cf32622..beb58786c 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.industrialSawmill; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; @@ -14,8 +16,6 @@ import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; import techreborn.tiles.TileIndustrialSawmill; -import javax.annotation.Nonnull; - public class IndustrialSawmillRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3, 4}; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java index a10b6430b..ae463e950 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.industrialSawmill; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class IndustrialSawmillRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java index 0bef098a2..5fc9b297c 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.industrialSawmill; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -10,10 +15,6 @@ import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.client.gui.GuiIndustrialSawmill; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.List; - public class IndustrialSawmillRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java index 5da90110e..70ed7ac4f 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java @@ -1,7 +1,14 @@ package techreborn.compat.jei.rollingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.ICraftingGridHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -9,8 +16,6 @@ import net.minecraft.util.StatCollector; import techreborn.client.gui.GuiRollingMachine; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class RollingMachineRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; private static final int[] OUTPUT_SLOTS = {10}; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java index b2017e2f9..903482501 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java @@ -1,11 +1,11 @@ package techreborn.compat.jei.rollingMachine; +import javax.annotation.Nonnull; + import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class RollingMachineRecipeHandler implements IRecipeHandler { @Nonnull @Override diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java index fce13a83c..b8c29c954 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java @@ -1,11 +1,11 @@ package techreborn.compat.jei.rollingMachine; -import net.minecraft.item.crafting.IRecipe; -import techreborn.api.RollingMachineRecipe; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.crafting.IRecipe; +import techreborn.api.RollingMachineRecipe; + public class RollingMachineRecipeMaker { private RollingMachineRecipeMaker() { diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java index 21a4284ea..efa024ff3 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java @@ -1,5 +1,10 @@ package techreborn.compat.jei.rollingMachine; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper; @@ -13,10 +18,6 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper { private final ICraftingRecipeWrapper baseRecipe; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java index ec2c95ad8..71293c83c 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; @@ -11,8 +13,6 @@ import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeCategory extends BlankRecipeCategory { private static final int[] INPUT_SLOTS = {0}; private static final int[] OUTPUT_SLOTS = {1}; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java index 1e7fd685e..75d125bd0 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java @@ -1,13 +1,13 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IJeiHelpers; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.compat.jei.RecipeCategoryUids; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeHandler implements IRecipeHandler { @Nonnull private final IJeiHelpers jeiHelpers; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java index cc032f54e..6e63f3daf 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java @@ -1,5 +1,7 @@ package techreborn.compat.jei.vacuumFreezer; +import javax.annotation.Nonnull; + import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawableAnimated; @@ -9,8 +11,6 @@ import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.client.gui.GuiVacuumFreezer; import techreborn.compat.jei.BaseRecipeWrapper; -import javax.annotation.Nonnull; - public class VacuumFreezerRecipeWrapper extends BaseRecipeWrapper { private final IDrawableAnimated progress; diff --git a/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java b/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java index cc9628629..8ce1a77b2 100644 --- a/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java +++ b/src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import java.util.ArrayList; +import java.util.List; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -12,9 +15,6 @@ import stanhebben.zenscript.annotations.ZenMethod; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; -import java.util.ArrayList; -import java.util.List; - @ZenClass("mods.techreborn.fusionReactor") public class MTFusionReactor { diff --git a/src/main/java/techreborn/compat/minetweaker/MTGeneric.java b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java index 26b8dba5e..442d2bc92 100644 --- a/src/main/java/techreborn/compat/minetweaker/MTGeneric.java +++ b/src/main/java/techreborn/compat/minetweaker/MTGeneric.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import java.util.ArrayList; +import java.util.List; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -10,9 +13,6 @@ import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.IBaseRecipeType; import techreborn.api.recipe.RecipeHandler; -import java.util.ArrayList; -import java.util.List; - public class MTGeneric { public static String getMachineName() { return null; diff --git a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java index 256196faf..b05fad1b4 100644 --- a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java +++ b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java @@ -1,5 +1,8 @@ package techreborn.compat.minetweaker; +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -15,9 +18,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import techreborn.compat.ICompatModule; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack; - public class MinetweakerCompat implements ICompatModule { @Override diff --git a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java index 7aadd566a..ff6606060 100644 --- a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java +++ b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java @@ -1,7 +1,11 @@ package techreborn.compat.waila; import mcp.mobius.waila.api.IWailaRegistrar; -import net.minecraftforge.fml.common.event.*; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import reborncore.common.tile.TileMachineBase; import techreborn.compat.ICompatModule; diff --git a/src/main/java/techreborn/compat/waila/WailaProviderMachines.java b/src/main/java/techreborn/compat/waila/WailaProviderMachines.java index 56e1769e4..624e3a8fb 100644 --- a/src/main/java/techreborn/compat/waila/WailaProviderMachines.java +++ b/src/main/java/techreborn/compat/waila/WailaProviderMachines.java @@ -1,5 +1,8 @@ package techreborn.compat.waila; +import java.util.ArrayList; +import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -11,9 +14,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import reborncore.api.IListInfoProvider; -import java.util.ArrayList; -import java.util.List; - public class WailaProviderMachines implements IWailaDataProvider { private List info = new ArrayList(); diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 1187d4843..bf9f8bf6e 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,9 +1,9 @@ package techreborn.config; -import net.minecraftforge.common.config.Configuration; - import java.io.File; +import net.minecraftforge.common.config.Configuration; + public class ConfigTechReborn { private static ConfigTechReborn instance = null; public static String CATEGORY_WORLD = "world"; diff --git a/src/main/java/techreborn/config/TechRebornConfigGui.java b/src/main/java/techreborn/config/TechRebornConfigGui.java index 866c5def2..e94a7682f 100644 --- a/src/main/java/techreborn/config/TechRebornConfigGui.java +++ b/src/main/java/techreborn/config/TechRebornConfigGui.java @@ -1,5 +1,8 @@ package techreborn.config; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigElement; @@ -10,9 +13,6 @@ import net.minecraftforge.fml.client.config.GuiConfigEntries; import net.minecraftforge.fml.client.config.GuiConfigEntries.CategoryEntry; import net.minecraftforge.fml.client.config.IConfigElement; -import java.util.ArrayList; -import java.util.List; - public class TechRebornConfigGui extends GuiConfig { public TechRebornConfigGui(GuiScreen top) { super(top, getConfigCategories(), "TechReborn", false, false, GuiConfig diff --git a/src/main/java/techreborn/config/TechRebornGUIFactory.java b/src/main/java/techreborn/config/TechRebornGUIFactory.java index db9b0e1f5..795616339 100644 --- a/src/main/java/techreborn/config/TechRebornGUIFactory.java +++ b/src/main/java/techreborn/config/TechRebornGUIFactory.java @@ -1,11 +1,11 @@ package techreborn.config; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; -import java.util.Set; - public class TechRebornGUIFactory implements IModGuiFactory { @Override public void initialize(Minecraft minecraftInstance) { diff --git a/src/main/java/techreborn/events/OreUnifier.java b/src/main/java/techreborn/events/OreUnifier.java index 086fe3d81..b9206e1cd 100644 --- a/src/main/java/techreborn/events/OreUnifier.java +++ b/src/main/java/techreborn/events/OreUnifier.java @@ -1,5 +1,7 @@ package techreborn.events; +import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; -import java.util.HashMap; - public class OreUnifier { public static HashMap oreHash = new HashMap(); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index b90920c1e..e5cd45b95 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -8,9 +8,57 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; import techreborn.Core; -import techreborn.blocks.*; -import techreborn.blocks.generator.*; -import techreborn.blocks.machine.*; +import techreborn.blocks.BlockChunkLoader; +import techreborn.blocks.BlockComputerCube; +import techreborn.blocks.BlockDigitalChest; +import techreborn.blocks.BlockElectricCraftingTable; +import techreborn.blocks.BlockFusionCoil; +import techreborn.blocks.BlockFusionControlComputer; +import techreborn.blocks.BlockHighlyAdvancedMachine; +import techreborn.blocks.BlockIronFence; +import techreborn.blocks.BlockMachineCasing; +import techreborn.blocks.BlockMachineFrame; +import techreborn.blocks.BlockOre; +import techreborn.blocks.BlockOre2; +import techreborn.blocks.BlockPlayerDetector; +import techreborn.blocks.BlockQuantumChest; +import techreborn.blocks.BlockQuantumTank; +import techreborn.blocks.BlockRubberLeaves; +import techreborn.blocks.BlockRubberLog; +import techreborn.blocks.BlockRubberPlank; +import techreborn.blocks.BlockRubberSapling; +import techreborn.blocks.BlockStorage; +import techreborn.blocks.BlockStorage2; +import techreborn.blocks.BlockSupercondensator; +import techreborn.blocks.generator.BlockDieselGenerator; +import techreborn.blocks.generator.BlockDragonEggSiphoner; +import techreborn.blocks.generator.BlockGasTurbine; +import techreborn.blocks.generator.BlockGenerator; +import techreborn.blocks.generator.BlockHeatGenerator; +import techreborn.blocks.generator.BlockLightningRod; +import techreborn.blocks.generator.BlockMagicEnergyAbsorber; +import techreborn.blocks.generator.BlockMagicEnergyConverter; +import techreborn.blocks.generator.BlockPlasmaGenerator; +import techreborn.blocks.generator.BlockSemiFluidGenerator; +import techreborn.blocks.generator.BlockSolarPanel; +import techreborn.blocks.generator.BlockThermalGenerator; +import techreborn.blocks.generator.BlockWaterMill; +import techreborn.blocks.generator.BlockWindMill; +import techreborn.blocks.machine.BlockAlloyFurnace; +import techreborn.blocks.machine.BlockAlloySmelter; +import techreborn.blocks.machine.BlockAssemblingMachine; +import techreborn.blocks.machine.BlockBlastFurnace; +import techreborn.blocks.machine.BlockCentrifuge; +import techreborn.blocks.machine.BlockChargeBench; +import techreborn.blocks.machine.BlockChemicalReactor; +import techreborn.blocks.machine.BlockDistillationTower; +import techreborn.blocks.machine.BlockImplosionCompressor; +import techreborn.blocks.machine.BlockIndustrialElectrolyzer; +import techreborn.blocks.machine.BlockIndustrialGrinder; +import techreborn.blocks.machine.BlockIndustrialSawmill; +import techreborn.blocks.machine.BlockMatterFabricator; +import techreborn.blocks.machine.BlockRollingMachine; +import techreborn.blocks.machine.BlockVacuumFreezer; import techreborn.blocks.storage.BlockAesu; import techreborn.blocks.storage.BlockIDSU; import techreborn.blocks.storage.BlockLesu; @@ -19,10 +67,50 @@ import techreborn.blocks.teir1.BlockCompressor; import techreborn.blocks.teir1.BlockElectricFurnace; import techreborn.blocks.teir1.BlockExtractor; import techreborn.blocks.teir1.BlockGrinder; -import techreborn.itemblocks.*; -import techreborn.tiles.*; +import techreborn.itemblocks.ItemBlockAesu; +import techreborn.itemblocks.ItemBlockDigitalChest; +import techreborn.itemblocks.ItemBlockMachineCasing; +import techreborn.itemblocks.ItemBlockMachineFrame; +import techreborn.itemblocks.ItemBlockOre; +import techreborn.itemblocks.ItemBlockOre2; +import techreborn.itemblocks.ItemBlockPlayerDetector; +import techreborn.itemblocks.ItemBlockQuantumChest; +import techreborn.itemblocks.ItemBlockQuantumTank; +import techreborn.itemblocks.ItemBlockRubberSapling; +import techreborn.itemblocks.ItemBlockStorage; +import techreborn.itemblocks.ItemBlockStorage2; +import techreborn.tiles.TileAesu; +import techreborn.tiles.TileAlloyFurnace; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileAssemblingMachine; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileCentrifuge; +import techreborn.tiles.TileChargeBench; +import techreborn.tiles.TileChemicalReactor; +import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.TileDigitalChest; +import techreborn.tiles.TileImplosionCompressor; +import techreborn.tiles.TileIndustrialElectrolyzer; +import techreborn.tiles.TileIndustrialGrinder; +import techreborn.tiles.TileIndustrialSawmill; +import techreborn.tiles.TileMachineCasing; +import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.TilePlayerDectector; +import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.TileRollingMachine; +import techreborn.tiles.TileThermalGenerator; +import techreborn.tiles.TileVacuumFreezer; import techreborn.tiles.fusionReactor.TileEntityFusionController; -import techreborn.tiles.generator.*; +import techreborn.tiles.generator.TileDieselGenerator; +import techreborn.tiles.generator.TileDragonEggSiphoner; +import techreborn.tiles.generator.TileGasTurbine; +import techreborn.tiles.generator.TileGenerator; +import techreborn.tiles.generator.TileHeatGenerator; +import techreborn.tiles.generator.TileSemifluidGenerator; +import techreborn.tiles.generator.TileSolarPanel; +import techreborn.tiles.generator.TileWaterMill; +import techreborn.tiles.generator.TileWindMill; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index dcd477e55..6f4b38fe9 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -12,10 +12,36 @@ import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.events.OreUnifier; -import techreborn.items.*; +import techreborn.items.ItemCells; +import techreborn.items.ItemCrushedOre; +import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemLapotronicOrb; +import techreborn.items.ItemLithiumBattery; +import techreborn.items.ItemMissingRecipe; +import techreborn.items.ItemNuggets; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; +import techreborn.items.ItemPurifiedCrushedOre; +import techreborn.items.ItemReBattery; +import techreborn.items.ItemUUmatter; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; -import techreborn.items.tools.*; +import techreborn.items.tools.ItemAdvancedChainsaw; +import techreborn.items.tools.ItemAdvancedDrill; +import techreborn.items.tools.ItemChainsaw; +import techreborn.items.tools.ItemCloakingDevice; +import techreborn.items.tools.ItemDiamondChainsaw; +import techreborn.items.tools.ItemDiamondDrill; +import techreborn.items.tools.ItemDrill; +import techreborn.items.tools.ItemFluidbucket; +import techreborn.items.tools.ItemHammer; +import techreborn.items.tools.ItemOmniTool; +import techreborn.items.tools.ItemRockCutter; +import techreborn.items.tools.ItemTechManual; +import techreborn.items.tools.ItemTreeTap; public class ModItems { diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index 25da3be4a..16fe2dae8 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -1,13 +1,13 @@ package techreborn.init; +import java.util.Arrays; + import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import techreborn.config.ConfigTechReborn; import techreborn.items.ItemIngots; -import java.util.Arrays; - public class ModLoot { public static WeightedRandomChestContent rubberSaplingLoot = new WeightedRandomChestContent(new ItemStack(ModBlocks.rubberSapling), 1, 3, 25); diff --git a/src/main/java/techreborn/init/ModParts.java b/src/main/java/techreborn/init/ModParts.java index 6044e1c63..e41ed04c4 100644 --- a/src/main/java/techreborn/init/ModParts.java +++ b/src/main/java/techreborn/init/ModParts.java @@ -1,9 +1,9 @@ package techreborn.init; -import net.minecraft.item.ItemStack; - import java.util.HashMap; +import net.minecraft.item.ItemStack; + public class ModParts { public static HashMap stackCable = new HashMap(); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index b4b46cd3b..296995cf8 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -1,5 +1,9 @@ package techreborn.init; +import java.security.InvalidParameterException; + +import org.apache.commons.lang3.ArrayUtils; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -8,7 +12,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.ArrayUtils; import reborncore.common.util.CraftingHelper; import reborncore.common.util.OreUtil; import techreborn.Core; @@ -16,18 +19,33 @@ import techreborn.api.TechRebornAPI; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; -import techreborn.api.recipe.machines.*; +import techreborn.api.recipe.machines.AlloySmelterRecipe; +import techreborn.api.recipe.machines.BlastFurnaceRecipe; +import techreborn.api.recipe.machines.CentrifugeRecipe; +import techreborn.api.recipe.machines.ChemicalReactorRecipe; +import techreborn.api.recipe.machines.GrinderRecipe; +import techreborn.api.recipe.machines.ImplosionCompressorRecipe; +import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; +import techreborn.api.recipe.machines.IndustrialGrinderRecipe; +import techreborn.api.recipe.machines.IndustrialSawmillRecipe; +import techreborn.api.recipe.machines.PlateCuttingMachineRecipe; +import techreborn.api.recipe.machines.VacuumFreezerRecipe; import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre2; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockStorage2; import techreborn.config.ConfigTechReborn; -import techreborn.items.*; +import techreborn.items.ItemCells; +import techreborn.items.ItemDusts; +import techreborn.items.ItemDustsSmall; +import techreborn.items.ItemGems; +import techreborn.items.ItemIngots; +import techreborn.items.ItemNuggets; +import techreborn.items.ItemParts; +import techreborn.items.ItemPlates; import techreborn.utils.RecipeUtils; -import java.security.InvalidParameterException; - public class ModRecipes { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/init/RecipeCompact.java b/src/main/java/techreborn/init/RecipeCompact.java index 8db6674e9..8616c9f1a 100644 --- a/src/main/java/techreborn/init/RecipeCompact.java +++ b/src/main/java/techreborn/init/RecipeCompact.java @@ -1,5 +1,12 @@ package techreborn.init; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -10,13 +17,6 @@ import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.items.ItemPlates; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; - public class RecipeCompact implements IRecipeCompact { HashMap recipes = new HashMap<>(); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java index d734d1daa..cff2a5797 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockAesu.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockAesu.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -17,8 +19,6 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.init.ModBlocks; import techreborn.tiles.TileAesu; -import java.util.List; - public class ItemBlockAesu extends ItemBlock { public ItemBlockAesu(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java index eae6ace27..dc28200a7 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockDigitalChest.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +14,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.tiles.TileDigitalChest; -import java.util.List; - public class ItemBlockDigitalChest extends ItemBlock { public ItemBlockDigitalChest(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/itemblocks/ItemBlockOre2.java b/src/main/java/techreborn/itemblocks/ItemBlockOre2.java index 80a7e774f..57ef610c9 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockOre2.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockOre2.java @@ -2,7 +2,6 @@ package techreborn.itemblocks; import net.minecraft.block.Block; import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockOre; import techreborn.blocks.BlockOre2; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java index 1f4c59706..bf6338ae9 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java @@ -1,5 +1,7 @@ package techreborn.itemblocks; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +14,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.tiles.TileQuantumChest; -import java.util.List; - public class ItemBlockQuantumChest extends ItemBlock { public ItemBlockQuantumChest(Block p_i45328_1_) { diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index 442c94388..7b43de23f 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,8 +14,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.util.List; - public class ItemCells extends ItemTextureBase implements IFluidContainerItem { public static ItemStack getCellByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemCrushedOre.java b/src/main/java/techreborn/items/ItemCrushedOre.java index bbe66c263..1e12a8001 100644 --- a/src/main/java/techreborn/items/ItemCrushedOre.java +++ b/src/main/java/techreborn/items/ItemCrushedOre.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemCrushedOre extends ItemTextureBase { public static ItemStack getCrushedOreByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index ee7e831b0..61fefd58a 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -8,9 +11,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemDusts extends ItemTextureBase { public static ItemStack getDustByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 8074d8d9e..1592c4f56 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemDustsSmall extends ItemTextureBase { public static ItemStack getSmallDustByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index eba89ed6e..d406930cf 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemGems extends ItemTextureBase { public static ItemStack getGemByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index b835afb7b..e9a3f18c0 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemIngots extends ItemTextureBase { public static ItemStack getIngotByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemLithiumBattery.java b/src/main/java/techreborn/items/ItemLithiumBattery.java index 1c09c7b81..cafbbcc82 100644 --- a/src/main/java/techreborn/items/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/ItemLithiumBattery.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemLithiumBattery extends ItemTextureBase implements IEnergyItemInfo { public ItemLithiumBattery() { diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 12ed8d054..856a42211 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemNuggets extends ItemTextureBase { public static ItemStack getNuggetByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 08be719b0..88d714e7f 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,9 +14,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemParts extends ItemTextureBase { public static ItemStack getPartByName(String name, int count) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 22bac53e6..73b6a4e39 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemPlates extends ItemTextureBase { public static ItemStack getPlateByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java index c0ff62860..a81bab8d9 100644 --- a/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java +++ b/src/main/java/techreborn/items/ItemPurifiedCrushedOre.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemPurifiedCrushedOre extends ItemTextureBase { public static ItemStack getPurifiedCrushedOreByName(String name, int count) { diff --git a/src/main/java/techreborn/items/ItemReBattery.java b/src/main/java/techreborn/items/ItemReBattery.java index 8a4ef54bf..90769fea0 100644 --- a/src/main/java/techreborn/items/ItemReBattery.java +++ b/src/main/java/techreborn/items/ItemReBattery.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemReBattery extends ItemTextureBase implements IEnergyItemInfo { public ItemReBattery() { diff --git a/src/main/java/techreborn/items/ItemUpgrade.java b/src/main/java/techreborn/items/ItemUpgrade.java index 1ab76271f..ee1f1a30e 100644 --- a/src/main/java/techreborn/items/ItemUpgrade.java +++ b/src/main/java/techreborn/items/ItemUpgrade.java @@ -1,5 +1,8 @@ package techreborn.items; +import java.security.InvalidParameterException; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -8,9 +11,6 @@ import techreborn.api.upgrade.IMachineUpgrade; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModItems; -import java.security.InvalidParameterException; -import java.util.List; - public class ItemUpgrade extends ItemTR implements IMachineUpgrade { public static ItemStack getUpgradeByName(String name, int count) { diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index d5a1bae99..f32e16ebc 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -1,6 +1,8 @@ package techreborn.items.armor; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -15,8 +17,6 @@ import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 4796baeb2..308e01535 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -1,5 +1,7 @@ package techreborn.items.armor; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -14,8 +16,6 @@ import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index d08a16cb4..9484622c7 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 33d0ea490..3371c0299 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemAdvancedDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.AdvancedDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 760b516ba..4fc009ee9 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index f15b88488..f1e1690f0 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +17,6 @@ import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.items.ItemTextureBase; -import java.util.List; - public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo { public static int Teir = ConfigTechReborn.CloakingDeviceTier; public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index e58e0df51..2cbcd7cfb 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 2facb6d05..bcfb62cd3 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemDiamondDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.DiamondDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 61d39c121..f867ee8f7 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -22,8 +24,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public int maxCharge = ConfigTechReborn.IronDrillCharge; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 34f04b84a..5430f588f 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -23,8 +25,6 @@ import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.OmniToolCharge; diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 4ab9652a6..ed29abb1e 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -1,5 +1,7 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -19,8 +21,6 @@ import reborncore.common.util.Color; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import java.util.List; - public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.RockCutterCharge; diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index e754eaedb..186e704fc 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -8,7 +8,6 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.items.ItemTR; -import techreborn.items.ItemTextureBase; public class ItemTechManual extends ItemTR implements ITexturedItem { diff --git a/src/main/java/techreborn/manual/pages/BasePage.java b/src/main/java/techreborn/manual/pages/BasePage.java index df1a7e5c2..5b9ef56c9 100644 --- a/src/main/java/techreborn/manual/pages/BasePage.java +++ b/src/main/java/techreborn/manual/pages/BasePage.java @@ -1,5 +1,7 @@ package techreborn.manual.pages; +import java.io.IOException; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -8,8 +10,6 @@ import net.minecraft.util.StatCollector; import techreborn.manual.PageCollection; import techreborn.manual.Reference; -import java.io.IOException; - public class BasePage extends GuiScreen { //Name used to reference the page diff --git a/src/main/java/techreborn/manual/pages/ContentsPage.java b/src/main/java/techreborn/manual/pages/ContentsPage.java index 16d259d8e..7618df9f3 100644 --- a/src/main/java/techreborn/manual/pages/ContentsPage.java +++ b/src/main/java/techreborn/manual/pages/ContentsPage.java @@ -5,9 +5,7 @@ import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; -import techreborn.config.TechRebornConfigGui; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; import techreborn.items.ItemPlates; import techreborn.manual.PageCollection; import techreborn.manual.Reference; diff --git a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java index 7584dd5dc..aa9244dda 100644 --- a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -32,7 +32,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import techreborn.manual.PageCollection; -import techreborn.manual.Reference; import techreborn.manual.util.ButtonUtil; public class CraftingInfoPage extends TitledPage diff --git a/src/main/java/techreborn/manual/pages/DescriptionPage.java b/src/main/java/techreborn/manual/pages/DescriptionPage.java index 0950a344c..2ec467681 100644 --- a/src/main/java/techreborn/manual/pages/DescriptionPage.java +++ b/src/main/java/techreborn/manual/pages/DescriptionPage.java @@ -12,13 +12,11 @@ import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import techreborn.manual.PageCollection; import techreborn.manual.Reference; import techreborn.manual.util.ButtonUtil; -import techreborn.manual.util.GuiButtonCustomTexture; public class DescriptionPage extends TitledPage { diff --git a/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java b/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java index 64baa56b0..a80b840c5 100644 --- a/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java +++ b/src/main/java/techreborn/manual/pages/GeneratingPowerPage.java @@ -5,8 +5,6 @@ import java.awt.Color; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import techreborn.init.ModBlocks; -import techreborn.items.ItemParts; -import techreborn.items.ItemPlates; import techreborn.manual.PageCollection; import techreborn.manual.Reference; import techreborn.manual.util.ButtonUtil; diff --git a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java index 6f1e01a38..450bae207 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonAHeight.java +++ b/src/main/java/techreborn/manual/util/GuiButtonAHeight.java @@ -1,10 +1,11 @@ package techreborn.manual.util; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; -import org.lwjgl.opengl.GL11; public class GuiButtonAHeight extends GuiButton { diff --git a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java index 7dd7ecc33..c4ec159fe 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonCustomTexture.java @@ -6,9 +6,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiButtonExt; diff --git a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java index 0a846bef8..b1d8eb5b2 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java @@ -1,13 +1,14 @@ package techreborn.manual.util; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiButtonExt; -import org.lwjgl.opengl.GL11; - -import java.awt.*; public class GuiButtonItemTexture extends GuiButtonExt { diff --git a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java index 72e6a2c19..4e866031e 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java +++ b/src/main/java/techreborn/manual/util/GuiButtonTextOnly.java @@ -1,13 +1,14 @@ package techreborn.manual.util; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; - -import java.awt.*; public class GuiButtonTextOnly extends GuiButton { public String LINKED_PAGE; diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index ed86871e6..1310f9f71 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -1,11 +1,11 @@ package techreborn.packets; +import java.io.IOException; + import io.netty.buffer.ByteBuf; import reborncore.common.packets.SimplePacket; import techreborn.tiles.TileAesu; -import java.io.IOException; - public class PacketAesu extends SimplePacket { diff --git a/src/main/java/techreborn/packets/PacketIdsu.java b/src/main/java/techreborn/packets/PacketIdsu.java index c60d6ad19..cdea1ad91 100644 --- a/src/main/java/techreborn/packets/PacketIdsu.java +++ b/src/main/java/techreborn/packets/PacketIdsu.java @@ -1,11 +1,11 @@ package techreborn.packets; +import java.io.IOException; + import io.netty.buffer.ByteBuf; import reborncore.common.packets.SimplePacket; import techreborn.tiles.idsu.TileIDSU; -import java.io.IOException; - public class PacketIdsu extends SimplePacket { diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index f456e4a5e..4e93cbe87 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -3,7 +3,11 @@ package techreborn.proxies; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import reborncore.client.multiblock.MultiblockRenderEvent; -import techreborn.client.*; +import techreborn.client.ClientMultiBlocks; +import techreborn.client.IconSupplier; +import techreborn.client.RegisterItemJsons; +import techreborn.client.StackToolTipEvent; +import techreborn.client.VersionCheckerClient; import techreborn.client.hud.ChargeHud; import techreborn.client.keybindings.KeyBindings; diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index bde26b39e..e2807d3cb 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -7,7 +7,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 1d410e6f2..d6a958824 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -16,8 +18,6 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import java.util.List; - public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory, IListInfoProvider { public int tickTime; diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 099ecc7a3..ba4957e40 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -16,8 +18,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; -import java.util.List; - public class TileDigitalChest extends TileMachineBase implements IInventory, IWrenchable, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java index d2302aec6..ceb842fa2 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java @@ -10,7 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 17ac88830..47a7cd706 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -10,7 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.IListInfoProvider; import reborncore.common.misc.Location; import reborncore.common.powerSystem.TilePowerAcceptor; diff --git a/src/main/java/techreborn/tiles/TilePlayerDectector.java b/src/main/java/techreborn/tiles/TilePlayerDectector.java index 92baefdaa..eaacede65 100644 --- a/src/main/java/techreborn/tiles/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/TilePlayerDectector.java @@ -1,13 +1,13 @@ package techreborn.tiles; +import java.util.Iterator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; -import java.util.Iterator; - public class TilePlayerDectector extends TilePowerAcceptor { diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 14d67b9a6..7593c21c6 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -17,8 +19,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; -import java.util.List; - public class TileQuantumChest extends TileMachineBase implements IInventory, IWrenchable, IDeepStorageUnit, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 855aa74ed..629582852 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -1,5 +1,7 @@ package techreborn.tiles; +import java.util.List; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,8 +23,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.init.ModBlocks; -import java.util.List; - public class TileQuantumTank extends TileMachineBase implements IFluidHandler, IInventory, IWrenchable, IListInfoProvider { diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/TileThermalGenerator.java index 96d2c2ad3..8929cd003 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/TileThermalGenerator.java @@ -12,7 +12,12 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index cd1618315..4c9e11dab 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -10,7 +10,11 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.fuel.FluidPowerManager; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 1ef7fb063..9148be421 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -1,5 +1,8 @@ package techreborn.tiles.generator; +import java.util.HashMap; +import java.util.Map; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,7 +13,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -18,9 +26,6 @@ import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.HashMap; -import java.util.Map; - public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 230a812e2..981132238 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -1,19 +1,13 @@ package techreborn.tiles.generator; import ic2.api.tile.IWrenchable; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fml.common.network.PacketLoggingHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index bfd14a875..fdf5eedf6 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -1,5 +1,8 @@ package techreborn.tiles.generator; +import java.util.HashMap; +import java.util.Map; + import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,7 +13,12 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -18,9 +26,6 @@ import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.HashMap; -import java.util.Map; - public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index c797f2c2a..e1fe723ac 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -1,13 +1,11 @@ package techreborn.tiles.generator; -import com.mojang.realmsclient.gui.ChatFormatting; +import java.util.List; + import net.minecraft.util.EnumFacing; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.blocks.generator.BlockSolarPanel; -import java.util.List; - /** * Created by mark on 25/02/2016. */ diff --git a/src/main/java/techreborn/tiles/idsu/IDSUManager.java b/src/main/java/techreborn/tiles/idsu/IDSUManager.java index df3121b31..a37389530 100644 --- a/src/main/java/techreborn/tiles/idsu/IDSUManager.java +++ b/src/main/java/techreborn/tiles/idsu/IDSUManager.java @@ -1,19 +1,24 @@ package techreborn.tiles.idsu; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.TreeMap; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; + import net.minecraft.world.World; import net.minecraft.world.storage.ISaveHandler; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import java.io.*; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.TreeMap; - public class IDSUManager { diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 72e030da2..d962583a3 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -1,10 +1,11 @@ package techreborn.tiles.idsu; +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.EnumFacing; -import org.apache.commons.lang3.StringUtils; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index a981b7113..b4e6f568d 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -1,14 +1,14 @@ package techreborn.tiles.lesu; +import java.util.ArrayList; + import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; -import java.util.ArrayList; - public class TileLesu extends TilePowerAcceptor {//TODO wrench private ArrayList countedNetworks = new ArrayList(); diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index 99d59eb24..6a1b6eff8 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; @@ -10,8 +12,6 @@ import net.minecraftforge.common.IPlantable; import techreborn.blocks.BlockRubberLog; import techreborn.init.ModBlocks; -import java.util.Random; - public class RubberTreeGenerator extends WorldGenerator { boolean isWorldGen = true; diff --git a/src/main/java/techreborn/world/TROreGen.java b/src/main/java/techreborn/world/TROreGen.java index bdc10ab42..6de36c982 100644 --- a/src/main/java/techreborn/world/TROreGen.java +++ b/src/main/java/techreborn/world/TROreGen.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -9,8 +11,6 @@ import techreborn.Core; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import java.util.Random; - public class TROreGen implements IWorldGenerator { public static ConfigTechReborn config; diff --git a/src/main/java/techreborn/world/TreeGenerator.java b/src/main/java/techreborn/world/TreeGenerator.java index 0fdeb3e74..4cdd24027 100644 --- a/src/main/java/techreborn/world/TreeGenerator.java +++ b/src/main/java/techreborn/world/TreeGenerator.java @@ -1,5 +1,7 @@ package techreborn.world; +import java.util.Random; + import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -8,8 +10,6 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.fml.common.IWorldGenerator; import techreborn.config.ConfigTechReborn; -import java.util.Random; - /** * Created by Mark on 19/02/2016. */