From b13d282bf10ff65adcf854c934333a6b4f144f5a Mon Sep 17 00:00:00 2001 From: drcrazy Date: Sat, 9 Sep 2017 01:54:43 +0300 Subject: [PATCH] Fix unused imports --- src/main/java/techreborn/api/Reference.java | 36 +++++----- .../techreborn/api/RollingMachineRecipe.java | 2 +- .../java/techreborn/blocks/BlockStorage.java | 2 +- .../BlockDistillationTower.java | 1 - .../BlockImplosionCompressor.java | 6 -- .../BlockIndustrialBlastFurnace.java | 6 -- .../BlockIndustrialCentrifuge.java | 6 -- .../BlockIndustrialElectrolyzer.java | 6 -- .../BlockIndustrialGrinder.java | 6 -- .../BlockIndustrialSawmill.java | 6 -- .../generator/BlockDieselGenerator.java | 6 -- .../generator/BlockDragonEggSyphon.java | 13 ---- .../blocks/generator/BlockGasTurbine.java | 6 -- .../blocks/generator/BlockLightningRod.java | 1 - .../generator/BlockMagicEnergyAbsorber.java | 1 - .../generator/BlockMagicEnergyConverter.java | 1 - .../generator/BlockPlasmaGenerator.java | 1 - .../generator/BlockSemiFluidGenerator.java | 6 -- .../generator/BlockSolidFuelGenerator.java | 6 -- .../generator/BlockThermalGenerator.java | 6 -- .../blocks/generator/BlockWindMill.java | 1 - .../iron_machines/BlockIronAlloyFurnace.java | 4 -- .../iron_machines/BlockIronFurnace.java | 3 - .../machine/BlockAssemblingMachine.java | 6 -- .../blocks/machine/BlockChargeOMat.java | 6 -- .../blocks/machine/BlockChemicalReactor.java | 6 -- .../blocks/machine/BlockChunkLoader.java | 6 -- .../blocks/machine/BlockMatterFabricator.java | 6 -- .../blocks/machine/BlockRollingMachine.java | 6 -- .../blocks/machine/BlockScrapboxinator.java | 6 -- .../blocks/machine/BlockVacuumFreezer.java | 6 -- .../ContainerTileInventoryBuilder.java | 2 - .../compat/crafttweaker/CTRollingMachine.java | 68 +------------------ src/main/java/techreborn/items/ItemDusts.java | 2 +- 34 files changed, 24 insertions(+), 228 deletions(-) diff --git a/src/main/java/techreborn/api/Reference.java b/src/main/java/techreborn/api/Reference.java index 9243d23bd..29a300ece 100644 --- a/src/main/java/techreborn/api/Reference.java +++ b/src/main/java/techreborn/api/Reference.java @@ -28,7 +28,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.util.SoundEvent; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import net.minecraftforge.common.util.EnumHelper; /** @@ -67,22 +67,22 @@ public class Reference { return ArmorMaterial.LEATHER; } - public static String alloySmelterRecipe = I18n.translateToLocal("techreborn.recipe.alloysmelter"); - public static String assemblingMachineRecipe = I18n.translateToLocal("techreborn.recipe.assemblingmachine"); - public static String blastFurnaceRecipe = I18n.translateToLocal("techreborn.recipe.blastfurnace"); - public static String centrifugeRecipe = I18n.translateToLocal("techreborn.recipe.centrifuge"); - public static String chemicalReactorRecipe = I18n.translateToLocal("techreborn.recipe.chemicalReactor"); - public static String industrialGrinderRecipe = I18n.translateToLocal("techreborn.recipe.grinder"); - public static String implosionCompressorRecipe = I18n.translateToLocal("techreborn.recipe.implosioncompressor"); + public static String alloySmelterRecipe = I18n.format("techreborn.recipe.alloysmelter"); + public static String assemblingMachineRecipe = I18n.format("techreborn.recipe.assemblingmachine"); + public static String blastFurnaceRecipe = I18n.format("techreborn.recipe.blastfurnace"); + public static String centrifugeRecipe = I18n.format("techreborn.recipe.centrifuge"); + public static String chemicalReactorRecipe = I18n.format("techreborn.recipe.chemicalReactor"); + public static String industrialGrinderRecipe = I18n.format("techreborn.recipe.grinder"); + public static String implosionCompressorRecipe = I18n.format("techreborn.recipe.implosioncompressor"); public static String industrialElectrolyzerRecipe = I18n - .translateToLocal("techreborn.recipe.industrialelectrolyzer"); - public static String industrialSawmillRecipe = I18n.translateToLocal("techreborn.recipe.industrialsawmill"); - public static String latheRecipe = I18n.translateToLocal("techreborn.recipe.lathe"); - public static String plateCuttingMachineRecipe = I18n.translateToLocal("techreborn.recipe.platecuttingmachine"); - public static String vacuumFreezerRecipe = I18n.translateToLocal("tile.techreborn.vacuumfreezer.name"); - public static String grinderRecipe = I18n.translateToLocal("tile.techreborn.grinder.name"); - public static String extractorRecipe = I18n.translateToLocal("tile.techreborn.extractor.name"); - public static String compressorRecipe = I18n.translateToLocal("tile.techreborn.compressor.name"); - public static String recyclerRecipe = I18n.translateToLocal("tile.techreborn.recycler.name"); - public static String scrapboxRecipe = I18n.translateToLocal("techreborn.recipe.scrapbox"); + .format("techreborn.recipe.industrialelectrolyzer"); + public static String industrialSawmillRecipe = I18n.format("techreborn.recipe.industrialsawmill"); + public static String latheRecipe = I18n.format("techreborn.recipe.lathe"); + public static String plateCuttingMachineRecipe = I18n.format("techreborn.recipe.platecuttingmachine"); + public static String vacuumFreezerRecipe = I18n.format("tile.techreborn.vacuumfreezer.name"); + public static String grinderRecipe = I18n.format("tile.techreborn.grinder.name"); + public static String extractorRecipe = I18n.format("tile.techreborn.extractor.name"); + public static String compressorRecipe = I18n.format("tile.techreborn.compressor.name"); + public static String recyclerRecipe = I18n.format("tile.techreborn.recycler.name"); + public static String scrapboxRecipe = I18n.format("techreborn.recipe.scrapbox"); } diff --git a/src/main/java/techreborn/api/RollingMachineRecipe.java b/src/main/java/techreborn/api/RollingMachineRecipe.java index 3674ed776..8a893e235 100644 --- a/src/main/java/techreborn/api/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/RollingMachineRecipe.java @@ -86,7 +86,7 @@ public class RollingMachineRecipe { s = (new StringBuilder()).append(s).append(s1).toString(); } } - HashMap hashmap = new HashMap(); + HashMap hashmap = new HashMap(); for (; i < components.length; i += 2) { Character character = (Character) components[i]; ItemStack itemstack1 = null; diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 9fefdc472..8443ae984 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -85,7 +85,7 @@ public class BlockStorage extends BaseBlock { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { + public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { for (int meta = 0; meta < types.length; meta++) { list.add(new ItemStack(this, 1, meta)); } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java index 41d0a3397..5e4d7389a 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java @@ -28,7 +28,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java index bb4caed5d..7eed4c749 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java index 7a9a3626a..3f52b9187 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java index 165271367..377e8a1e9 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java index 312e77ef8..415b4e1ab 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java index bc5d7c550..a475592c5 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java index bbbe1ac81..a1a2e7ba7 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java @@ -24,18 +24,12 @@ package techreborn.blocks.advanced_machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index d4b867362..2601efe0b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -24,18 +24,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index c37a07ad8..1f44ef340 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -24,22 +24,16 @@ package techreborn.blocks.generator; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileDragonEggSyphon; -import java.util.List; - public class BlockDragonEggSyphon extends BlockMachineBase { public BlockDragonEggSyphon() { @@ -53,13 +47,6 @@ public class BlockDragonEggSyphon extends BlockMachineBase { return new TileDragonEggSyphon(); } - @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(TextFormatting.RED + "WIP Coming Soon"); - //TODO Finish Dragon Egg Siphoner and add recipe - //Remember to remove WIP override and imports once complete - } - @Override public IMachineGuiHandler getGui() { return null; diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index bfe935a61..abeee2a5a 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -24,18 +24,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 6a98b71ac..dea48d12e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -30,7 +30,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileLightningRod; diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index dbc2c7e30..9ce066525 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -34,7 +34,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 8806b0e80..41731f0d5 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -34,7 +34,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 2f398f520..b2be1b93d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -33,7 +33,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; public class BlockPlasmaGenerator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index b36ab5fbd..c6a2cbab3 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -24,18 +24,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index 06e7c006e..24d3bf0e2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -24,18 +24,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 2f34554fc..6b2615837 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -24,18 +24,12 @@ package techreborn.blocks.generator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index af5478f8e..e35660b53 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -30,7 +30,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWindMill; diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java index 9b65b06cd..7541b603b 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java @@ -25,11 +25,8 @@ package techreborn.blocks.iron_machines; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -37,7 +34,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index 43604fa6c..b0eedfbf8 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -25,11 +25,9 @@ package techreborn.blocks.iron_machines; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -40,7 +38,6 @@ import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 9e0d578cd..37eeb3617 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java b/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java index c6d80ac09..750ca925d 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 1fbfd34a1..108d7e2e3 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java index 740935415..67e7326ef 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 151470001..b19f8de4b 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 5afabca7c..9efe3b7d7 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java index 197d4a8cb..2ef83353a 100644 --- a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java @@ -24,21 +24,15 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 4a9328b28..34be0ef93 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -24,18 +24,12 @@ package techreborn.blocks.machine; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import techreborn.Core; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java index ff6de453b..8a896715c 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java @@ -86,7 +86,6 @@ public class ContainerTileInventoryBuilder { return this; } - @SuppressWarnings("null") public ContainerTileInventoryBuilder energySlot(final int index, final int x, final int y) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y) .setFilter(stack -> stack.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP) @@ -94,7 +93,6 @@ public class ContainerTileInventoryBuilder { return this; } - @SuppressWarnings("null") public ContainerTileInventoryBuilder fluidSlot(final int index, final int x, final int y) { this.parent.slots.add(new FilteredSlot(this.tile, index, x, y).setFilter( stack -> stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, EnumFacing.UP))); diff --git a/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java b/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java index 9506a6b78..96262a42c 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java @@ -24,11 +24,8 @@ package techreborn.compat.crafttweaker; -import crafttweaker.CraftTweakerAPI; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; -import crafttweaker.api.oredict.IOreDictEntry; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import reborncore.common.util.ItemUtils; @@ -66,67 +63,12 @@ public class CTRollingMachine { RollingMachineRecipe.instance.getRecipeList().remove(resourceLocation); } } - - public static ItemStack toStack(IItemStack iStack) { - if (iStack == null) - return null; - else { - Object internal = iStack.getInternal(); - if (internal == null || !(internal instanceof ItemStack)) { - CraftTweakerAPI.getLogger().logError("Not a valid item stack: " + iStack); - } - - return (ItemStack) internal; - } - } - - public static ItemStack[] toStacks(IItemStack[] iStack) { - if (iStack == null) - return null; - else { - ItemStack[] output = new ItemStack[iStack.length]; - for (int i = 0; i < iStack.length; i++) { - output[i] = toStack(iStack[i]); - } - - return output; - } - } - - public static Object toObject(IIngredient iStack) { - if (iStack == null) - return null; - else { - if (iStack instanceof IOreDictEntry) { - return toString((IOreDictEntry) iStack); - } else if (iStack instanceof IItemStack) { - return toStack((IItemStack) iStack); - } else - return null; - } - } - - public static Object[] toObjects(IIngredient[] ingredient) { - if (ingredient == null) - return null; - else { - Object[] output = new Object[ingredient.length]; - for (int i = 0; i < ingredient.length; i++) { - if (ingredient[i] != null) { - output[i] = toObject(ingredient[i]); - } else - output[i] = ""; - } - - return output; - } - } - + public static Object[] toShapedObjects(IIngredient[][] ingredients) { if (ingredients == null) return null; else { - ArrayList prep = new ArrayList(); + ArrayList prep = new ArrayList(); prep.add("abc"); prep.add("def"); prep.add("ghi"); @@ -136,7 +78,7 @@ public class CTRollingMachine { for (int y = 0; y < ingredients[x].length; y++) { if (ingredients[x][y] != null && x < map.length && y < map[x].length) { prep.add(map[x][y]); - prep.add(toObject(ingredients[x][y])); + prep.add(CraftTweakerCompat.toObject(ingredients[x][y])); } } } @@ -144,8 +86,4 @@ public class CTRollingMachine { return prep.toArray(); } } - - public static String toString(IOreDictEntry entry) { - return ((IOreDictEntry) entry).getName(); - } } diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index a6a59a691..39453ca9d 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -102,7 +102,7 @@ public class ItemDusts extends ItemTR { // Adds Dusts SubItems To Creative Tab @Override - public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { + public void getSubItems(CreativeTabs creativeTabs, NonNullList list) { if (!isInCreativeTab(creativeTabs)) { return; }