diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 470ebf78a..5081ff024 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,10 +1,7 @@ package techreborn; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; +import java.io.File; + import techreborn.client.GuiHandler; import techreborn.compat.CompatManager; import techreborn.config.ConfigTechReborn; @@ -15,8 +12,11 @@ import techreborn.lib.ModInfo; import techreborn.packets.PacketHandler; import techreborn.util.LogHelper; import techreborn.world.TROreGen; - -import java.io.File; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES, guiFactory = ModInfo.GUI_FACTORY_CLASS) public class Core { diff --git a/src/main/java/techreborn/api/TechRebornAPI.java b/src/main/java/techreborn/api/TechRebornAPI.java index a812d5cca..8bedfdcf1 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -1,9 +1,9 @@ package techreborn.api; -import techreborn.util.ItemUtils; - import java.util.ArrayList; +import techreborn.util.ItemUtils; + public final class TechRebornAPI { public static ArrayList centrifugeRecipies = new ArrayList(); diff --git a/src/main/java/techreborn/api/package-info.java b/src/main/java/techreborn/api/package-info.java index 67bd64d1b..530d64a27 100644 --- a/src/main/java/techreborn/api/package-info.java +++ b/src/main/java/techreborn/api/package-info.java @@ -2,4 +2,4 @@ @API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") package techreborn.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 623c1bae8..5739ed3fc 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -1,7 +1,8 @@ package techreborn.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,9 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import techreborn.client.TechRebornCreativeTab; - -import java.util.List; -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockOre extends Block{ diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 6f9f547e4..7c4a4f039 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -1,7 +1,5 @@ package techreborn.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +10,8 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileQuantumChest; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockQuantumChest extends BlockContainer { diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 38e8d4328..80ad40f83 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -1,7 +1,5 @@ package techreborn.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +10,8 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileQuantumTank; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockQuantumTank extends BlockContainer { diff --git a/src/main/java/techreborn/blocks/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/BlockThermalGenerator.java index 5cc695765..f04b9b4af 100644 --- a/src/main/java/techreborn/blocks/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/BlockThermalGenerator.java @@ -1,7 +1,7 @@ package techreborn.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,8 +14,8 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileThermalGenerator; - -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockThermalGenerator extends BlockContainer { diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 53d9abc7a..2f83ad445 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -1,7 +1,6 @@ package techreborn.client; -import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import techreborn.client.container.ContainerQuantumChest; @@ -13,6 +12,7 @@ import techreborn.client.gui.GuiThermalGenerator; import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileThermalGenerator; +import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/techreborn/client/container/TechRebornContainer.java b/src/main/java/techreborn/client/container/TechRebornContainer.java index 8ed927162..b4e290c9e 100644 --- a/src/main/java/techreborn/client/container/TechRebornContainer.java +++ b/src/main/java/techreborn/client/container/TechRebornContainer.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import techreborn.client.SlotFake; -import techreborn.util.FluidUtils; import techreborn.util.ItemUtils; diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 501ed9815..e42ae0acb 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -1,8 +1,8 @@ package techreborn.compat; +import techreborn.compat.waila.CompatModuleWaila; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; -import techreborn.compat.waila.CompatModuleWaila; public class CompatManager { diff --git a/src/main/java/techreborn/compat/waila/CompatModuleWaila.java b/src/main/java/techreborn/compat/waila/CompatModuleWaila.java index f2dc20330..a70677a50 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 cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; import mcp.mobius.waila.api.IWailaRegistrar; import techreborn.tiles.TileMachineBase; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; public class CompatModuleWaila { diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 1dd27355a..e3966e76c 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,9 +1,9 @@ package techreborn.config; -import net.minecraftforge.common.config.Configuration; - import java.io.File; +import net.minecraftforge.common.config.Configuration; + public class ConfigTechReborn { private static ConfigTechReborn instance = null; public static String CATEGORY_WORLD = "world"; diff --git a/src/main/java/techreborn/config/TechRebornConfigGui.java b/src/main/java/techreborn/config/TechRebornConfigGui.java index 1f36c0d19..2f09cd523 100644 --- a/src/main/java/techreborn/config/TechRebornConfigGui.java +++ b/src/main/java/techreborn/config/TechRebornConfigGui.java @@ -1,16 +1,16 @@ package techreborn.config; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.config.DummyConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.GuiConfigEntries; import cpw.mods.fml.client.config.GuiConfigEntries.CategoryEntry; import cpw.mods.fml.client.config.IConfigElement; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import net.minecraftforge.common.config.Configuration; - -import java.util.ArrayList; -import java.util.List; public class TechRebornConfigGui extends GuiConfig{ public TechRebornConfigGui(GuiScreen top) diff --git a/src/main/java/techreborn/config/TechRebornGUIFactory.java b/src/main/java/techreborn/config/TechRebornGUIFactory.java index bbd4813d4..eafc7e6fa 100644 --- a/src/main/java/techreborn/config/TechRebornGUIFactory.java +++ b/src/main/java/techreborn/config/TechRebornGUIFactory.java @@ -1,10 +1,10 @@ package techreborn.config; -import cpw.mods.fml.client.IModGuiFactory; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; - -import java.util.Set; +import cpw.mods.fml.client.IModGuiFactory; public class TechRebornGUIFactory implements IModGuiFactory{ @Override diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index cb1b14930..b6f685c06 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -1,6 +1,5 @@ package techreborn.init; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -9,6 +8,7 @@ import techreborn.items.ItemGems; import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.util.LogHelper; +import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 047c9b70e..9d5670d5b 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -1,21 +1,17 @@ package techreborn.init; -import cpw.mods.fml.common.registry.GameRegistry; import ic2.api.item.IC2Items; -import ic2.core.Ic2Items; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import techreborn.api.CentrifugeRecipie; import techreborn.api.TechRebornAPI; import techreborn.util.CraftingHelper; import techreborn.util.LogHelper; import techreborn.util.RecipeRemover; +import cpw.mods.fml.common.registry.GameRegistry; public class ModRecipes { - - public static Item dustIron; - + public static void init() { removeIc2Recipes(); @@ -30,6 +26,8 @@ public class ModRecipes { RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill")); + RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel")); + LogHelper.info("IC2 Recipes Removed"); @@ -43,17 +41,20 @@ public class ModRecipes { 'H', IC2Items.getItem("reinforcedGlass"), 'C', IC2Items.getItem("electronicCircuit"), 'G', IC2Items.getItem("geothermalGenerator")}); + CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"), new Object[]{"FDF", "DMD", "FCF", 'F', Items.flint, 'D', Items.diamond, 'M', IC2Items.getItem("machine"), 'C', IC2Items.getItem("electronicCircuit")}); + CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"), new Object[]{" S ", "SCS", "SBS", 'S', "ingotSteel", 'B', IC2Items.getItem("reBattery"), 'C', IC2Items.getItem("electronicCircuit")}); + CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"), new Object[]{" D ", "DBD", "TCT", 'D', "gemDiamond", @@ -61,8 +62,68 @@ public class ModRecipes { 'B', IC2Items.getItem("miningDrill"), 'C', IC2Items.getItem("advancedCircuit")}); + CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"), + new Object[]{"PPP", "SZS", "CGC", + 'P', "paneGlass", + 'S', new ItemStack(ModItems.parts,1,1), + 'Z', IC2Items.getItem("carbonPlate"), + 'G', IC2Items.getItem("generator"), + 'C', IC2Items.getItem("electronicCircuit")}); + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,4,6), + new Object[]{"EEE", "EAE", "EEE", + 'E', "gemEmerald", + 'A', IC2Items.getItem("electronicCircuit")}); + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,7), + new Object[]{"AGA", "RPB", "ASA", + 'A', "ingotAluminium", + 'G', "dyeGreen", + 'R', "dyeRed", + 'P', "paneGlass", + 'B', "dyeBlue", + 'S', Items.glowstone_dust,}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,4,8), + new Object[]{"DSD", "S S", "DSD", + 'D', "dustDiamond", + 'S', "ingotSteel"}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,16,13), + new Object[]{"CSC", "SCS", "CSC", + 'S', "ingotSteel", + 'C', IC2Items.getItem("electronicCircuit")}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,2,14), + new Object[]{"TST", "SBS", "TST", + 'S', "ingotSteel", + 'T', "ingotTungsten", + 'C', "blockSteel"}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,15), + new Object[]{"AAA", "AMA", "AAA", + 'A', "ingotAluminium", + 'M', new ItemStack(ModItems.parts,1,13)}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,16), + new Object[]{"AAA", "AMA", "AAA", + 'A', "ingotBronze", + 'M', new ItemStack(ModItems.parts,1,13)}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,17), + new Object[]{"AAA", "AMA", "AAA", + 'A', "ingotSteel", + 'M', new ItemStack(ModItems.parts,1,13)}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,18), + new Object[]{"AAA", "AMA", "AAA", + 'A', "ingotTitanium", + 'M', new ItemStack(ModItems.parts,1,13)}); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts,1,19), + new Object[]{"AAA", "AMA", "AAA", + 'A', "ingotBrass", + 'M', new ItemStack(ModItems.parts,1,13)}); LogHelper.info("Shapped Recipes Added"); } diff --git a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java index 5b6409db4..ba0879ce3 100644 --- a/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java +++ b/src/main/java/techreborn/itemblocks/ItemBlockQuantumChest.java @@ -1,7 +1,7 @@ package techreborn.itemblocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import techreborn.init.ModBlocks; import techreborn.tiles.TileQuantumChest; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockQuantumChest extends ItemBlock { diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index d79186917..bf0673748 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemDusts extends ItemTR { public static final String[] types = new String[] diff --git a/src/main/java/techreborn/items/ItemGems.java b/src/main/java/techreborn/items/ItemGems.java index 0676acef4..f4841ce4f 100644 --- a/src/main/java/techreborn/items/ItemGems.java +++ b/src/main/java/techreborn/items/ItemGems.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemGems extends Item{ public static final String[] types = new String[] { diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index a4c5e2d2a..97f62669b 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemIngots extends Item{ public static final String[] types = new String[] { diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 07b2b9396..d04c63a9a 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -1,5 +1,7 @@ package techreborn.items; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import techreborn.client.TechRebornCreativeTab; -import java.util.List; - public class ItemParts extends Item{ public static final String[] types = new String[] { diff --git a/src/main/java/techreborn/packets/PacketHandler.java b/src/main/java/techreborn/packets/PacketHandler.java index 759499e8d..d2592aa1b 100644 --- a/src/main/java/techreborn/packets/PacketHandler.java +++ b/src/main/java/techreborn/packets/PacketHandler.java @@ -1,20 +1,21 @@ package techreborn.packets; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.Packet; -import net.minecraft.world.World; import java.io.IOException; import java.util.EnumMap; import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.relauncher.Side; + public class PacketHandler extends FMLIndexedMessageToMessageCodec { private static EnumMap channels; diff --git a/src/main/java/techreborn/packets/SimplePacket.java b/src/main/java/techreborn/packets/SimplePacket.java index 6d9ae96cb..e315e1e95 100644 --- a/src/main/java/techreborn/packets/SimplePacket.java +++ b/src/main/java/techreborn/packets/SimplePacket.java @@ -1,7 +1,9 @@ package techreborn.packets; -import com.google.common.base.Charsets; import io.netty.buffer.ByteBuf; + +import java.io.IOException; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -9,7 +11,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import java.io.IOException; +import com.google.common.base.Charsets; public abstract class SimplePacket { protected EntityPlayer player; diff --git a/src/main/java/techreborn/tiles/TileMachineBase.java b/src/main/java/techreborn/tiles/TileMachineBase.java index c15de2f3c..bbf75023f 100644 --- a/src/main/java/techreborn/tiles/TileMachineBase.java +++ b/src/main/java/techreborn/tiles/TileMachineBase.java @@ -1,11 +1,11 @@ package techreborn.tiles; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.tileentity.TileEntity; import techreborn.packets.PacketHandler; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileMachineBase extends TileEntity { diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index eec651d02..78158357e 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -1,6 +1,9 @@ package techreborn.tiles; import ic2.api.tile.IWrenchable; + +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -8,14 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import techreborn.init.ModBlocks; -import techreborn.util.FluidUtils; import techreborn.util.Inventory; import techreborn.util.ItemUtils; -import java.util.List; - public class TileQuantumChest extends TileMachineBase implements IInventory ,IWrenchable{ diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index a5a33c75b..79601545e 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -1,7 +1,9 @@ package techreborn.tiles; import ic2.api.tile.IWrenchable; -import io.netty.channel.ChannelHandler; + +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -9,20 +11,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import techreborn.init.ModBlocks; -import techreborn.packets.PacketHandler; import techreborn.util.FluidUtils; import techreborn.util.Inventory; import techreborn.util.Tank; -import java.util.List; - public class TileQuantumTank extends TileMachineBase implements IFluidHandler, IInventory, IWrenchable { public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this); diff --git a/src/main/java/techreborn/util/FluidUtils.java b/src/main/java/techreborn/util/FluidUtils.java index bb0ad14fb..599e0bda4 100644 --- a/src/main/java/techreborn/util/FluidUtils.java +++ b/src/main/java/techreborn/util/FluidUtils.java @@ -1,14 +1,12 @@ package techreborn.util; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.oredict.OreDictionary; public class FluidUtils { diff --git a/src/main/java/techreborn/util/LogHelper.java b/src/main/java/techreborn/util/LogHelper.java index 29bf3be18..af36dbf68 100644 --- a/src/main/java/techreborn/util/LogHelper.java +++ b/src/main/java/techreborn/util/LogHelper.java @@ -1,8 +1,9 @@ package techreborn.util; -import cpw.mods.fml.common.FMLLog; import org.apache.logging.log4j.Level; + import techreborn.lib.ModInfo; +import cpw.mods.fml.common.FMLLog; public class LogHelper { diff --git a/src/main/java/techreborn/util/RecipeRemover.java b/src/main/java/techreborn/util/RecipeRemover.java index fabd30f46..05953b57d 100644 --- a/src/main/java/techreborn/util/RecipeRemover.java +++ b/src/main/java/techreborn/util/RecipeRemover.java @@ -1,12 +1,12 @@ package techreborn.util; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; -import java.util.List; - public class RecipeRemover { public static void removeShapedRecipes(List removelist) diff --git a/src/main/java/techreborn/world/TROreGen.java b/src/main/java/techreborn/world/TROreGen.java index d66efa746..b07361522 100644 --- a/src/main/java/techreborn/world/TROreGen.java +++ b/src/main/java/techreborn/world/TROreGen.java @@ -1,6 +1,7 @@ package techreborn.world; -import cpw.mods.fml.common.IWorldGenerator; +import java.util.Random; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -8,8 +9,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.LogHelper; - -import java.util.Random; +import cpw.mods.fml.common.IWorldGenerator; public class TROreGen implements IWorldGenerator{ public static ConfigTechReborn config; diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 834d85218..06fb1dbc7 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -125,4 +125,5 @@ item.techreborn.part.AluminiumMachineHull.name=Aluminium Machine Hull item.techreborn.part.BronzeMachineHull.name=Bronze Machine Hull item.techreborn.part.SteelMachineHull.name=Steel Machine Hull item.techreborn.part.TitaniumMachineHull.name=Titanium Machine Hull +item.techreborn.part.BrassMachineHull.name=Brass Machine Hull