From 46cdf8f587d979e10a776896a9dc10806c27f0b2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 24 Feb 2016 08:18:21 +0000 Subject: [PATCH] Fixes to configs, optimise imports. --- src/main/java/techreborn/Core.java | 1 - .../techreborn/api/recipe/RecipeCrafter.java | 4 +- .../techreborn/api/recipe/RecipeHandler.java | 1 - .../api/recipe/machines/CompressorRecipe.java | 3 - .../api/recipe/machines/ExtractorRecipe.java | 3 - .../api/recipe/machines/GrinderRecipe.java | 3 - .../techreborn/blocks/BlockDigitalChest.java | 1 - .../techreborn/blocks/BlockIronFenceGate.java | 1 - .../techreborn/blocks/BlockQuantumChest.java | 1 - .../techreborn/blocks/BlockQuantumTank.java | 1 - .../techreborn/blocks/BlockRubberLog.java | 3 - .../techreborn/blocks/BlockRubberSapling.java | 1 - .../generator/BlockDieselGenerator.java | 2 +- .../blocks/generator/BlockGasTurbine.java | 2 +- .../blocks/generator/BlockGenerator.java | 4 +- .../generator/BlockSemiFluidGenerator.java | 2 +- .../generator/BlockThermalGenerator.java | 3 +- .../blocks/machine/BlockAlloyFurnace.java | 2 +- .../blocks/machine/BlockAlloySmelter.java | 2 +- .../machine/BlockAssemblingMachine.java | 2 +- .../blocks/machine/BlockBlastFurnace.java | 2 +- .../blocks/machine/BlockCentrifuge.java | 3 +- .../blocks/machine/BlockChargeBench.java | 2 +- .../blocks/machine/BlockChemicalReactor.java | 2 +- .../machine/BlockImplosionCompressor.java | 2 +- .../machine/BlockIndustrialElectrolyzer.java | 2 +- .../machine/BlockIndustrialGrinder.java | 2 +- .../machine/BlockIndustrialSawmill.java | 2 +- .../blocks/machine/BlockMatterFabricator.java | 2 +- .../blocks/machine/BlockRollingMachine.java | 2 +- .../blocks/machine/BlockVacuumFreezer.java | 2 +- .../techreborn/blocks/storage/BlockAesu.java | 2 +- .../techreborn/blocks/storage/BlockIDSU.java | 2 +- .../techreborn/blocks/storage/BlockLesu.java | 2 +- .../blocks/teir1/BlockCompressor.java | 2 +- .../blocks/teir1/BlockElectricFurnace.java | 2 +- .../blocks/teir1/BlockExtractor.java | 2 +- .../techreborn/blocks/teir1/BlockGrinder.java | 2 +- .../techreborn/client/RegisterItemJsons.java | 5 - .../techreborn/client/StackToolTipEvent.java | 2 +- .../client/container/ContainerCompressor.java | 3 - .../container/ContainerElectricFurnace.java | 3 - .../client/container/ContainerExtractor.java | 3 - .../client/container/ContainerGenerator.java | 3 - .../client/container/ContainerGrinder.java | 2 - .../client/gui/GuiElectricFurnace.java | 6 -- .../techreborn/client/gui/GuiExtractor.java | 4 - .../techreborn/client/gui/GuiGenerator.java | 2 - .../techreborn/client/gui/GuiGrinder.java | 2 - .../java/techreborn/client/hud/ChargeHud.java | 2 +- .../compat/jei/BaseRecipeWrapper.java | 6 +- .../techreborn/compat/jei/RecipeUtil.java | 24 +++-- .../compat/jei/TechRebornJeiPlugin.java | 28 +----- .../AlloySmelterRecipeCategory.java | 6 +- .../AssemblingMachineRecipeCategory.java | 6 +- .../FusionReactorRecipeHandler.java | 4 +- .../ImplosionCompressorRecipeCategory.java | 6 +- .../RollingMachineRecipeCategory.java | 7 +- .../RollingMachineRecipeHandler.java | 4 +- .../RollingMachineRecipeMaker.java | 7 +- .../compat/minetweaker/MinetweakerCompat.java | 10 +- .../compat/recipes/RecipesBiomesOPlenty.java | 8 +- .../compat/waila/CompatModuleWaila.java | 4 +- .../techreborn/config/ConfigTechReborn.java | 2 - src/main/java/techreborn/init/ModBlocks.java | 93 ++----------------- src/main/java/techreborn/init/ModFluids.java | 1 - src/main/java/techreborn/init/ModItems.java | 2 +- src/main/java/techreborn/init/ModLoot.java | 14 ++- src/main/java/techreborn/items/ItemCells.java | 2 - .../techreborn/items/ItemLithiumBattery.java | 6 +- .../java/techreborn/items/ItemReBattery.java | 6 +- .../java/techreborn/items/ItemUUmatter.java | 1 - .../items/armor/ItemLapotronPack.java | 2 +- .../items/armor/ItemLithiumBatpack.java | 2 +- .../items/tools/ItemAdvancedDrill.java | 4 +- .../items/tools/ItemCloakingDevice.java | 2 +- .../items/tools/ItemDiamondDrill.java | 4 +- .../techreborn/items/tools/ItemDrill.java | 4 +- .../techreborn/items/tools/ItemOmniTool.java | 4 +- .../items/tools/ItemRockCutter.java | 4 +- .../techreborn/items/tools/ItemTechPda.java | 1 - .../techreborn/items/tools/ItemTreeTap.java | 7 -- .../pda/pages/CraftingInfoPage.java | 1 - .../java/techreborn/proxies/ClientProxy.java | 6 +- src/main/java/techreborn/tiles/TileAesu.java | 2 +- .../techreborn/tiles/TileAlloySmelter.java | 2 +- .../tiles/TileAssemblingMachine.java | 2 +- .../techreborn/tiles/TileBlastFurnace.java | 2 +- .../java/techreborn/tiles/TileCentrifuge.java | 2 +- .../techreborn/tiles/TileChargeBench.java | 4 +- .../techreborn/tiles/TileChemicalReactor.java | 2 +- .../techreborn/tiles/TileChunkLoader.java | 2 +- .../tiles/TileImplosionCompressor.java | 2 +- .../tiles/TileIndustrialElectrolyzer.java | 2 +- .../tiles/TileIndustrialGrinder.java | 2 +- .../tiles/TileIndustrialSawmill.java | 2 +- .../tiles/TileMatterFabricator.java | 2 +- .../techreborn/tiles/TileRollingMachine.java | 2 +- .../tiles/TileThermalGenerator.java | 2 +- .../techreborn/tiles/TileVacuumFreezer.java | 2 +- .../TileEntityFusionController.java | 2 +- .../tiles/generator/TileDieselGenerator.java | 2 +- .../generator/TileDragonEggSiphoner.java | 2 +- .../tiles/generator/TileGasTurbine.java | 2 +- .../tiles/generator/TileGenerator.java | 8 +- .../tiles/generator/TileHeatGenerator.java | 2 +- .../generator/TileSemifluidGenerator.java | 2 +- .../java/techreborn/tiles/idsu/TileIDSU.java | 2 +- .../java/techreborn/tiles/lesu/TileLesu.java | 2 +- .../tiles/teir1/TileCompressor.java | 2 +- .../tiles/teir1/TileElectricFurnace.java | 3 +- .../techreborn/tiles/teir1/TileExtractor.java | 2 +- .../techreborn/tiles/teir1/TileGrinder.java | 2 +- .../techreborn/world/RubberTreeGenerator.java | 1 - .../java/techreborn/world/TreeGenerator.java | 4 +- 115 files changed, 131 insertions(+), 345 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index d8eab6aac..2bc22804e 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -23,7 +23,6 @@ import techreborn.api.TechRebornAPI; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.recipeConfig.RecipeConfigManager; import techreborn.client.GuiHandler; -import techreborn.client.RegisterItemJsons; import techreborn.command.TechRebornDevCommand; import techreborn.compat.CompatManager; import techreborn.compat.ICompatModule; diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index 0efba3b22..c4e41614c 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -2,11 +2,11 @@ package techreborn.api.recipe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import reborncore.common.util.Inventory; -import reborncore.common.util.ItemUtils; import reborncore.api.power.IEnergyInterfaceTile; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.tile.TileMachineBase; +import reborncore.common.util.Inventory; +import reborncore.common.util.ItemUtils; import java.util.ArrayList; diff --git a/src/main/java/techreborn/api/recipe/RecipeHandler.java b/src/main/java/techreborn/api/recipe/RecipeHandler.java index 4a27a126c..c07097342 100644 --- a/src/main/java/techreborn/api/recipe/RecipeHandler.java +++ b/src/main/java/techreborn/api/recipe/RecipeHandler.java @@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack; import org.apache.commons.lang3.time.StopWatch; import reborncore.common.util.ItemUtils; import techreborn.Core; -import techreborn.api.recipe.recipeConfig.RecipeConfigManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/techreborn/api/recipe/machines/CompressorRecipe.java b/src/main/java/techreborn/api/recipe/machines/CompressorRecipe.java index 1c2c85b9c..f7ba0407c 100644 --- a/src/main/java/techreborn/api/recipe/machines/CompressorRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/CompressorRecipe.java @@ -2,11 +2,8 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; import techreborn.api.recipe.BaseRecipe; import techreborn.lib.Reference; -import techreborn.tiles.TileIndustrialGrinder; public class CompressorRecipe extends BaseRecipe { diff --git a/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java b/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java index d983f8e64..9da869428 100644 --- a/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/ExtractorRecipe.java @@ -2,11 +2,8 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; import techreborn.api.recipe.BaseRecipe; import techreborn.lib.Reference; -import techreborn.tiles.TileIndustrialGrinder; public class ExtractorRecipe extends BaseRecipe { diff --git a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java index 1636de30d..335293aba 100644 --- a/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/GrinderRecipe.java @@ -2,11 +2,8 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; import techreborn.api.recipe.BaseRecipe; import techreborn.lib.Reference; -import techreborn.tiles.TileIndustrialGrinder; public class GrinderRecipe extends BaseRecipe { diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 692d8840f..61bb0b037 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -1,6 +1,5 @@ package techreborn.blocks; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blocks/BlockIronFenceGate.java b/src/main/java/techreborn/blocks/BlockIronFenceGate.java index de8f4a662..1689391db 100644 --- a/src/main/java/techreborn/blocks/BlockIronFenceGate.java +++ b/src/main/java/techreborn/blocks/BlockIronFenceGate.java @@ -4,7 +4,6 @@ import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 1a891b395..97c27e340 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -1,6 +1,5 @@ package techreborn.blocks; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index ef799458a..75d5d5545 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -1,6 +1,5 @@ package techreborn.blocks; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 22ec73273..8f1d66a61 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -7,10 +7,8 @@ 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.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -18,7 +16,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.RebornCore; import techreborn.client.TechRebornCreativeTabMisc; -import techreborn.init.ModParts; import techreborn.items.ItemParts; import techreborn.items.tools.ItemTreeTap; diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 10d52d604..0c8323d7f 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -9,7 +9,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.world.RubberTreeGenerator; -import techreborn.world.TreeGenerator; import java.util.List; import java.util.Random; diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 77a80649b..c362a2dac 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileDieselGenerator; diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index edb3c7acb..ae35f0acd 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileGasTurbine; diff --git a/src/main/java/techreborn/blocks/generator/BlockGenerator.java b/src/main/java/techreborn/blocks/generator/BlockGenerator.java index 19cc331c2..255b55569 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockGenerator.java @@ -1,13 +1,11 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blocks.IAdvancedRotationTexture; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileGenerator; diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index c2a25080d..e96d1a27d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileSemifluidGenerator; diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index e8c4dd1da..eaf7cb263 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -1,13 +1,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileThermalGenerator; diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java index 4f6d4e663..bc1588ba7 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloyFurnace; diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index 2f398cbf5..8bd98ff1b 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 87056841d..f5b9f20d6 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAssemblingMachine; diff --git a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java index 324334324..2e7ee3285 100644 --- a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileBlastFurnace; diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index e661f480b..303c52c6b 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -1,12 +1,11 @@ package techreborn.blocks.machine; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileCentrifuge; diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index 3f69e100c..01f1a1206 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileChargeBench; diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 4f68d7e54..c1f4119db 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileChemicalReactor; diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java index 653afa8fe..bad086f90 100644 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileImplosionCompressor; diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index 33e42b2b1..091ffd5d8 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileIndustrialElectrolyzer; diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java index f8d87adbf..22e6bedd1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileIndustrialGrinder; diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java index c29b9159e..b7245743d 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileIndustrialSawmill; diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 30d8883db..07baecbca 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileMatterFabricator; diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index c52bf0987..2f3dd46e4 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileRollingMachine; diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 904b948e8..be0213265 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileVacuumFreezer; diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index 83f0c8c51..40bdf836f 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAesu; diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index ec432b40b..7aa1176f5 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.idsu.TileIDSU; diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java index 31f21ae20..a53a05cf5 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.lesu.TileLesu; diff --git a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java b/src/main/java/techreborn/blocks/teir1/BlockCompressor.java index 9699b7c49..ad7fc1c96 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/teir1/BlockCompressor.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.teir1.TileCompressor; diff --git a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java index 5452ad3af..f4bd8d44d 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.teir1.TileElectricFurnace; diff --git a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java b/src/main/java/techreborn/blocks/teir1/BlockExtractor.java index 04ccb1752..9bcfc5962 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/teir1/BlockExtractor.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.teir1.TileExtractor; diff --git a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java b/src/main/java/techreborn/blocks/teir1/BlockGrinder.java index 5c66ea92f..6f5bc1aa7 100644 --- a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/teir1/BlockGrinder.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import techreborn.Core; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IRotationTexture; +import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.teir1.TileGrinder; diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 79646d286..5a198a923 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -1,14 +1,9 @@ package techreborn.client; -import jline.internal.Log; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import reborncore.common.util.LogHelper; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; public class RegisterItemJsons { public static void registerModels() { diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index f1654ee3a..570abcd4c 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -9,9 +9,9 @@ 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.util.Color; import techreborn.Core; -import reborncore.api.power.IEnergyInterfaceItem; public class StackToolTipEvent { diff --git a/src/main/java/techreborn/client/container/ContainerCompressor.java b/src/main/java/techreborn/client/container/ContainerCompressor.java index b12abdd7c..91fdab2b7 100644 --- a/src/main/java/techreborn/client/container/ContainerCompressor.java +++ b/src/main/java/techreborn/client/container/ContainerCompressor.java @@ -1,14 +1,11 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.SlotOutput; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileCompressor; -import techreborn.tiles.teir1.TileGrinder; public class ContainerCompressor extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerElectricFurnace.java b/src/main/java/techreborn/client/container/ContainerElectricFurnace.java index 55dd4bfb4..3b248764c 100644 --- a/src/main/java/techreborn/client/container/ContainerElectricFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerElectricFurnace.java @@ -1,15 +1,12 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.SlotOutput; import reborncore.common.container.RebornContainer; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileElectricFurnace; -import techreborn.tiles.teir1.TileGrinder; public class ContainerElectricFurnace extends RebornContainer { diff --git a/src/main/java/techreborn/client/container/ContainerExtractor.java b/src/main/java/techreborn/client/container/ContainerExtractor.java index f39ba2f1c..07146562b 100644 --- a/src/main/java/techreborn/client/container/ContainerExtractor.java +++ b/src/main/java/techreborn/client/container/ContainerExtractor.java @@ -1,14 +1,11 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.SlotOutput; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileExtractor; -import techreborn.tiles.teir1.TileGrinder; public class ContainerExtractor extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerGenerator.java b/src/main/java/techreborn/client/container/ContainerGenerator.java index 07ed222ac..091cd04c6 100644 --- a/src/main/java/techreborn/client/container/ContainerGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerGenerator.java @@ -1,12 +1,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnaceFuel; -import reborncore.client.gui.SlotOutput; import reborncore.common.container.RebornContainer; -import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.generator.TileGenerator; public class ContainerGenerator extends RebornContainer { diff --git a/src/main/java/techreborn/client/container/ContainerGrinder.java b/src/main/java/techreborn/client/container/ContainerGrinder.java index 1a4c140ec..93c3f82e0 100644 --- a/src/main/java/techreborn/client/container/ContainerGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerGrinder.java @@ -1,12 +1,10 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.gui.SlotOutput; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileGrinder; public class ContainerGrinder extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index 08e716d1f..aea1a02d8 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -7,13 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerElectricFurnace; -import techreborn.client.container.ContainerExtractor; -import techreborn.client.container.ContainerGrinder; -import techreborn.client.container.ContainerIndustrialGrinder; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileElectricFurnace; -import techreborn.tiles.teir1.TileExtractor; -import techreborn.tiles.teir1.TileGrinder; public class GuiElectricFurnace extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index b8468b593..9766ee5c1 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -7,11 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerExtractor; -import techreborn.client.container.ContainerGrinder; -import techreborn.client.container.ContainerIndustrialGrinder; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileExtractor; -import techreborn.tiles.teir1.TileGrinder; public class GuiExtractor extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index cf823bcbd..3301856f8 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -5,9 +5,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerGenerator; -import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.generator.TileGenerator; public class GuiGenerator extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index 0eb7c2973..8aeb2ffcb 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -7,8 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import techreborn.client.container.ContainerGrinder; -import techreborn.client.container.ContainerIndustrialGrinder; -import techreborn.tiles.TileIndustrialGrinder; import techreborn.tiles.teir1.TileGrinder; public class GuiGrinder extends GuiContainer { diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 20acfba99..678b894c9 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -13,8 +13,8 @@ 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.common.util.Color; import reborncore.api.power.IEnergyInterfaceItem; +import reborncore.common.util.Color; import techreborn.client.keybindings.KeyBindings; import techreborn.config.ConfigTechReborn; diff --git a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java index df1d97216..8b93d0e54 100644 --- a/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java @@ -6,11 +6,7 @@ import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.BaseRecipe; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public abstract class BaseRecipeWrapper extends BlankRecipeWrapper { protected final T baseRecipe; diff --git a/src/main/java/techreborn/compat/jei/RecipeUtil.java b/src/main/java/techreborn/compat/jei/RecipeUtil.java index 7e2fed2ef..c940b7c2c 100644 --- a/src/main/java/techreborn/compat/jei/RecipeUtil.java +++ b/src/main/java/techreborn/compat/jei/RecipeUtil.java @@ -1,21 +1,19 @@ package techreborn.compat.jei; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.Color; -import java.text.NumberFormat; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import net.minecraftforge.fluids.FluidStack; - import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +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 fe382e858..01ed4457a 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -13,32 +13,8 @@ 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.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.ContainerIndustrialGrinder; -import techreborn.client.container.ContainerImplosionCompressor; -import techreborn.client.container.ContainerIndustrialElectrolyzer; -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.GuiIndustrialGrinder; -import techreborn.client.gui.GuiImplosionCompressor; -import techreborn.client.gui.GuiIndustrialElectrolyzer; -import techreborn.client.gui.GuiIndustrialSawmill; -import techreborn.client.gui.GuiRollingMachine; -import techreborn.client.gui.GuiVacuumFreezer; +import techreborn.client.container.*; +import techreborn.client.gui.*; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory; import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler; import techreborn.compat.jei.assemblingMachine.AssemblingMachineRecipeCategory; diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index 4d434a9b0..d1bdeeadb 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -1,11 +1,7 @@ package techreborn.compat.jei.alloySmelter; import mezz.jei.api.IGuiHelper; -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.gui.*; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java index e23bbfb88..79f738a0b 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java @@ -1,11 +1,7 @@ package techreborn.compat.jei.assemblingMachine; import mezz.jei.api.IGuiHelper; -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.gui.*; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java index ce9af95c2..0afe60fb8 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/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index b37d08a98..60900b1a1 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -1,11 +1,7 @@ package techreborn.compat.jei.implosionCompressor; import mezz.jei.api.IGuiHelper; -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.gui.*; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java index 69c82cc11..5da90110e 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java @@ -1,12 +1,7 @@ package techreborn.compat.jei.rollingMachine; import mezz.jei.api.IGuiHelper; -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.gui.*; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeHandler.java index 903482501..b2017e2f9 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 00b8657e4..fce13a83c 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeMaker.java @@ -1,12 +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/minetweaker/MinetweakerCompat.java b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java index ae260758c..256196faf 100644 --- a/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java +++ b/src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java @@ -1,10 +1,5 @@ package techreborn.compat.minetweaker; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -13,6 +8,11 @@ import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import techreborn.compat.ICompatModule; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; diff --git a/src/main/java/techreborn/compat/recipes/RecipesBiomesOPlenty.java b/src/main/java/techreborn/compat/recipes/RecipesBiomesOPlenty.java index 104d9eda2..aa0f1743d 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesBiomesOPlenty.java +++ b/src/main/java/techreborn/compat/recipes/RecipesBiomesOPlenty.java @@ -2,14 +2,14 @@ package techreborn.compat.recipes; import biomesoplenty.api.block.BOPBlocks; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; diff --git a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java index 2fc7dcb17..7aadd566a 100644 --- a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java +++ b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java @@ -1,9 +1,9 @@ package techreborn.compat.waila; -import net.minecraftforge.fml.common.event.*; import mcp.mobius.waila.api.IWailaRegistrar; -import techreborn.compat.ICompatModule; +import net.minecraftforge.fml.common.event.*; import reborncore.common.tile.TileMachineBase; +import techreborn.compat.ICompatModule; public class CompatModuleWaila implements ICompatModule { diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index bade5c404..01645629e 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,8 +1,6 @@ package techreborn.config; -import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fml.common.Loader; import java.io.File; diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 08adcbd26..426f916f4 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -8,54 +8,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; import techreborn.Core; -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.BlockIronFenceGate; -import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMachineFrame; -import techreborn.blocks.BlockOre; -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.BlockThermalGenerator; -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.*; +import techreborn.blocks.generator.*; +import techreborn.blocks.machine.*; import techreborn.blocks.storage.BlockAesu; import techreborn.blocks.storage.BlockIDSU; import techreborn.blocks.storage.BlockLesu; @@ -64,46 +19,10 @@ import techreborn.blocks.teir1.BlockCompressor; import techreborn.blocks.teir1.BlockElectricFurnace; import techreborn.blocks.teir1.BlockExtractor; import techreborn.blocks.teir1.BlockGrinder; -import techreborn.itemblocks.ItemBlockAesu; -import techreborn.itemblocks.ItemBlockDigitalChest; -import techreborn.itemblocks.ItemBlockMachineCasing; -import techreborn.itemblocks.ItemBlockMachineFrame; -import techreborn.itemblocks.ItemBlockOre; -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.itemblocks.*; +import techreborn.tiles.*; import techreborn.tiles.fusionReactor.TileEntityFusionController; -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.*; import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesuStorage; diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 07dba7358..2f69f1f9e 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -1,6 +1,5 @@ package techreborn.init; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 1b4af5909..13ccf194a 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -8,6 +8,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.BucketHandler; import techreborn.Core; import techreborn.events.OreUnifier; @@ -15,7 +16,6 @@ import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.tools.*; -import reborncore.common.powerSystem.PoweredItem; public class ModItems { diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index d2fbcec1e..25da3be4a 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -1,16 +1,14 @@ package techreborn.init; -import java.util.Arrays; - -import net.minecraft.item.Item; 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 ConfigTechReborn config; public static WeightedRandomChestContent rubberSaplingLoot = new WeightedRandomChestContent(new ItemStack(ModBlocks.rubberSapling), 1, 3, 25); public static WeightedRandomChestContent copperIngotLoot = new WeightedRandomChestContent(ItemIngots.getIngotByName("copper"), 1, 4, 20); @@ -18,16 +16,16 @@ public class ModLoot { public static WeightedRandomChestContent steelIngotLoot = new WeightedRandomChestContent(ItemIngots.getIngotByName("steel"), 1, 3, 5); public static void init(){ - if(config.RubberSaplingLoot){ + if(ConfigTechReborn.RubberSaplingLoot){ generate(rubberSaplingLoot); } - if(config.CopperIngotsLoot){ + if(ConfigTechReborn.CopperIngotsLoot){ generate(copperIngotLoot); } - if(config.TinIngotsLoot){ + if(ConfigTechReborn.TinIngotsLoot){ generate(tinIngotLoot); } - if(config.SteelIngotsLoot){ + if(ConfigTechReborn.SteelIngotsLoot){ generate(steelIngotLoot); } } diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index e7659e158..4c7ec9b29 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -8,8 +8,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import reborncore.api.IListInfoProvider; -import techreborn.Core; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/items/ItemLithiumBattery.java b/src/main/java/techreborn/items/ItemLithiumBattery.java index c8a90dc43..1c09c7b81 100644 --- a/src/main/java/techreborn/items/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/ItemLithiumBattery.java @@ -1,15 +1,15 @@ package techreborn.items; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import techreborn.client.TechRebornCreativeTab; import reborncore.common.powerSystem.PoweredItem; +import techreborn.client.TechRebornCreativeTab; + +import java.util.List; public class ItemLithiumBattery extends ItemTextureBase implements IEnergyItemInfo { diff --git a/src/main/java/techreborn/items/ItemReBattery.java b/src/main/java/techreborn/items/ItemReBattery.java index 938d6c873..8a4ef54bf 100644 --- a/src/main/java/techreborn/items/ItemReBattery.java +++ b/src/main/java/techreborn/items/ItemReBattery.java @@ -1,15 +1,15 @@ package techreborn.items; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; -import techreborn.client.TechRebornCreativeTab; import reborncore.common.powerSystem.PoweredItem; +import techreborn.client.TechRebornCreativeTab; + +import java.util.List; public class ItemReBattery extends ItemTextureBase implements IEnergyItemInfo { diff --git a/src/main/java/techreborn/items/ItemUUmatter.java b/src/main/java/techreborn/items/ItemUUmatter.java index 085a40a24..2ebf928dd 100644 --- a/src/main/java/techreborn/items/ItemUUmatter.java +++ b/src/main/java/techreborn/items/ItemUUmatter.java @@ -1,6 +1,5 @@ package techreborn.items; -import net.minecraft.item.Item; import techreborn.client.TechRebornCreativeTabMisc; public class ItemUUmatter extends ItemTextureBase { diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 5463216f2..d5a1bae99 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -11,9 +11,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index fe48e5b03..4796baeb2 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -10,9 +10,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 87f269eda..9853ca455 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -16,11 +16,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.util.TorchHelper; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; +import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index b7adaff57..f15b88488 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -10,10 +10,10 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.items.ItemTextureBase; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 1259ac34c..2f5f9e78a 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -16,11 +16,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.util.TorchHelper; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; +import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index ed3b8d903..34d0b3f76 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -16,11 +16,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.util.TorchHelper; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; +import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 8a9478e43..34f04b84a 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -17,11 +17,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.util.TorchHelper; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; +import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 444ec7f4f..4ab9652a6 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -13,11 +13,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.util.Color; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PoweredItem; +import reborncore.common.util.Color; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; -import reborncore.common.powerSystem.PoweredItem; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemTechPda.java b/src/main/java/techreborn/items/tools/ItemTechPda.java index 0d38378c7..943d6e31b 100644 --- a/src/main/java/techreborn/items/tools/ItemTechPda.java +++ b/src/main/java/techreborn/items/tools/ItemTechPda.java @@ -1,7 +1,6 @@ package techreborn.items.tools; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import techreborn.Core; diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index 1596557e1..b8ee76803 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -1,18 +1,11 @@ package techreborn.items.tools; -import java.util.List; - import me.modmuss50.jsonDestroyer.api.ITexturedItem; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; -import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; public class ItemTreeTap extends Item implements ITexturedItem { diff --git a/src/main/java/techreborn/pda/pages/CraftingInfoPage.java b/src/main/java/techreborn/pda/pages/CraftingInfoPage.java index 46e0434eb..ca132c0dd 100644 --- a/src/main/java/techreborn/pda/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/pda/pages/CraftingInfoPage.java @@ -8,7 +8,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.*; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 4e93cbe87..f456e4a5e 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -3,11 +3,7 @@ package techreborn.proxies; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import reborncore.client.multiblock.MultiblockRenderEvent; -import techreborn.client.ClientMultiBlocks; -import techreborn.client.IconSupplier; -import techreborn.client.RegisterItemJsons; -import techreborn.client.StackToolTipEvent; -import techreborn.client.VersionCheckerClient; +import techreborn.client.*; import techreborn.client.hud.ChargeHud; import techreborn.client.keybindings.KeyBindings; diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index baf66e77f..e798de58c 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -5,10 +5,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileAesu extends TilePowerAcceptor implements IWrenchable { diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index 858316c67..c9ed28385 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.api.upgrade.UpgradeHandler; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 58af6d66b..2c0cc5d90 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index 78abe7a4d..fe215597e 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -15,6 +15,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import reborncore.common.misc.Location; import reborncore.common.multiblock.IMultiblockPart; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.blocks.BlockMachineCasing; @@ -22,7 +23,6 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.Reference; import techreborn.multiblocks.MultiBlockCasing; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 8e471ca12..1d410e6f2 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -9,12 +9,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import reborncore.api.IListInfoProvider; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; import java.util.List; diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index d1a63f978..f26b51967 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import reborncore.common.util.Inventory; import reborncore.api.power.IEnergyInterfaceItem; -import techreborn.init.ModBlocks; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.util.Inventory; +import techreborn.init.ModBlocks; public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 965967037..372910c5d 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 15b6339b5..3d5a21d4c 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -6,9 +6,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, IInventory { diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index 795527002..bb7dc4e13 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -11,12 +11,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import reborncore.common.misc.Location; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.blocks.BlockMachineCasing; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 69460a110..c5b75bcae 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java index 9dffd99a6..d2302aec6 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/TileIndustrialGrinder.java @@ -11,6 +11,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; @@ -19,7 +20,6 @@ import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.init.ModFluids; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory, ISidedInventory { public static final int TANK_CAPACITY = 16000; diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index aab1ee5c7..17ac88830 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -13,6 +13,7 @@ import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; import reborncore.api.IListInfoProvider; import reborncore.common.misc.Location; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; @@ -21,7 +22,6 @@ import techreborn.blocks.BlockMachineCasing; import techreborn.init.ModBlocks; import techreborn.init.ModFluids; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory, ISidedInventory, IListInfoProvider { public static final int TANK_CAPACITY = 16000; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 1cc099c7e..c123797c3 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; import techreborn.init.ModItems; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 6e882f0db..69e56d18d 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.api.RollingMachineRecipe; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; //TODO add tick and power bars. public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable, IInventory { diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/TileThermalGenerator.java index d95075165..96d2c2ad3 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/TileThermalGenerator.java @@ -13,12 +13,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/TileVacuumFreezer.java index 2efda80ad..01227a621 100644 --- a/src/main/java/techreborn/tiles/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/TileVacuumFreezer.java @@ -9,12 +9,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.blocks.BlockMachineCasing; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, IInventory { diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index b645eeecb..109387b7d 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -7,12 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileEntityFusionController extends TilePowerAcceptor implements IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 4f86c3470..cd1618315 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -12,12 +12,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; import reborncore.api.fuel.FluidPowerManager; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index c961de9f1..6efcba5a7 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -9,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index c360acffc..1ef7fb063 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -11,12 +11,12 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 16da99224..1a41709f9 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -7,18 +7,14 @@ 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.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; +import net.minecraft.item.*; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fml.common.registry.GameRegistry; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventory { diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index acd3f46d2..60b3adfd5 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -6,9 +6,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable { diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index c6a4f6f0f..bfd14a875 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -11,12 +11,12 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraftforge.fluids.*; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index b90dabb90..72e030da2 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -5,9 +5,9 @@ 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; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileIDSU extends TilePowerAcceptor { diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 36ae209fb..a981b7113 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -3,9 +3,9 @@ package techreborn.tiles.lesu; 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 reborncore.common.powerSystem.TilePowerAcceptor; import java.util.ArrayList; diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index e810f627a..a624e8f30 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory{ diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 54c23b71c..f7f4be240 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -5,13 +5,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.init.ModBlocks; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory{ diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index bb62cc730..f370467a8 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory{ diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 2f58bca97..4abe16445 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; import techreborn.api.recipe.RecipeCrafter; import techreborn.init.ModBlocks; import techreborn.lib.Reference; -import reborncore.common.powerSystem.TilePowerAcceptor; public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory{ diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index ec0f151e9..99d59eb24 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -1,7 +1,6 @@ package techreborn.world; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/techreborn/world/TreeGenerator.java b/src/main/java/techreborn/world/TreeGenerator.java index 7e69277e2..0fdeb3e74 100644 --- a/src/main/java/techreborn/world/TreeGenerator.java +++ b/src/main/java/techreborn/world/TreeGenerator.java @@ -15,13 +15,11 @@ import java.util.Random; */ public class TreeGenerator implements IWorldGenerator { - public static ConfigTechReborn config; - public static RubberTreeGenerator treeGenerator = new RubberTreeGenerator(); @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if (config.RubberTreeGen) { + if (ConfigTechReborn.RubberTreeGen) { int chance = 75; boolean isValidSpawn = false; BiomeGenBase biomeGenBase = world.getBiomeGenForCoords(new BlockPos(chunkX * 16, 72, chunkZ * 16));