diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 688738e8..6c1382e0 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -1,47 +1,30 @@ package tconstruct; -import java.util.Map; -import java.util.Random; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import net.minecraft.world.gen.structure.MapGenStructureIO; -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.*; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.*; +import cpw.mods.fml.common.registry.*; import cpw.mods.fml.relauncher.Side; +import java.util.*; import mantle.pulsar.config.ForgeCFG; import mantle.pulsar.control.PulseManager; +import net.minecraft.world.gen.structure.MapGenStructureIO; +import net.minecraftforge.common.MinecraftForge; +import org.apache.logging.log4j.*; +import tconstruct.achievements.*; import tconstruct.api.TConstructAPI; import tconstruct.armor.TinkerArmor; -import tconstruct.armor.player.TPlayerHandler; -import tconstruct.armor.player.TPlayerStats; -import tconstruct.library.TConstructCreativeTab; +import tconstruct.armor.player.*; import tconstruct.common.TProxyCommon; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.Detailing; -import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.*; +import tconstruct.library.crafting.*; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.landmine.behavior.Behavior; import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; import tconstruct.plugins.ic2.TinkerIC2; -import tconstruct.plugins.imc.TinkerAE2; -import tconstruct.plugins.imc.TinkerBuildCraft; -import tconstruct.plugins.imc.TinkerMystcraft; -import tconstruct.plugins.imc.TinkerThaumcraft; +import tconstruct.plugins.imc.*; import tconstruct.plugins.mfr.TinkerMFR; import tconstruct.plugins.nei.TinkerNEI; import tconstruct.plugins.te4.TinkerTE4; @@ -49,8 +32,7 @@ import tconstruct.plugins.waila.TinkerWaila; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.util.EnvironmentChecks; -import tconstruct.util.config.DimensionBlacklist; -import tconstruct.util.config.PHConstruct; +import tconstruct.util.config.*; import tconstruct.util.network.PacketPipeline; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeIslandGen; @@ -63,8 +45,7 @@ import tconstruct.world.village.*; * @author mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "${version}", - dependencies = "required-after:Forge@[10.13,);required-after:Mantle;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") +@Mod(modid = "TConstruct", name = "TConstruct", version = "${version}", dependencies = "required-after:Forge@[10.13,);required-after:Mantle;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") public class TConstruct { public static final String modVersion = "${version}"; @@ -155,6 +136,11 @@ public class TConstruct pulsar.preInit(event); + if (PHConstruct.achievementsEnabled) + { + TAchievements.addDefaultAchievements(); + } + if (PHConstruct.addToVillages) { // adds to the villager spawner egg @@ -166,8 +152,8 @@ public class TConstruct MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure"); } - - TConstructAPI.PROP_NAME=TPlayerStats.PROP_NAME; + + TConstructAPI.PROP_NAME = TPlayerStats.PROP_NAME; } @EventHandler @@ -194,6 +180,12 @@ public class TConstruct proxy.initialize(); pulsar.postInit(event); + + if (PHConstruct.achievementsEnabled) + { + TAchievements.registerAchievementPane(); + MinecraftForge.EVENT_BUS.register(new AchievementEvents()); + } } public static LiquidCasting getTableCasting () diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java new file mode 100644 index 00000000..1e828e1c --- /dev/null +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -0,0 +1,76 @@ +package tconstruct.achievements; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.*; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.event.entity.living.*; +import tconstruct.items.tools.FryingPan; +import tconstruct.library.event.ToolCraftedEvent; +import tconstruct.library.tools.*; +import tconstruct.tools.logic.ToolForgeLogic; + +public class AchievementEvents +{ + @SubscribeEvent + public void toolCreate (ToolCraftedEvent event) + { + if (event.player != null) + { + TAchievements.triggerAchievement(event.player, "tconstruct.tinkerer"); + + if (event.tool != null && event.tool.getItem() instanceof Weapon) + { + TAchievements.triggerAchievement(event.player, "tconstruct.preparedFight"); + } + + if (event.inventory != null && event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) + { + TAchievements.triggerAchievement(event.player, "tconstruct.proTinkerer"); + } + } + } + + @SubscribeEvent + public void entitySlain (LivingDeathEvent event) + { + if (event.source != null && event.source.getEntity() instanceof EntityPlayer) + { + EntityPlayer murderer = (EntityPlayer) event.source.getEntity(); + + if (murderer.getHeldItem() != null && murderer.getHeldItem().getItem() instanceof Weapon) + { + TAchievements.triggerAchievement(murderer, "tconstruct.enemySlayer"); + } + } + } + + @SubscribeEvent + public void entityDrops (LivingDropsEvent event) + { + if (event.source.getEntity() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + + if (player.getHeldItem() != null && player.getHeldItem().getItem() instanceof FryingPan) + { + for (int i = 0; i < event.drops.size(); i++) + { + ItemStack is = event.drops.get(i).getEntityItem(); + if (FurnaceRecipes.smelting().getSmeltingResult(is) != null && FurnaceRecipes.smelting().getSmeltingResult(is).getItem() instanceof ItemFood) + { + NBTTagCompound stackCompound = is.getTagCompound(); + if (stackCompound == null) + { + stackCompound = new NBTTagCompound(); + } + + stackCompound.setBoolean("frypanKill", true); + is.setTagCompound(stackCompound); + } + } + } + } + } +} diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java new file mode 100644 index 00000000..4f25f5f4 --- /dev/null +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -0,0 +1,101 @@ +package tconstruct.achievements; + +import java.util.HashMap; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.AchievementPage; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.TinkerTools; +import tconstruct.util.config.PHConstruct; + +public class TAchievements +{ + + private static AchievementPage achievementsPage; + private static HashMap achievementsList = new HashMap(); + + /** + * Adds an achievement and registers it, so there is no need to call .registerStat + * @param name The name of the achievement + * @param achievement The achievement + */ + public static void addAchievement (String name, Achievement achievement) + { + if (!PHConstruct.achievementsEnabled) + { + return; + } + + achievementsList.put(name, achievement.registerStat()); + } + + /** + * Returns a registered achievement + * @param name The name of the achievement + * @return The achievement + */ + public static Achievement getAchievement (String name) + { + return achievementsList.get(name); + } + + /** + * Grants the achievement + * @param player The player that earned the achievement + * @param name The name of the achievement + */ + public static void triggerAchievement (EntityPlayer player, String name) + { + if (!PHConstruct.achievementsEnabled) + { + return; + } + + Achievement ach = getAchievement(name); + + if (ach != null) + { + player.triggerAchievement(ach); + } + } + + /** + * Adds all the achievements included in TConstruct, call before registerAchievementPane is called + */ + public static void addDefaultAchievements () + { + if (!PHConstruct.achievementsEnabled) + { + return; + } + + addAchievement("tconstruct.beginner", new Achievement("tconstruct.beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null).initIndependentStat()); + addAchievement("tconstruct.pattern", new Achievement("tconstruct.pattern", "tconstruct.pattern", 2, 1, TinkerTools.blankPattern, getAchievement("tconstruct.beginner"))); + addAchievement("tconstruct.tinkerer", new Achievement("tconstruct.tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TinkerTools.titleIcon, 1, 4096), getAchievement("tconstruct.pattern"))); + addAchievement("tconstruct.preparedFight", new Achievement("tconstruct.preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TinkerTools.titleIcon, 1, 4097), getAchievement("tconstruct.tinkerer"))); + addAchievement("tconstruct.proTinkerer", new Achievement("tconstruct.proTinkerer", "tconstruct.proTinkerer", 4, 3, new ItemStack(TinkerTools.titleIcon, 1, 4098), getAchievement("tconstruct.tinkerer"))); + addAchievement("tconstruct.smelteryMaker", new Achievement("tconstruct.smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TinkerSmeltery.smeltery, getAchievement("tconstruct.beginner"))); + addAchievement("tconstruct.enemySlayer", new Achievement("tconstruct.enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TinkerTools.titleIcon, 1, 4099), getAchievement("tconstruct.preparedFight"))); + addAchievement("tconstruct.dualConvenience", new Achievement("tconstruct.dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TinkerTools.titleIcon, 1, 4100), getAchievement("tconstruct.enemySlayer")).setSpecial()); + } + + /** + * Should be called after all the achievements are loaded (PostInit would be good) + */ + public static void registerAchievementPane () + { + if (!PHConstruct.achievementsEnabled) + { + return; + } + + Achievement[] achievements = new Achievement[achievementsList.size()]; + + achievements = achievementsList.values().toArray(achievements); + achievementsPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements); + AchievementPage.registerAchievementPage(achievementsPage); + } + +} diff --git a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java new file mode 100644 index 00000000..2e6abddd --- /dev/null +++ b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java @@ -0,0 +1,29 @@ +package tconstruct.achievements.items; + +import mantle.items.abstracts.CraftingItem; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import tconstruct.achievements.TAchievements; + +public class CraftAchievementItem extends CraftingItem +{ + public String grantedAchievement = ""; + + public CraftAchievementItem(String[] names, String[] tex, String folder, String modTexturePrefix, CreativeTabs tab, String tachievement) + { + super(names, tex, folder, modTexturePrefix, tab); + + grantedAchievement = tachievement; + } + + @Override + public void onCreated (ItemStack item, World world, EntityPlayer player) + { + if (grantedAchievement != null && !grantedAchievement.equals("")) + { + TAchievements.triggerAchievement(player, grantedAchievement); + } + } +} diff --git a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java index 8e9cd5e1..5ec58560 100644 --- a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java +++ b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java @@ -5,6 +5,7 @@ import net.minecraft.inventory.IInventory; public interface IPlayerExtendedInventoryWrapper { - public IInventory getKnapsackInventory(EntityPlayer player); - public IInventory getAccessoryInventory(EntityPlayer player); + public IInventory getKnapsackInventory (EntityPlayer player); + + public IInventory getAccessoryInventory (EntityPlayer player); } diff --git a/src/main/java/tconstruct/api/TConstructAPI.java b/src/main/java/tconstruct/api/TConstructAPI.java index 8d1dbcff..98cfb46f 100644 --- a/src/main/java/tconstruct/api/TConstructAPI.java +++ b/src/main/java/tconstruct/api/TConstructAPI.java @@ -6,8 +6,8 @@ public class TConstructAPI { public static String PROP_NAME; - public static IPlayerExtendedInventoryWrapper getInventoryWrapper(EntityPlayer player) + public static IPlayerExtendedInventoryWrapper getInventoryWrapper (EntityPlayer player) { - return (IPlayerExtendedInventoryWrapper) player.getExtendedProperties(PROP_NAME); + return (IPlayerExtendedInventoryWrapper) player.getExtendedProperties(PROP_NAME); } } diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index caea9471..c5dd2a56 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilities.java +++ b/src/main/java/tconstruct/armor/ArmorAbilities.java @@ -1,17 +1,15 @@ package tconstruct.armor; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import java.util.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.armor.items.TravelGear; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; public class ArmorAbilities { diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java index 52852d65..e3ac4bf7 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java +++ b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java @@ -1,5 +1,8 @@ package tconstruct.armor; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -7,9 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.armor.player.TPlayerStats; import tconstruct.client.ArmorControls; import tconstruct.library.modifier.IModifyable; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; public class ArmorAbilitiesClient { diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 8e85fb4d..feac3566 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -1,61 +1,39 @@ package tconstruct.armor; -import java.util.ArrayList; -import java.util.Random; - +import com.google.common.collect.Lists; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.*; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.settings.GameSettings; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.client.settings.*; +import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; +import net.minecraft.init.*; +import net.minecraft.item.*; +import net.minecraft.potion.*; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.client.GuiIngameForge; -import net.minecraftforge.client.event.FOVUpdateEvent; -import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.*; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; -import tconstruct.armor.gui.ArmorExtendedGui; -import tconstruct.armor.gui.KnapsackGui; +import tconstruct.armor.gui.*; import tconstruct.armor.items.TravelGear; -import tconstruct.armor.model.BeltModel; -import tconstruct.armor.model.BootBump; -import tconstruct.armor.model.HiddenPlayerModel; -import tconstruct.armor.model.WingModel; -import tconstruct.armor.player.ArmorExtended; -import tconstruct.armor.player.KnapsackInventory; -import tconstruct.client.ArmorControls; -import tconstruct.client.TKeyHandler; -import tconstruct.client.tabs.InventoryTabArmorExtended; -import tconstruct.client.tabs.InventoryTabKnapsack; -import tconstruct.client.tabs.InventoryTabVanilla; -import tconstruct.client.tabs.TabRegistry; +import tconstruct.armor.model.*; +import tconstruct.armor.player.*; +import tconstruct.client.*; +import tconstruct.client.tabs.*; import tconstruct.common.TProxyCommon; import tconstruct.library.accessory.IAccessoryModel; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.world.TinkerWorld; -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - public class ArmorProxyClient extends ArmorProxyCommon { public static WingModel wings = new WingModel(); @@ -76,7 +54,7 @@ public class ArmorProxyClient extends ArmorProxyCommon MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(new ArmorAbilitiesClient(mc, controlInstance)); } - + private void registerManualRecipes () { ItemStack feather = new ItemStack(Items.feather); @@ -85,17 +63,15 @@ public class ArmorProxyClient extends ArmorProxyCommon MantleClientRegistry.registerManualSmallRecipe("nightvision", goggles.copy(), new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot), null); ItemStack vest = TinkerArmor.travelVest.getDefaultItem(); - System.out.println("Travel Vest Item: "+vest); + System.out.println("Travel Vest Item: " + vest); MantleClientRegistry.registerManualIcon("travelvest", vest); MantleClientRegistry.registerManualSmallRecipe("dodge", vest.copy(), new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar), null); - MantleClientRegistry.registerManualSmallRecipe("stealth", vest.copy(), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0), - new ItemStack(Items.golden_carrot)); + MantleClientRegistry.registerManualSmallRecipe("stealth", vest.copy(), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot)); ItemStack wings = new ItemStack(TinkerArmor.travelWings); MantleClientRegistry.registerManualIcon("travelwings", wings); MantleClientRegistry.registerManualSmallRecipe("doublejump", wings.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston), null); - MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, feather, wings.copy(), feather, feather, - new ItemStack(Items.ender_pearl), feather); + MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, feather, wings.copy(), feather, feather, new ItemStack(Items.ender_pearl), feather); ItemStack boots = TinkerArmor.travelBoots.getDefaultItem(); MantleClientRegistry.registerManualIcon("travelboots", boots); @@ -187,7 +163,7 @@ public class ArmorProxyClient extends ArmorProxyCommon int updateCounter = 0; GameSettings gs = Minecraft.getMinecraft().gameSettings; - + @SubscribeEvent public void goggleZoom (FOVUpdateEvent event) { @@ -208,7 +184,7 @@ public class ArmorProxyClient extends ArmorProxyCommon public void renderHealthbar (RenderGameOverlayEvent.Pre event) { if (!Loader.isModLoaded("tukmc_Vz") || Loader.isModLoaded("borderlands"))// Loader check to avoid conflicting - // with a GUI mod (thanks Vazkii!) + // with a GUI mod (thanks Vazkii!) { if (event.type == ElementType.HEALTH) { diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 19bb2e39..502ae839 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -1,31 +1,30 @@ package tconstruct.armor; -import tconstruct.armor.inventory.ArmorExtendedContainer; -import tconstruct.armor.inventory.KnapsackContainer; -import tconstruct.armor.player.TPlayerStats; -import tconstruct.common.TProxyCommon; +import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; +import tconstruct.armor.inventory.*; +import tconstruct.armor.player.TPlayerStats; +import tconstruct.common.TProxyCommon; public class ArmorProxyCommon implements IGuiHandler { public static final int inventoryGui = 100; public static final int armorGuiID = 101; public static final int knapsackGuiID = 102; - - public void initialize() + + public void initialize () { registerGuiHandler(); } - - protected void registerGuiHandler() + + protected void registerGuiHandler () { TProxyCommon.registerServerGuiHandler(inventoryGui, this); TProxyCommon.registerServerGuiHandler(armorGuiID, this); TProxyCommon.registerServerGuiHandler(knapsackGuiID, this); } - + @Override public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -44,23 +43,24 @@ public class ArmorProxyCommon implements IGuiHandler TPlayerStats stats = TPlayerStats.get(player); return new KnapsackContainer(player.inventory, stats.knapsack); } - + return null; } + @Override public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { // TODO Auto-generated method stub return null; } - + public void registerTickHandler () { - + } public void registerKeys () { - + } } diff --git a/src/main/java/tconstruct/armor/ArmorTickHandler.java b/src/main/java/tconstruct/armor/ArmorTickHandler.java index 111907ea..34e3b3da 100644 --- a/src/main/java/tconstruct/armor/ArmorTickHandler.java +++ b/src/main/java/tconstruct/armor/ArmorTickHandler.java @@ -1,17 +1,16 @@ package tconstruct.armor; -import net.minecraft.client.Minecraft; -import tconstruct.client.ArmorControls; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import cpw.mods.fml.relauncher.*; +import net.minecraft.client.Minecraft; +import tconstruct.client.ArmorControls; public class ArmorTickHandler { Minecraft mc = Minecraft.getMinecraft(); - ArmorControls controlInstance = ((ArmorProxyClient)TinkerArmor.proxy).controlInstance; + ArmorControls controlInstance = ((ArmorProxyClient) TinkerArmor.proxy).controlInstance; @SideOnly(Side.CLIENT) @SubscribeEvent diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java index 51808563..f0f1b121 100644 --- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java +++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java @@ -1,15 +1,11 @@ package tconstruct.armor; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import tconstruct.armor.player.ArmorExtended; -import tconstruct.armor.player.TPlayerStats; +import net.minecraft.nbt.*; +import net.minecraft.potion.*; +import tconstruct.armor.player.*; public class PlayerAbilityHelper { @@ -46,7 +42,7 @@ public class PlayerAbilityHelper } hotbar.mainInventory[i] = null; } - + ItemStack belt = armor.inventory[3]; NBTTagList replaceSlots = belt.getTagCompound().getTagList("Inventory", 10); for (int i = 0; i < replaceSlots.tagCount(); ++i) @@ -61,14 +57,12 @@ public class PlayerAbilityHelper { hotbar.mainInventory[j] = itemstack; } - } + } } belt.getTagCompound().setTag("Inventory", slots); } - - - public static void setEntitySize(Entity entity, float width, float height) + public static void setEntitySize (Entity entity, float width, float height) { float f2; @@ -77,35 +71,35 @@ public class PlayerAbilityHelper f2 = entity.width; entity.width = width; entity.height = height; - entity.boundingBox.maxX = entity.boundingBox.minX + (double)entity.width; - entity.boundingBox.maxZ = entity.boundingBox.minZ + (double)entity.width; - entity.boundingBox.maxY = entity.boundingBox.minY + (double)entity.height; + entity.boundingBox.maxX = entity.boundingBox.minX + (double) entity.width; + entity.boundingBox.maxZ = entity.boundingBox.minZ + (double) entity.width; + entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height; - if (entity.width > f2 && !entity.worldObj.isRemote) + if (entity.width > f2 && !entity.worldObj.isRemote) { - entity.moveEntity((double)(f2 - entity.width), 0.0D, (double)(f2 - entity.width)); + entity.moveEntity((double) (f2 - entity.width), 0.0D, (double) (f2 - entity.width)); } } f2 = width % 2.0F; - if ((double)f2 < 0.375D) + if ((double) f2 < 0.375D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_1; } - else if ((double)f2 < 0.75D) + else if ((double) f2 < 0.75D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_2; } - else if ((double)f2 < 1.0D) + else if ((double) f2 < 1.0D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_3; } - else if ((double)f2 < 1.375D) + else if ((double) f2 < 1.375D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_4; } - else if ((double)f2 < 1.75D) + else if ((double) f2 < 1.75D) { entity.myEntitySize = Entity.EnumEntitySize.SIZE_5; } diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 5f2a938e..94abe48f 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -1,58 +1,33 @@ package tconstruct.armor; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import cpw.mods.fml.relauncher.Side; import java.util.EnumSet; - -import cpw.mods.fml.common.SidedProxy; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.ShapedOreRecipe; import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; -import tconstruct.armor.items.ArmorBasic; -import tconstruct.armor.items.DiamondApple; -import tconstruct.armor.items.HeartCanister; -import tconstruct.armor.items.Jerky; -import tconstruct.armor.items.Knapsack; -import tconstruct.armor.items.TravelBelt; -import tconstruct.armor.items.TravelGear; -import tconstruct.armor.items.TravelGlove; -import tconstruct.armor.items.TravelWings; +import tconstruct.armor.items.*; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.client.ArmorControls; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.armor.ArmorPart; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.ModifyBuilder; +import tconstruct.library.crafting.*; import tconstruct.modifiers.accessory.GloveSpeed; -import tconstruct.modifiers.armor.AModBoolean; -import tconstruct.modifiers.armor.AModInteger; -import tconstruct.modifiers.armor.AModLeadBoots; -import tconstruct.modifiers.armor.ActiveTinkerArmor; -import tconstruct.modifiers.armor.TravelModDoubleJump; -import tconstruct.modifiers.armor.TravelModRepair; +import tconstruct.modifiers.armor.*; import tconstruct.modifiers.tools.ModAttack; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import tconstruct.world.items.GoldenHead; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import cpw.mods.fml.relauncher.Side; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Armory", description = "Modifyable armors, such as the traveller's gear.") @@ -96,7 +71,7 @@ public class TinkerArmor { MinecraftForge.EVENT_BUS.register(new TinkerArmorEvents()); FMLCommonHandler.instance().bus().register(new ArmorAbilities()); - + if (event.getSide() == Side.CLIENT) { FMLCommonHandler.instance().bus().register(new ArmorControls()); @@ -199,15 +174,12 @@ public class TinkerArmor GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone)); GameRegistry.addRecipe(new ItemStack(TinkerArmor.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), new ItemStack(TinkerTools.materials, 1, 8), new ItemStack( - TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), new ItemStack(TinkerTools.materials, 1, 8), new ItemStack(TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1)); GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 1), new ItemStack(TinkerArmor.heartCanister, 1, 3)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.heartCanister, 1, 3), new ItemStack( - Items.golden_apple, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.heartCanister, 1, 3), new ItemStack(Items.golden_apple, 1, 1)); //GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), - 'm', "ingotGold")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', "ingotGold")); ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14); GameRegistry.addRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', aluBrass); // Drying Rack Recipes @@ -248,42 +220,32 @@ public class TinkerArmor ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); //Travel gear modifiers //MultiType - ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), - new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston) })); - ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), - new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston) })); + ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston) })); + ModifyBuilder.registerModifier(new TravelModDoubleJump(EnumSet.of(ArmorPart.Legs, ArmorPart.Feet), new ItemStack[] { new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston) })); ModifyBuilder.registerModifier(new TravelModRepair()); TConstructRegistry.registerActiveArmorMod(new ActiveTinkerArmor()); //Head - ModifyBuilder.registerModifier(new AModBoolean(0, "Night Vision", EnumSet.of(ArmorPart.Head), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), - new ItemStack(Items.golden_carrot) }, "\u00a78", "Night Vision")); + ModifyBuilder.registerModifier(new AModBoolean(0, "Night Vision", EnumSet.of(ArmorPart.Head), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot) }, "\u00a78", "Night Vision")); //Chest - ModifyBuilder.registerModifier(new AModInteger(0, "Perfect Dodge", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), - new ItemStack(Items.sugar) }, 1, "\u00a7d", "Perfect Dodge")); - ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), - new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth")); + ModifyBuilder.registerModifier(new AModInteger(0, "Perfect Dodge", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar) }, 1, "\u00a7d", "Perfect Dodge")); + ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth")); //Wings ItemStack feather = new ItemStack(Items.feather); - ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.ender_pearl), - feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); - ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Items.ender_pearl), - feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); + ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); + ModifyBuilder.registerModifier(new AModInteger(1, "Feather Fall", EnumSet.of(ArmorPart.Legs), new ItemStack[] { new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Items.ender_pearl), feather, feather, feather, feather, feather, feather }, 1, "\u00a7f", "Feather Fall")); //Feet - ModifyBuilder.registerModifier(new AModBoolean(1, "WaterWalk", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily) }, "\u00a79", - "Water-Walking")); + ModifyBuilder.registerModifier(new AModBoolean(1, "WaterWalk", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily) }, "\u00a79", "Water-Walking")); ModifyBuilder.registerModifier(new AModLeadBoots(new ItemStack[] { new ItemStack(Blocks.iron_block) })); - ModifyBuilder.registerModifier(new AModInteger(3, "Slimy Soles", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(TinkerWorld.slimePad, 1, 0), - new ItemStack(TinkerWorld.slimePad, 1, 0) }, 1, "\u00a7a", "Slimy Soles")); + ModifyBuilder.registerModifier(new AModInteger(3, "Slimy Soles", EnumSet.of(ArmorPart.Feet), new ItemStack[] { new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0) }, 1, "\u00a7a", "Slimy Soles")); //Glove ModifyBuilder.registerModifier(new GloveSpeed(1, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); //ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) })); - this.modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50, - "Accessory"); + this.modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50, "Accessory"); ModifyBuilder.registerModifier(this.modAttackGlove); } } diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index 50b6a8d4..690ddb4b 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -1,20 +1,18 @@ package tconstruct.armor; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.IBossDisplayData; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.boss.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.IMob; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; import tconstruct.TConstruct; import tconstruct.armor.items.TravelWings; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.world.entity.BlueSlime; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TinkerArmorEvents { diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index 2b87307f..0a3a4b12 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -1,27 +1,21 @@ package tconstruct.armor.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.TConstruct; import tconstruct.armor.modelblock.DryingRackRender; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class DryingRack extends InventoryBlock { diff --git a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java index 5edfdf3e..b8c41387 100644 --- a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java @@ -1,20 +1,14 @@ package tconstruct.armor.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.InventoryEffectRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.armor.inventory.ArmorExtendedContainer; import tconstruct.armor.player.ArmorExtended; -import tconstruct.client.tabs.InventoryTabArmorExtended; -import tconstruct.client.tabs.TabRegistry; +import tconstruct.client.tabs.*; public class ArmorExtendedGui extends InventoryEffectRenderer { diff --git a/src/main/java/tconstruct/armor/gui/KnapsackGui.java b/src/main/java/tconstruct/armor/gui/KnapsackGui.java index 66d0a4b7..b4927c4d 100644 --- a/src/main/java/tconstruct/armor/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/armor/gui/KnapsackGui.java @@ -2,15 +2,11 @@ package tconstruct.armor.gui; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - +import net.minecraft.util.*; import org.lwjgl.opengl.GL11; - import tconstruct.armor.inventory.KnapsackContainer; import tconstruct.armor.player.KnapsackInventory; -import tconstruct.client.tabs.InventoryTabKnapsack; -import tconstruct.client.tabs.TabRegistry; +import tconstruct.client.tabs.*; public class KnapsackGui extends InventoryEffectRenderer { diff --git a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 1ffe51e1..30d9bbd0 100644 --- a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -1,7 +1,6 @@ package tconstruct.armor.inventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.armor.player.ArmorExtended; diff --git a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index eeaa27ae..5ac78bde 100644 --- a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -1,9 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.armor.player.KnapsackInventory; diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index cfff1b0b..d4205ee7 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -1,9 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import tconstruct.library.accessory.IAccessory; public class SlotAccessory extends Slot diff --git a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java index bcc9c02c..c0ad0689 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java @@ -1,15 +1,9 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.*; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlotArmorCopy extends Slot { diff --git a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java index 44d1973e..1f2c993f 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java @@ -1,7 +1,6 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.mechworks.landmine.behavior.Behavior; diff --git a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java index 30d0bd08..4afdcc94 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java @@ -1,9 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.inventory.*; +import net.minecraft.item.*; /** * diff --git a/src/main/java/tconstruct/armor/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java index 499a5dde..8b4cd1c1 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -1,9 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import tconstruct.library.accessory.IHealthAccessory; public class SlotCanister extends Slot diff --git a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 192f5d79..275811a7 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -1,9 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import tconstruct.armor.items.Knapsack; public class SlotKnapsack extends Slot diff --git a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java index f8262ac7..685c0f2e 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java @@ -1,7 +1,6 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class SlotOnlyTake extends Slot diff --git a/src/main/java/tconstruct/armor/inventory/SlotUnused.java b/src/main/java/tconstruct/armor/inventory/SlotUnused.java index e0878581..d6b396b0 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotUnused.java +++ b/src/main/java/tconstruct/armor/inventory/SlotUnused.java @@ -1,7 +1,6 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class SlotUnused extends Slot diff --git a/src/main/java/tconstruct/armor/items/ArmorBasic.java b/src/main/java/tconstruct/armor/items/ArmorBasic.java index d121edd6..97e90c05 100644 --- a/src/main/java/tconstruct/armor/items/ArmorBasic.java +++ b/src/main/java/tconstruct/armor/items/ArmorBasic.java @@ -2,8 +2,7 @@ package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; public class ArmorBasic extends ItemArmor { @@ -19,8 +18,7 @@ public class ArmorBasic extends ItemArmor @Override public void registerIcons (IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" - + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); } @Override diff --git a/src/main/java/tconstruct/armor/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java index 72d58e82..ad9dcc6c 100644 --- a/src/main/java/tconstruct/armor/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -1,17 +1,13 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import tconstruct.library.ItemBlocklike; -import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.library.*; public class ArmorPattern extends CraftingItem implements ItemBlocklike { diff --git a/src/main/java/tconstruct/armor/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java index d11040c2..dbbcb264 100644 --- a/src/main/java/tconstruct/armor/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -1,15 +1,12 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.*; +import net.minecraft.potion.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class DiamondApple extends ItemFood { diff --git a/src/main/java/tconstruct/armor/items/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java index 52831e64..7f06c5f0 100644 --- a/src/main/java/tconstruct/armor/items/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -1,27 +1,22 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.armor.player.ArmorExtended; -import tconstruct.armor.player.TPlayerStats; +import tconstruct.armor.player.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IHealthAccessory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class HeartCanister extends CraftingItem implements IHealthAccessory { public HeartCanister() { - super(new String[] { "empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", "green" }, new String[] { "canister_empty", "miniheart_red", "canister_red", - "miniheart_yellow", "canister_yellow", "miniheart_green", "canister_green" }, "", "tinker", TConstructRegistry.materialTab); + super(new String[] { "empty", "miniheart.red", "red", "miniheart.yellow", "yellow", "miniheart.green", "green" }, new String[] { "canister_empty", "miniheart_red", "canister_red", "miniheart_yellow", "canister_yellow", "miniheart_green", "canister_green" }, "", "tinker", TConstructRegistry.materialTab); this.setMaxStackSize(10); } diff --git a/src/main/java/tconstruct/armor/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java index ba8d441d..04e1796b 100644 --- a/src/main/java/tconstruct/armor/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -1,20 +1,14 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - -import tconstruct.world.items.SpecialFood; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; +import net.minecraft.potion.*; +import net.minecraft.util.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.world.items.SpecialFood; public class Jerky extends SpecialFood { diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java index a7925d40..429d3dd9 100644 --- a/src/main/java/tconstruct/armor/items/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -1,15 +1,13 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Knapsack extends CraftingItem implements IAccessory { diff --git a/src/main/java/tconstruct/armor/items/TArmorBase.java b/src/main/java/tconstruct/armor/items/TArmorBase.java index 9848dad6..c9f8d470 100644 --- a/src/main/java/tconstruct/armor/items/TArmorBase.java +++ b/src/main/java/tconstruct/armor/items/TArmorBase.java @@ -1,17 +1,14 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TArmorBase extends ItemArmor // implements ISpecialArmor diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index c5676bcc..219910c0 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -1,21 +1,17 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import tconstruct.armor.ArmorProxyClient; import tconstruct.client.ArmorControls; -import tconstruct.library.accessory.AccessoryCore; -import tconstruct.library.accessory.IAccessoryModel; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.library.accessory.*; public class TravelBelt extends AccessoryCore implements IAccessoryModel { @@ -51,15 +47,15 @@ public class TravelBelt extends AccessoryCore implements IAccessoryModel { return texture; } - + @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { if (!stack.hasTagCompound()) return; - + list.add("\u00a76Ability: Swap Hotbar"); - list.add("\u00a76Control: "+GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); + list.add("\u00a76Control: " + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); } } diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index 7597f176..b91e0993 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -1,7 +1,7 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; @@ -12,10 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.armor.ArmorProxyClient; -import tconstruct.library.armor.ArmorCore; -import tconstruct.library.armor.ArmorPart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.library.armor.*; public class TravelGear extends ArmorCore { @@ -115,8 +112,7 @@ public class TravelGear extends ArmorCore @SideOnly(Side.CLIENT) public void registerIcons (IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" - + (this.armorType == 0 ? "goggles" : this.armorType == 1 ? "vest" : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_" + (this.armorType == 0 ? "goggles" : this.armorType == 1 ? "vest" : this.armorType == 2 ? "wings" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } @@ -141,32 +137,32 @@ public class TravelGear extends ArmorCore { case 0: modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_"+"nightvision"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_"+"moss"); + modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "nightvision"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "goggles" + "_" + "moss"); break; case 1: modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_"+"dodge"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_"+"stealth"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_"+"moss"); + modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "dodge"); + modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "stealth"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "vest" + "_" + "moss"); break; case 2: modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"doublejump"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"featherfall"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"moss"); + modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); + modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); break; case 3: modifiers = new IIcon[5]; - modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_"+"doublejump"); - modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_"+"waterwalk"); - modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_"+"leadweight"); - modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_"+"slimysole"); - modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_"+"moss"); - break; + modifiers[0] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "doublejump"); + modifiers[1] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "waterwalk"); + modifiers[2] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "leadweight"); + modifiers[3] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "slimysole"); + modifiers[4] = iconRegister.registerIcon("tinker:" + textureFolder + "/" + "boots" + "_" + "moss"); + break; } } - + @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) @@ -189,7 +185,7 @@ public class TravelGear extends ArmorCore break; default: } - + super.addInformation(stack, player, list, par4); } } diff --git a/src/main/java/tconstruct/armor/items/TravelGlove.java b/src/main/java/tconstruct/armor/items/TravelGlove.java index 2acb812c..4ebe2f4b 100644 --- a/src/main/java/tconstruct/armor/items/TravelGlove.java +++ b/src/main/java/tconstruct/armor/items/TravelGlove.java @@ -1,17 +1,13 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import tconstruct.armor.ArmorProxyClient; -import tconstruct.library.accessory.AccessoryCore; -import tconstruct.library.accessory.IAccessoryModel; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.library.accessory.*; public class TravelGlove extends AccessoryCore implements IAccessoryModel { diff --git a/src/main/java/tconstruct/armor/items/TravelWings.java b/src/main/java/tconstruct/armor/items/TravelWings.java index af6f0150..ab5cb66a 100644 --- a/src/main/java/tconstruct/armor/items/TravelWings.java +++ b/src/main/java/tconstruct/armor/items/TravelWings.java @@ -1,5 +1,6 @@ package tconstruct.armor.items; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +10,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.library.armor.ArmorPart; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TravelWings extends TravelGear { @@ -26,9 +25,9 @@ public class TravelWings extends TravelGear { String base = "tinker:armor/travel_wings_"; modifiers = new IIcon[5]; - modifiers[0] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"doublejump"); - modifiers[1] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"featherfall"); - modifiers[4] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_"+"moss"); + modifiers[0] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "doublejump"); + modifiers[1] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "featherfall"); + modifiers[4] = IIconRegister.registerIcon("tinker:" + textureFolder + "/" + "wings" + "_" + "moss"); /*modifiers = new IIcon[3]; modifiers[0] = IIconRegister.registerIcon(base + "slimewings"); modifiers[1] = IIconRegister.registerIcon(base + "piston"); @@ -46,7 +45,7 @@ public class TravelWings extends TravelGear player.fallDistance = 2.5f; float terminalVelocity = -0.4f + (feather * 0.08f); if (terminalVelocity > -0.05f) - terminalVelocity = - 0.05f; + terminalVelocity = -0.05f; if (player.isSneaking() && terminalVelocity > -0.8f) terminalVelocity = -0.8F; boolean flying = false; diff --git a/src/main/java/tconstruct/armor/model/BeltModel.java b/src/main/java/tconstruct/armor/model/BeltModel.java index 8ded3d1e..4b21f07f 100644 --- a/src/main/java/tconstruct/armor/model/BeltModel.java +++ b/src/main/java/tconstruct/armor/model/BeltModel.java @@ -1,7 +1,6 @@ package tconstruct.armor.model; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.*; import net.minecraft.entity.Entity; public class BeltModel extends ModelBiped @@ -23,31 +22,31 @@ public class BeltModel extends ModelBiped Buckle.setRotationPoint(0F, 10F, -2.75F); setRotation(Buckle, 0F, 0F, 0F); bipedBody.addChild(Buckle); - + FrontRight = new ModelRenderer(this, 0, 9); FrontRight.addBox(-3F, -1F, 0F, 3, 2, 1); FrontRight.setRotationPoint(-1.75F, 10F, -2.5F); setRotation(FrontRight, 0F, 0F, 0F); bipedBody.addChild(FrontRight); - + FrontLeft = new ModelRenderer(this, 18, 9); FrontLeft.addBox(0F, -1F, 0F, 3, 2, 1); FrontLeft.setRotationPoint(1.75F, 10F, -2.5F); setRotation(FrontLeft, 0F, 0F, 0F); bipedBody.addChild(FrontLeft); - + SideRight = new ModelRenderer(this, 0, 3); SideRight.addBox(-1F, -1F, 0F, 1, 2, 4); SideRight.setRotationPoint(-3.75F, 10F, -2F); setRotation(SideRight, 0F, 0F, 0F); bipedBody.addChild(SideRight); - + SideLeft = new ModelRenderer(this, 16, 3); SideLeft.addBox(0F, -1F, 0F, 1, 2, 4); SideLeft.setRotationPoint(3.75F, 10F, -2F); setRotation(SideLeft, 0F, 0F, 0F); bipedBody.addChild(SideLeft); - + Back = new ModelRenderer(this, 2, 0); Back.addBox(-4.5F, -1F, 0F, 9, 2, 1); Back.setRotationPoint(0F, 10F, 1.5F); diff --git a/src/main/java/tconstruct/armor/model/BootBump.java b/src/main/java/tconstruct/armor/model/BootBump.java index fca5bf37..90bafecc 100644 --- a/src/main/java/tconstruct/armor/model/BootBump.java +++ b/src/main/java/tconstruct/armor/model/BootBump.java @@ -1,7 +1,6 @@ package tconstruct.armor.model; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.*; public class BootBump extends ModelBiped { @@ -20,7 +19,7 @@ public class BootBump extends ModelBiped leftBump.addBox(-0.5F, -1F, 0F, 4, 3, 1, 0.5f); leftBump.setRotationPoint(-1.5F, 10F, -3.75F); bipedLeftLeg.addChild(leftBump); - + this.bipedCloak.isHidden = true; this.bipedEars.isHidden = true; this.bipedHead.isHidden = true; diff --git a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java index 142201a2..067eb25b 100644 --- a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java +++ b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java @@ -7,7 +7,7 @@ public class HiddenPlayerModel extends ModelBiped public HiddenPlayerModel(float size, int slot) { super(size, 0, 64, 32); - + if (slot != 0) //Head { this.bipedHead.isHidden = true; diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index eb429bc8..f6fdda6d 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -1,20 +1,15 @@ package tconstruct.armor.model; -import java.util.ArrayList; -import java.util.List; - +import java.util.*; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; - import tconstruct.armor.items.ArmorPattern; public class RenderArmorCast implements IItemRenderer diff --git a/src/main/java/tconstruct/armor/model/WingModel.java b/src/main/java/tconstruct/armor/model/WingModel.java index 9bf49356..7ebcf7a7 100644 --- a/src/main/java/tconstruct/armor/model/WingModel.java +++ b/src/main/java/tconstruct/armor/model/WingModel.java @@ -1,7 +1,6 @@ package tconstruct.armor.model; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.*; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index c82e7137..ac687e69 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -1,15 +1,11 @@ package tconstruct.armor.modelblock; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; - import org.lwjgl.opengl.GL11; - import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class DryingRackRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 104bb979..23f46f3d 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -1,18 +1,13 @@ package tconstruct.armor.modelblock; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; +import cpw.mods.fml.relauncher.*; +import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; - import org.lwjgl.opengl.GL11; - import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index faa503e0..ac123fe2 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -1,25 +1,20 @@ package tconstruct.armor.player; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; - import java.io.IOException; import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.UUID; - +import java.util.*; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.ai.attributes.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import tconstruct.library.accessory.IHealthAccessory; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.relauncher.Side; public class ArmorExtended implements IInventory { diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index a9cfa130..e39819a5 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -1,18 +1,16 @@ package tconstruct.armor.player; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.util.ArrayList; - import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.util.ArrayList; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; public class KnapsackInventory implements IInventory { diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 0517fd87..483419ce 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -1,40 +1,30 @@ package tconstruct.armor.player; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import cpw.mods.fml.relauncher.Side; +import java.io.*; import java.lang.ref.WeakReference; -import java.net.URL; -import java.net.URLConnection; -import java.util.HashSet; -import java.util.Random; -import java.util.UUID; +import java.net.*; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; - import mantle.player.PlayerUtils; import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; +import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; +import net.minecraft.nbt.*; import net.minecraftforge.event.entity.EntityEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import cpw.mods.fml.relauncher.Side; //TODO: Redesign this class public class TPlayerHandler @@ -326,7 +316,7 @@ public class TPlayerHandler } // entity.yOffset = height; } - + private final String serverLocation = "https://dl.dropboxusercontent.com/u/42769935/sticks.txt"; private final int timeout = 1000; private HashSet stickUsers = new HashSet(); diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index 682d59e6..6e4015a7 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -1,36 +1,35 @@ package tconstruct.armor.player; import java.lang.ref.WeakReference; - -import tconstruct.api.IPlayerExtendedInventoryWrapper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; +import tconstruct.api.IPlayerExtendedInventoryWrapper; public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedInventoryWrapper //TODO: IExtendedEntityProperties is not appropriate! { public static final String PROP_NAME = "TConstruct"; public WeakReference player; - + public int level; public int bonusHealth; public int damage; public int hunger; public int previousDimension; public int mineSpeed; - + public boolean climbWalls; public boolean activeGoggles = true; - + public boolean beginnerManual; public boolean materialManual; public boolean smelteryManual; public boolean battlesignBonus; - + public ArmorExtended armor; public KnapsackInventory knapsack; @@ -80,7 +79,7 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI { } - public void copyFrom(TPlayerStats stats, boolean copyCalc) + public void copyFrom (TPlayerStats stats, boolean copyCalc) { this.armor = stats.armor; this.knapsack = stats.knapsack; @@ -89,7 +88,8 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI this.smelteryManual = stats.smelteryManual; this.battlesignBonus = stats.battlesignBonus; - if (copyCalc) { + if (copyCalc) + { this.bonusHealth = stats.bonusHealth; this.hunger = stats.hunger; this.level = stats.level; @@ -106,16 +106,16 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI return (TPlayerStats) player.getExtendedProperties(PROP_NAME); } - @Override - public IInventory getKnapsackInventory(EntityPlayer player) - { - return this.knapsack; - } + @Override + public IInventory getKnapsackInventory (EntityPlayer player) + { + return this.knapsack; + } + + @Override + public IInventory getAccessoryInventory (EntityPlayer player) + { + return this.armor; + } - @Override - public IInventory getAccessoryInventory(EntityPlayer player) - { - return this.armor; - } - } diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java index a296a737..7ef5c2d8 100644 --- a/src/main/java/tconstruct/blocks/BlockFalling.java +++ b/src/main/java/tconstruct/blocks/BlockFalling.java @@ -1,7 +1,6 @@ package tconstruct.blocks; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index 0727f918..f366a829 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -1,22 +1,17 @@ package tconstruct.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.item.*; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlabBase extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index bc7b51d1..392806b4 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -1,17 +1,14 @@ package tconstruct.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.MantleBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TConstructBlock extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index cbfd9e44..9e6ccb72 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -1,18 +1,16 @@ package tconstruct.blocks.logic; +import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tconstruct.library.crafting.DryingRackRecipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class DryingRackLogic extends InventoryLogic { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index a06e153e..cbe68d32 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -1,20 +1,15 @@ package tconstruct.blocks.slime; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.*; import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeFluid extends BlockFluidClassic { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index f6f1b05d..69e47813 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -1,21 +1,17 @@ package tconstruct.blocks.slime; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeGel extends TConstructBlock { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index eb58ca4c..32f736a0 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -1,29 +1,20 @@ package tconstruct.blocks.slime; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.IPlantable; +import net.minecraft.world.*; +import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import tconstruct.world.TinkerWorld; public class SlimeGrass extends MantleBlock { @@ -123,8 +114,7 @@ public class SlimeGrass extends MantleBlock int posZ = z + random.nextInt(3) - 1; Block blockAbove = world.getBlock(posX, posY + 1, posZ); - if (world.getBlockLightValue(posX, posY + 1, posZ) >= 4 && world.getBlockLightOpacity(posX, posY + 1, posZ) <= 2 - && blockAbove != TinkerTools.craftedSoil && blockAbove != this) + if (world.getBlockLightValue(posX, posY + 1, posZ) >= 4 && world.getBlockLightOpacity(posX, posY + 1, posZ) <= 2 && blockAbove != TinkerTools.craftedSoil && blockAbove != this) { Block block = world.getBlock(posX, posY, posZ); if (block == Blocks.dirt) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 4288f5bc..e98d1d32 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -1,21 +1,16 @@ package tconstruct.blocks.slime; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.block.BlockLeaves; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeLeaves extends BlockLeaves { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 9d332864..2717fe07 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -1,16 +1,13 @@ package tconstruct.blocks.slime; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockSapling; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -18,8 +15,6 @@ import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeTreeGen; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeSapling extends BlockSapling { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index 4e51f970..92439279 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -1,23 +1,16 @@ package tconstruct.blocks.slime; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockBush; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.IShearable; +import net.minecraft.world.*; +import net.minecraftforge.common.*; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeTallGrass extends BlockBush implements IShearable { diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index af41ea40..1351dbf5 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -1,22 +1,17 @@ package tconstruct.blocks.traps; +import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.item.*; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.BarricadeRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BarricadeBlock extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index ee5bf461..f44b4612 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -1,26 +1,17 @@ package tconstruct.blocks.traps; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import mantle.blocks.MantleBlock; import mantle.world.WorldHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.*; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Landmine extends MantleBlock { @@ -182,18 +173,12 @@ public class Landmine extends MantleBlock if (this.triggerMobType == EnumCreatureType.creature) { - var8 = world.getEntitiesWithinAABBExcludingEntity( - (Entity) null, - AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, - (double) ((float) (posZ + 1) - var7))); + var8 = world.getEntitiesWithinAABBExcludingEntity((Entity) null, AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + 1) - var7))); } if (this.triggerMobType == EnumCreatureType.monster) { - var8 = world.getEntitiesWithinAABB( - EntityLiving.class, - AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, - (double) ((float) (posZ + 1) - var7))); + var8 = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ + 1) - var7))); } /* diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 83c9e542..97de118f 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -1,26 +1,20 @@ package tconstruct.blocks.traps; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Item; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.*; +import net.minecraft.potion.*; import net.minecraft.util.DamageSource; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.PunjiRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Punji extends MantleBlock { @@ -62,8 +56,7 @@ public class Punji extends MantleBlock if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji)) { world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3); - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F, - this.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F); player.swingItem(); if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index 909c59be..03b7c211 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -1,8 +1,8 @@ package tconstruct.client; +import cpw.mods.fml.common.gameevent.TickEvent.Type; import mantle.common.network.AbstractPacket; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; @@ -10,16 +10,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; -import tconstruct.armor.ArmorProxyClient; -import tconstruct.armor.ArmorProxyCommon; -import tconstruct.armor.PlayerAbilityHelper; +import tconstruct.armor.*; import tconstruct.armor.items.TravelGear; import tconstruct.client.tabs.TabRegistry; -import tconstruct.util.network.AccessoryInventoryPacket; -import tconstruct.util.network.BeltPacket; -import tconstruct.util.network.DoubleJumpPacket; -import tconstruct.util.network.GogglePacket; -import cpw.mods.fml.common.gameevent.TickEvent.Type; +import tconstruct.util.network.*; public class ArmorControls extends TKeyHandler { diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java index ecb43f45..510555e5 100644 --- a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -2,9 +2,7 @@ package tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -29,12 +27,10 @@ public class BlockSkinRenderHelper var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() && block.getLightValue() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) - : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); + return Minecraft.isAmbientOcclusionEnabled() && block.getLightValue() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } - static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, - IBlockAccess world) + static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { render.enableAO = true; boolean flag = false; @@ -756,8 +752,7 @@ public class BlockSkinRenderHelper return flag; } - static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, - IBlockAccess world) + static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { render.enableAO = false; Tessellator tessellator = Tessellator.instance; @@ -874,21 +869,24 @@ public class BlockSkinRenderHelper var8 = var11; } - if(extraBright) { + if (extraBright) + { var6 = Math.max(1.0f, var6 + 0.5f); var7 = Math.max(1.0f, var7 + 0.5f); var8 = Math.max(1.0f, var8 + 0.5f); } // safety - if(stillIcon == null) stillIcon = FluidRegistry.WATER.getStillIcon(); - if(flowingIcon == null) flowingIcon = FluidRegistry.WATER.getFlowingIcon(); + if (stillIcon == null) + stillIcon = FluidRegistry.WATER.getStillIcon(); + if (flowingIcon == null) + flowingIcon = FluidRegistry.WATER.getFlowingIcon(); boolean raf = renderer.renderAllFaces; renderer.renderAllFaces = true; boolean ret; - if(Minecraft.isAmbientOcclusionEnabled()) + if (Minecraft.isAmbientOcclusionEnabled()) ret = renderFakeBlockWithAmbientOcclusion(stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world); else ret = renderFakeBlockWithColorMultiplier(stillIcon, flowingIcon, x, y, z, var6, var7, var8, renderer, world); @@ -897,8 +895,7 @@ public class BlockSkinRenderHelper return ret; } - static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, - IBlockAccess world) + static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; render.enableAO = true; @@ -1615,8 +1612,7 @@ public class BlockSkinRenderHelper return flag; } - static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, - IBlockAccess world) + static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowingIcon, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; render.enableAO = false; diff --git a/src/main/java/tconstruct/client/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java index 7c374cc2..8f939dcc 100644 --- a/src/main/java/tconstruct/client/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -1,12 +1,11 @@ package tconstruct.client; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BreakingFX extends EntityFX diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index 75a9031b..9656c16f 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -1,22 +1,15 @@ package tconstruct.client; -import mantle.blocks.BlockUtils; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.*; public class CustomBowRenderer implements IItemRenderer { diff --git a/src/main/java/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java index cc5f28be..90a67d0f 100644 --- a/src/main/java/tconstruct/client/CustomFont.java +++ b/src/main/java/tconstruct/client/CustomFont.java @@ -1,19 +1,12 @@ package tconstruct.client; -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Rectangle; +import java.awt.*; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import java.io.File; -import java.io.InputStream; - +import java.io.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; - import org.lwjgl.opengl.GL11; /** diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java index 4f8fd8ad..fb9d28d2 100644 --- a/src/main/java/tconstruct/client/StepSoundSlime.java +++ b/src/main/java/tconstruct/client/StepSoundSlime.java @@ -24,7 +24,7 @@ public class StepSoundSlime extends SoundType * Used when a entity walks over, or otherwise interacts with the block. */ @Override - public String getStepResourcePath() + public String getStepResourcePath () { return this.soundName + ".small"; } diff --git a/src/main/java/tconstruct/client/TKeyHandler.java b/src/main/java/tconstruct/client/TKeyHandler.java index dfd5a598..dcb21dd8 100644 --- a/src/main/java/tconstruct/client/TKeyHandler.java +++ b/src/main/java/tconstruct/client/TKeyHandler.java @@ -1,17 +1,13 @@ package tconstruct.client; -import java.util.EnumSet; - -import net.minecraft.client.settings.KeyBinding; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.Type; import cpw.mods.fml.relauncher.Side; +import java.util.EnumSet; +import net.minecraft.client.settings.KeyBinding; +import org.lwjgl.input.*; public abstract class TKeyHandler { diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index d1a45682..6f517f5c 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -1,22 +1,15 @@ package tconstruct.client; import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - +import javax.xml.parsers.*; import mantle.client.SmallFontRenderer; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.init.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - +import net.minecraft.util.*; import org.w3c.dom.Document; - import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.player.TPlayerStats; @@ -31,12 +24,12 @@ public class TProxyClient extends TProxyCommon public static Minecraft mc; public static RenderItem itemRenderer = new RenderItem(); - public void initialize() + public void initialize () { registerRenderer(); readManuals(); } - + /* Registers any rendering code. */ public void registerRenderer () { diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index b18fe6d4..b9a554ae 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -6,26 +6,27 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; -import tconstruct.tools.entity.DaggerEntity; public class ToolCoreRenderer implements IItemRenderer { private final boolean isEntity; private final boolean noEntityTranslation; - public ToolCoreRenderer() { this(false, false); } + public ToolCoreRenderer() + { + this(false, false); + } - public ToolCoreRenderer(boolean isEntity) { + public ToolCoreRenderer(boolean isEntity) + { this(isEntity, false); } - public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation) { + public ToolCoreRenderer(boolean isEntity, boolean noEntityTranslation) + { this.isEntity = isEntity; this.noEntityTranslation = noEntityTranslation; } @@ -33,7 +34,7 @@ public class ToolCoreRenderer implements IItemRenderer @Override public boolean handleRenderType (ItemStack item, ItemRenderType type) { - if(!item.hasTagCompound()) + if (!item.hasTagCompound()) return false; switch (type) @@ -169,7 +170,7 @@ public class ToolCoreRenderer implements IItemRenderer GL11.glTranslatef(0, -4 / 16f, 0); break; case ENTITY: - if(!noEntityTranslation) + if (!noEntityTranslation) GL11.glTranslatef(-0.5f, 0f, depth); // correction of the rotation point when items lie on the ground break; default: @@ -207,14 +208,14 @@ public class ToolCoreRenderer implements IItemRenderer for (int i = 0; i < iconParts; ++i) { - float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; - for (int k = 0, e = (int)w; k < e; ++k) + float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]); - tess.addVertexWithUV(pos, 0, 0, iconPos, yMax[i]); - tess.addVertexWithUV(pos, 1, 0, iconPos, yMin[i]); + tess.addVertexWithUV(pos, 0, 0, iconPos, yMax[i]); + tess.addVertexWithUV(pos, 1, 0, iconPos, yMin[i]); tess.addVertexWithUV(pos, 1, -depth, iconPos, yMin[i]); } } @@ -226,16 +227,16 @@ public class ToolCoreRenderer implements IItemRenderer for (int i = 0; i < iconParts; ++i) { - float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; - float d2 = 1f / w; - for (int k = 0, e = (int)w; k < e; ++k) + float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i]; + float d2 = 1f / w; + for (int k = 0, e = (int) w; k < e; ++k) { pos = k / w; iconPos = m + d * pos - s; posEnd = pos + d2; tess.addVertexWithUV(posEnd, 1, -depth, iconPos, yMin[i]); - tess.addVertexWithUV(posEnd, 1, 0, iconPos, yMin[i]); - tess.addVertexWithUV(posEnd, 0, 0, iconPos, yMax[i]); + tess.addVertexWithUV(posEnd, 1, 0, iconPos, yMin[i]); + tess.addVertexWithUV(posEnd, 0, 0, iconPos, yMax[i]); tess.addVertexWithUV(posEnd, 0, -depth, iconPos, yMax[i]); } } @@ -246,15 +247,15 @@ public class ToolCoreRenderer implements IItemRenderer for (int i = 0; i < iconParts; ++i) { - float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; - float d2 = 1f / h; - for (int k = 0, e = (int)h; k < e; ++k) + float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; + float d2 = 1f / h; + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; posEnd = pos + d2; - tess.addVertexWithUV(0, posEnd, 0, xMax[i], iconPos); - tess.addVertexWithUV(1, posEnd, 0, xMin[i], iconPos); + tess.addVertexWithUV(0, posEnd, 0, xMax[i], iconPos); + tess.addVertexWithUV(1, posEnd, 0, xMin[i], iconPos); tess.addVertexWithUV(1, posEnd, -depth, xMin[i], iconPos); tess.addVertexWithUV(0, posEnd, -depth, xMax[i], iconPos); } @@ -266,13 +267,13 @@ public class ToolCoreRenderer implements IItemRenderer for (int i = 0; i < iconParts; ++i) { - float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; - for (int k = 0, e = (int)h; k < e; ++k) + float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i]; + for (int k = 0, e = (int) h; k < e; ++k) { pos = k / h; iconPos = m + d * pos - s; - tess.addVertexWithUV(1, pos, 0, xMin[i], iconPos); - tess.addVertexWithUV(0, pos, 0, xMax[i], iconPos); + tess.addVertexWithUV(1, pos, 0, xMin[i], iconPos); + tess.addVertexWithUV(0, pos, 0, xMax[i], iconPos); tess.addVertexWithUV(0, pos, -depth, xMax[i], iconPos); tess.addVertexWithUV(1, pos, -depth, xMin[i], iconPos); } diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index a0a77374..e100f450 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -1,18 +1,15 @@ package tconstruct.client.entity.item; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ExplosiveRender extends Render diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 35b796a7..77c7e8d3 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -1,28 +1,18 @@ package tconstruct.client.entity.projectile; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.texture.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import net.minecraft.util.*; +import org.lwjgl.opengl.*; import tconstruct.tools.entity.ArrowEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ArrowRender extends Render diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 2b5b025f..25a366b6 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -1,23 +1,16 @@ package tconstruct.client.entity.projectile; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.tools.entity.ArrowEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ArrowRenderCustom extends Render diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 33e3894f..4f426331 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -1,31 +1,20 @@ package tconstruct.client.entity.projectile; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.texture.*; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; +import net.minecraft.item.*; +import net.minecraft.util.*; import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.tools.entity.DaggerEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class DaggerRender extends Render @@ -468,8 +457,7 @@ public class DaggerRender extends Render tessellator.startDrawingQuads(); tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); tessellator.draw(); diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index 0ba39515..b36ea7f0 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -1,26 +1,17 @@ package tconstruct.client.entity.projectile; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.renderer.texture.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; - +import net.minecraft.util.*; import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.client.ToolCoreRenderer; import tconstruct.tools.entity.DaggerEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class DaggerRenderCustom extends Render diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 0d023547..f757a11f 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -1,21 +1,15 @@ package tconstruct.client.entity.projectile; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; +import net.minecraft.item.*; import net.minecraft.potion.PotionHelper; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import net.minecraft.util.*; +import org.lwjgl.opengl.*; import tconstruct.tools.entity.LaunchedPotion; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class LaunchedItemRender extends Render diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index 50d24729..7b581556 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -1,33 +1,19 @@ package tconstruct.client.gui; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; - +import net.minecraft.util.*; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import tconstruct.smeltery.inventory.ActiveContainer; -import tconstruct.smeltery.inventory.ActiveSlot; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.*; +import tconstruct.smeltery.inventory.*; @SideOnly(Side.CLIENT) public abstract class NewContainerGui extends GuiScreen @@ -629,8 +615,7 @@ public abstract class NewContainerGui extends GuiScreen } } } - else if (this.field_94076_q && slot != null && itemstack != null && itemstack.stackSize > this.field_94077_p.size() && Container.func_94527_a(slot, itemstack, true) - && slot.isItemValid(itemstack) && this.container.canDragIntoSlot(slot)) + else if (this.field_94076_q && slot != null && itemstack != null && itemstack.stackSize > this.field_94077_p.size() && Container.func_94527_a(slot, itemstack, true) && slot.isItemValid(itemstack) && this.container.canDragIntoSlot(slot)) { this.field_94077_p.add(slot); this.func_94066_g(); @@ -676,8 +661,7 @@ public abstract class NewContainerGui extends GuiScreen { slot1 = (Slot) iterator.next(); - if (slot1 != null && slot1.canTakeStack(this.mc.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory - && Container.func_94527_a(slot1, this.field_94075_K, true)) + if (slot1 != null && slot1.canTakeStack(this.mc.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory && Container.func_94527_a(slot1, this.field_94075_K, true)) { this.handleMouseClick(slot1, slot1.slotNumber, par3, 1); } diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index 31c2d050..551755b2 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -4,13 +4,9 @@ import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; +import net.minecraft.util.*; +import org.lwjgl.opengl.*; +import org.w3c.dom.*; public class BlockCastPage extends BookPage { diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 60ec51fb..f5971d84 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -5,17 +5,12 @@ import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - +import org.lwjgl.opengl.*; +import org.w3c.dom.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; -import tconstruct.tools.gui.PartCrafterGui; public class MaterialPage extends BookPage { @@ -159,7 +154,7 @@ public class MaterialPage extends BookPage { manual.fonts.drawString(materialTrait + ": " + ability, localWidth, localHeight + 120 + 10 * offset, 0); offset++; - if(material.name().equals("Paper") || material.name().equals("Thaumium")) + if (material.name().equals("Paper") || material.name().equals("Thaumium")) manual.fonts.drawString(extraMod, localWidth, localHeight + 120 + 10 * offset, 0); } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 18e0e2be..0d898903 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -4,13 +4,9 @@ import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; +import net.minecraft.util.*; +import org.lwjgl.opengl.*; +import org.w3c.dom.*; public class ModifierPage extends BookPage { diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index 544d376f..2ab44ccc 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -5,11 +5,8 @@ import mantle.lib.client.MantleClientRegistry; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; +import org.lwjgl.opengl.*; +import org.w3c.dom.*; public class ToolPage extends BookPage { diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index c57c685c..4e14da42 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -6,9 +6,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.*; public abstract class AbstractTab extends GuiButton { diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index d5dd83cd..0dd4195e 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -1,8 +1,7 @@ package tconstruct.client.tabs; import net.minecraft.item.ItemStack; -import tconstruct.armor.ArmorProxyClient; -import tconstruct.armor.TinkerArmor; +import tconstruct.armor.*; import tconstruct.client.ArmorControls; public class InventoryTabKnapsack extends AbstractTab diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index a6c2a33b..75015018 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -1,16 +1,12 @@ package tconstruct.client.tabs; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiInventory; -import net.minecraftforge.client.event.GuiScreenEvent; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraftforge.client.event.GuiScreenEvent; public class TabRegistry { @@ -25,7 +21,7 @@ public class TabRegistry { return tabList; } - + @SideOnly(Side.CLIENT) @SubscribeEvent public void guiPostInit (GuiScreenEvent.InitGuiEvent.Post event) @@ -36,7 +32,7 @@ public class TabRegistry int ySize = 166; int guiLeft = (event.gui.width - xSize) / 2; int guiTop = (event.gui.height - ySize) / 2; - + updateTabValues(guiLeft, guiTop, InventoryTabVanilla.class); addTabsToList(event.gui.buttonList); } diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index 1c2497e0..e16b278b 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -1,18 +1,17 @@ package tconstruct.common; +import cpw.mods.fml.common.network.IGuiHandler; import java.util.HashMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; public class TProxyCommon implements IGuiHandler { - public void initialize() + public void initialize () { - + } - + @Override public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -21,7 +20,7 @@ public class TProxyCommon implements IGuiHandler return handler.getServerGuiElement(ID, player, world, x, y, z); return null; } - + @Override public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -33,13 +32,13 @@ public class TProxyCommon implements IGuiHandler private static HashMap serverGuiHandlers = new HashMap(); private static HashMap clientGuiHandlers = new HashMap(); - - public static void registerServerGuiHandler(int gui, IGuiHandler handler) + + public static void registerServerGuiHandler (int gui, IGuiHandler handler) { serverGuiHandlers.put(gui, handler); } - - public static void registerClientGuiHandler(int gui, IGuiHandler handler) + + public static void registerClientGuiHandler (int gui, IGuiHandler handler) { clientGuiHandlers.put(gui, handler); } diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 3c9fc7a1..e1d478f3 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -1,20 +1,16 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import java.util.List; - 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.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.TConstruct; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Arrow extends ToolCore { @@ -115,8 +111,7 @@ public class Arrow extends ToolCore accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, random.nextInt(4)) : null; extra = getExtraItem(); extraStack = extra != null ? new ItemStack(extra, 1, 0) : null; - tool = ToolBuilder.instance - .buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, StatCollector.translateToLocal("item.tool.randomarrow")); + tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, random.nextInt(18)), new ItemStack(getHandleItem(), 1, random.nextInt(18)), accessoryStack, extraStack, StatCollector.translateToLocal("item.tool.randomarrow")); if (tool != null) { diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 58e6bb2c..a4fcff02 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,10 +1,9 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.item.Item; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BattleSign extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index f7bd7426..30e8e32b 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,27 +1,20 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; +import tconstruct.library.*; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Battleaxe extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 0a264fbe..f8bec12a 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -1,34 +1,22 @@ package tconstruct.items.tools; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.enchantment.*; +import net.minecraft.entity.player.*; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; -import net.minecraftforge.event.entity.player.ArrowNockEvent; -import tconstruct.TConstruct; +import net.minecraftforge.event.entity.player.*; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.ArrowEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class BowBase extends ToolCore { diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 19fe8f20..357a1817 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -1,23 +1,19 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.library.crafting.Detailing.DetailInput; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Chisel extends ToolCore { diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index f4cd9916..ed9de6c7 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -1,17 +1,13 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.*; +import net.minecraft.potion.*; import net.minecraft.world.World; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Cleaver extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index faa4a25d..34ee9da5 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -1,9 +1,7 @@ package tconstruct.items.tools; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 691e4f8d..5427cc38 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -1,23 +1,19 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; +import tconstruct.library.*; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Excavator extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index d8e5029e..dd2a2df4 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -1,24 +1,18 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.world.World; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.EquipLogic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FryingPan extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 9a0ba892..871626fe 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -1,29 +1,23 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; +import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Hammer extends HarvestTool { @@ -215,8 +209,7 @@ public class Hammer extends HarvestTool { super.getSubItems(id, tab, list); - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 10), new ItemStack(getHandleItem(), 1, 8), new ItemStack(getAccessoryItem(), 1, 11), new ItemStack( - getExtraItem(), 1, 11), "InfiMiner"); + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 10), new ItemStack(getHandleItem(), 1, 8), new ItemStack(getAccessoryItem(), 1, 11), new ItemStack(getExtraItem(), 1, 11), "InfiMiner"); NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); tags.setInteger("Modifiers", 0); diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 14b6d847..0b90bc92 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -1,16 +1,13 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Hatchet extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index a911b5f0..36f8138e 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -1,17 +1,14 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Longsword extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index e23b81a0..e89599d6 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -1,23 +1,19 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; +import tconstruct.library.*; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LumberAxe extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index 15c70a40..0140d8f5 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -1,17 +1,12 @@ package tconstruct.items.tools; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.TConstruct; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.DualHarvestTool; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index d4bfea34..34152d00 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -1,23 +1,17 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.tools.entity.LaunchedPotion; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class PotionLauncher extends Item { diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index f80ea3a6..189df3da 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -3,9 +3,7 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.library.tools.Weapon; diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index c867c807..6078d1aa 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -1,21 +1,17 @@ package tconstruct.items.tools; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.*; import net.minecraft.entity.Entity; 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.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetHandler; import net.minecraft.network.play.client.C07PacketPlayerDigging; @@ -23,13 +19,9 @@ import net.minecraft.stats.StatList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; +import tconstruct.library.*; +import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Scythe extends Weapon { @@ -202,8 +194,7 @@ public class Scythe extends Weapon { if (butter && localBlock instanceof IShearable && ((IShearable) localBlock).isShearable(stack, player.worldObj, x, y, z)) { - ArrayList drops = ((IShearable) localBlock).onSheared(stack, player.worldObj, x, y, z, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + ArrayList drops = ((IShearable) localBlock).onSheared(stack, player.worldObj, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); Random rand = new Random(); if (!world.isRemote) @@ -239,9 +230,11 @@ public class Scythe extends Weapon localBlock.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); } - if(world.isRemote) { + if (world.isRemote) + { INetHandler handler = FMLClientHandler.instance().getClientPlayHandler(); - if(handler != null && handler instanceof NetHandlerPlayClient) { + if (handler != null && handler instanceof NetHandlerPlayClient) + { NetHandlerPlayClient handlerClient = (NetHandlerPlayClient) handler; handlerClient.addToSendQueue(new C07PacketPlayerDigging(0, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); handlerClient.addToSendQueue(new C07PacketPlayerDigging(2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index 24336c30..d8f3561f 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -1,18 +1,15 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Shortbow extends BowBase { diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 7e763961..bcbda3c5 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -1,11 +1,10 @@ package tconstruct.items.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Shovel extends HarvestTool { diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index e371d5e8..ab7b738c 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -1,7 +1,6 @@ package tconstruct.library; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/library/TConstructCreativeTab.java b/src/main/java/tconstruct/library/TConstructCreativeTab.java index d5fd53fb..8cda6165 100644 --- a/src/main/java/tconstruct/library/TConstructCreativeTab.java +++ b/src/main/java/tconstruct/library/TConstructCreativeTab.java @@ -1,8 +1,7 @@ package tconstruct.library; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; public class TConstructCreativeTab extends CreativeTabs { diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 2d61aaf4..1e14caca 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -1,29 +1,12 @@ package tconstruct.library; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import tconstruct.library.crafting.Detailing; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.ToolBuilder; +import java.util.*; +import net.minecraft.item.*; +import org.apache.logging.log4j.*; +import tconstruct.library.crafting.*; import tconstruct.library.modifier.ActiveArmorMod; -import tconstruct.library.tools.ArrowMaterial; -import tconstruct.library.tools.BowMaterial; -import tconstruct.library.tools.BowstringMaterial; -import tconstruct.library.tools.CustomMaterial; -import tconstruct.library.tools.FletchingMaterial; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.ToolMaterial; +import tconstruct.library.tools.*; /** * A registry to store any relevant API work @@ -283,8 +266,7 @@ public class TConstructRegistry } @Deprecated - public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, - float stonebound, String style, String ability) + public static void addToolMaterial (int materialID, String materialName, String displayName, int harvestLevel, int durability, int miningspeed, int attack, float handleModifier, int reinforced, float stonebound, String style, String ability) { logger.warn("[TCon API] Using deprecated addToolMaterial with display and ability name. displayName and ability will be ignored, use languages files for that."); addToolMaterial(materialID, materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, style); diff --git a/src/main/java/tconstruct/library/accessory/AccessoryCore.java b/src/main/java/tconstruct/library/accessory/AccessoryCore.java index 3ae3ba7f..346c7f49 100644 --- a/src/main/java/tconstruct/library/accessory/AccessoryCore.java +++ b/src/main/java/tconstruct/library/accessory/AccessoryCore.java @@ -1,19 +1,16 @@ package tconstruct.library.accessory; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; 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.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class AccessoryCore extends Item implements IAccessory, IModifyable { @@ -21,7 +18,8 @@ public abstract class AccessoryCore extends Item implements IAccessory, IModifya * Override getArmorModel() to have render on the player. */ protected String texture; - public AccessoryCore( String texture) + + public AccessoryCore(String texture) { super(); this.setCreativeTab(TConstructRegistry.equipableTab); @@ -60,21 +58,21 @@ public abstract class AccessoryCore extends Item implements IAccessory, IModifya glove.setTagCompound(baseTag); list.add(glove); }*/ - + @Override @SideOnly(Side.CLIENT) public void getSubItems (Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(getDefaultItem()); } - - public ItemStack getDefaultItem() + + public ItemStack getDefaultItem () { ItemStack gear = new ItemStack(this, 1, 0); NBTTagCompound itemTag = new NBTTagCompound(); - + int baseDurability = 500; - + itemTag.setInteger("Damage", 0); //Damage is damage to the tool itemTag.setInteger("TotalDurability", baseDurability); itemTag.setInteger("BaseDurability", baseDurability); @@ -83,7 +81,7 @@ public abstract class AccessoryCore extends Item implements IAccessory, IModifya itemTag.setInteger("Modifiers", 5); itemTag.setBoolean("Broken", false); itemTag.setBoolean("Built", true); - + NBTTagCompound baseTag = new NBTTagCompound(); baseTag.setTag(getBaseTagName(), itemTag); gear.setTagCompound(baseTag); @@ -99,12 +97,12 @@ public abstract class AccessoryCore extends Item implements IAccessory, IModifya @SideOnly(Side.CLIENT) public void registerIcons (IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("tinker:"+texture); + itemIcon = iconRegister.registerIcon("tinker:" + texture); registerModifiers(iconRegister); } @SideOnly(Side.CLIENT) - protected void registerModifiers(IIconRegister iconRegister) + protected void registerModifiers (IIconRegister iconRegister) { } diff --git a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java index 522d57f0..e41c774c 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java +++ b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java @@ -1,10 +1,9 @@ package tconstruct.library.accessory; +import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public interface IAccessoryModel { @@ -15,7 +14,7 @@ public interface IAccessoryModel * @param slot * @return Resource location of the texture. Return null for none */ - + @SideOnly(Side.CLIENT) - public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot); + public ResourceLocation getWearbleTexture (Entity entity, ItemStack stack, int slot); } diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 3cc32161..66df49ff 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -1,30 +1,22 @@ package tconstruct.library.armor; +import cpw.mods.fml.relauncher.*; import java.text.DecimalFormat; import java.util.List; - import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.dispenser.IBehaviorDispenseItem; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import tconstruct.library.TConstructRegistry; -import tconstruct.library.modifier.ActiveArmorMod; -import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.*; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IModifyable { @@ -120,8 +112,7 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod @SideOnly(Side.CLIENT) public void registerIcons (IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName - + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "pants" : this.armorType == 3 ? "boots" : "helmet")); registerModifiers(iconRegister); } diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java index b60bdca6..7b37037b 100644 --- a/src/main/java/tconstruct/library/armor/ArmorMod.java +++ b/src/main/java/tconstruct/library/armor/ArmorMod.java @@ -1,12 +1,9 @@ package tconstruct.library.armor; import java.util.EnumSet; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; +import tconstruct.library.modifier.*; public abstract class ArmorMod extends ItemModifier { @@ -32,7 +29,7 @@ public abstract class ArmorMod extends ItemModifier } return false; } - + @Override public boolean validType (IModifyable type) { diff --git a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java index 7d327f0e..4714f587 100644 --- a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java +++ b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java @@ -1,9 +1,6 @@ package tconstruct.library.armor; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; - +import java.util.*; import net.minecraft.item.ItemStack; public abstract class ArmorModTypeFilter extends ArmorMod diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index 1ffe5045..c19ed8a6 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -1,17 +1,13 @@ package tconstruct.library.armor; import java.util.List; - import net.minecraft.block.BlockDispenser; import net.minecraft.command.IEntitySelector; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.dispenser.*; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.*; final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/tconstruct/library/client/GuiElement.java b/src/main/java/tconstruct/library/client/GuiElement.java index f5d977e3..f9e766c6 100644 --- a/src/main/java/tconstruct/library/client/GuiElement.java +++ b/src/main/java/tconstruct/library/client/GuiElement.java @@ -1,12 +1,14 @@ package tconstruct.library.client; -public class GuiElement { +public class GuiElement +{ public final int buttonIconX; public final int buttonIconY; public final String domain; public final String texture; - public GuiElement(int buttonIconX, int buttonIconY, String domain, String texture) { + public GuiElement(int buttonIconX, int buttonIconY, String domain, String texture) + { this.buttonIconX = buttonIconX; this.buttonIconY = buttonIconY; this.domain = domain; diff --git a/src/main/java/tconstruct/library/client/StencilGuiElement.java b/src/main/java/tconstruct/library/client/StencilGuiElement.java index 0a2f406c..2acf1bcb 100644 --- a/src/main/java/tconstruct/library/client/StencilGuiElement.java +++ b/src/main/java/tconstruct/library/client/StencilGuiElement.java @@ -1,9 +1,11 @@ package tconstruct.library.client; -public class StencilGuiElement extends GuiElement { +public class StencilGuiElement extends GuiElement +{ public final int stencilIndex; - public StencilGuiElement(int buttonIconX, int buttonIconY, int stencilIndex, String domain, String texture) { + public StencilGuiElement(int buttonIconX, int buttonIconY, int stencilIndex, String domain, String texture) + { super(buttonIconX, buttonIconY, domain, texture); this.stencilIndex = stencilIndex; diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index 2469834d..356534f5 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -1,9 +1,6 @@ package tconstruct.library.client; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - +import java.util.*; import mantle.lib.client.MantleClientRegistry; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -89,7 +86,7 @@ public class TConstructClientRegistry public static void registerManualModifier (String name, ItemStack output, ItemStack topinput, ItemStack bottominput) { ItemStack[] recipe = new ItemStack[3]; - recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] {topinput, bottominput});//ToolBuilder.instance.buildTool(output, topinput, bottominput, ""); + recipe[0] = ModifyBuilder.instance.modifyItem(output, new ItemStack[] { topinput, bottominput });//ToolBuilder.instance.buildTool(output, topinput, bottominput, ""); recipe[1] = topinput; recipe[2] = bottominput; MantleClientRegistry.recipeIcons.put(name, recipe); diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index 75e61fa7..4bb946d0 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -1,13 +1,8 @@ package tconstruct.library.component; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidTank; +import java.util.*; +import net.minecraft.nbt.*; +import net.minecraftforge.fluids.*; import tconstruct.library.crafting.Smeltery; public class MultiFluidTank extends LogicComponent implements IFluidTank diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 8fbea5a8..355bc277 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,19 +1,10 @@ package tconstruct.library.component; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; - -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; -import mantle.world.CoordTuple; -import mantle.world.CoordTupleSort; +import java.util.*; +import mantle.blocks.iface.*; +import mantle.world.*; import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; import tconstruct.TConstruct; diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index f99db48a..3ecdf119 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -1,9 +1,6 @@ package tconstruct.library.crafting; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - +import java.util.*; import net.minecraftforge.fluids.FluidStack; public class AlloyMix diff --git a/src/main/java/tconstruct/library/crafting/CastingRecipe.java b/src/main/java/tconstruct/library/crafting/CastingRecipe.java index 315e4d3b..0e8076f2 100644 --- a/src/main/java/tconstruct/library/crafting/CastingRecipe.java +++ b/src/main/java/tconstruct/library/crafting/CastingRecipe.java @@ -25,8 +25,7 @@ public class CastingRecipe public boolean matches (FluidStack metal, ItemStack inputCast) { - if (castingMetal.isFluidEqual(metal) - && ((cast != null && cast.getItemDamage() == Short.MAX_VALUE && inputCast.getItem() == cast.getItem()) || ItemStack.areItemStacksEqual(this.cast, inputCast))) + if (castingMetal.isFluidEqual(metal) && ((cast != null && cast.getItemDamage() == Short.MAX_VALUE && inputCast.getItem() == cast.getItem()) || ItemStack.areItemStacksEqual(this.cast, inputCast))) { return true; } diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index f2ce53d7..d23b5c98 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -1,14 +1,11 @@ package tconstruct.library.crafting; -import java.util.ArrayList; -import java.util.List; - +import cpw.mods.fml.common.registry.GameRegistry; +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.common.registry.GameRegistry; public class Detailing { diff --git a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java index 9c6d43bd..5d316abf 100644 --- a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java +++ b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java @@ -1,10 +1,8 @@ package tconstruct.library.crafting; import java.util.ArrayList; - import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; public class DryingRackRecipes { diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index 31c55fa0..e0100b8d 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -1,9 +1,6 @@ package tconstruct.library.crafting; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - +import java.util.*; import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; @@ -14,7 +11,7 @@ public class FluidType public final int baseTemperature; public final Fluid fluid; public final boolean isToolpart; - + public static HashMap fluidTypes = new HashMap(); public FluidType(Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) @@ -25,19 +22,19 @@ public class FluidType this.fluid = fluid; this.isToolpart = isToolpart; } - - public static void registerFluidType(String name, FluidType type) + + public static void registerFluidType (String name, FluidType type) { fluidTypes.put(name, type); } - - public static void registerFluidType(String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) + + public static void registerFluidType (String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { FluidType type = new FluidType(block, meta, baseTemperature, fluid, isToolpart); registerFluidType(name, type); } - - public static FluidType getFluidType(String typeName) + + public static FluidType getFluidType (String typeName) { return fluidTypes.get(typeName); } @@ -48,7 +45,7 @@ public class FluidType while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); - if (((FluidType)pairs.getValue()).fluid.equals(searchedFluid)) + if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) return (FluidType) pairs.getValue(); } return null; @@ -60,7 +57,7 @@ public class FluidType while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); - if (((FluidType)pairs.getValue()).fluid.equals(searchedFluid)) + if (((FluidType) pairs.getValue()).fluid.equals(searchedFluid)) return ((FluidType) pairs.getValue()).baseTemperature; } return 800; diff --git a/src/main/java/tconstruct/library/crafting/LiquidCasting.java b/src/main/java/tconstruct/library/crafting/LiquidCasting.java index 18ed5dd2..326b978e 100644 --- a/src/main/java/tconstruct/library/crafting/LiquidCasting.java +++ b/src/main/java/tconstruct/library/crafting/LiquidCasting.java @@ -1,7 +1,6 @@ package tconstruct.library.crafting; import java.util.ArrayList; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import tconstruct.library.client.FluidRenderProperties; diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java index 83071fb0..6a451ea1 100644 --- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java @@ -1,26 +1,23 @@ package tconstruct.library.crafting; -import java.util.ArrayList; -import java.util.List; - +import java.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; +import tconstruct.library.modifier.*; public class ModifyBuilder { public static ModifyBuilder instance = new ModifyBuilder(); public List itemModifiers = new ArrayList(); - - public ItemStack modifyItem(ItemStack input, ItemStack[] modifiers) + + public ItemStack modifyItem (ItemStack input, ItemStack[] modifiers) { ItemStack copy = input.copy(); //Prevent modifying the original if (copy.getItem() instanceof IModifyable) { IModifyable item = (IModifyable) copy.getItem(); NBTTagCompound tags = input.getTagCompound().getCompoundTag(item.getBaseTagName()); - + boolean built = false; for (ItemModifier mod : itemModifiers) { @@ -36,8 +33,8 @@ public class ModifyBuilder } return null; } - - public static void registerModifier(ItemModifier mod) + + public static void registerModifier (ItemModifier mod) { if (mod == null) throw new NullPointerException("Modifier cannot be null."); diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 9ed20adc..75a537a9 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -1,19 +1,15 @@ package tconstruct.library.crafting; /** How to build tool parts? With patterns! */ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - +import cpw.mods.fml.common.eventhandler.Event.Result; +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraftforge.common.MinecraftForge; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.util.IPattern; -import cpw.mods.fml.common.eventhandler.Event.Result; public class PatternBuilder { diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 796cf3b5..78854012 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -1,9 +1,6 @@ package tconstruct.library.crafting; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - +import java.util.*; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; @@ -37,7 +34,7 @@ public class ShapelessToolRecipe extends ShapelessRecipes while (iterator.hasNext()) { - ItemStack itemstack1 = (ItemStack)iterator.next(); + ItemStack itemstack1 = (ItemStack) iterator.next(); // TConstruct.logger.info("Rawr! "+itemstack1.getItemDamage()); if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage())) diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index 2f3d75e5..b71679f0 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -1,14 +1,10 @@ package tconstruct.library.crafting; import java.util.*; - import mantle.utils.ItemMetaWrapper; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; +import net.minecraft.item.*; +import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.OreDictionary; /** Melting and hacking, churn and burn */ @@ -28,15 +24,15 @@ public class Smeltery * @param power The temperature of the fluid. This also influences the melting speed. Lava is 1000. * @param duration How long one "portion" of liquid fuels the smeltery. Lava is 10. */ - public static void addSmelteryFuel(Fluid fluid, int power, int duration) + public static void addSmelteryFuel (Fluid fluid, int power, int duration) { - instance.smelteryFuels.put(fluid, new Integer[] {power, duration}); + instance.smelteryFuels.put(fluid, new Integer[] { power, duration }); } /** * Returns true if the liquid is a valid smeltery fuel. */ - public static boolean isSmelteryFuel(Fluid fluid) + public static boolean isSmelteryFuel (Fluid fluid) { return instance.smelteryFuels.containsKey(fluid); } @@ -44,7 +40,7 @@ public class Smeltery /** * Returns the power of a smeltery fuel or 0 if it's not a fuel. */ - public static int getFuelPower(Fluid fluid) + public static int getFuelPower (Fluid fluid) { Integer[] power = instance.smelteryFuels.get(fluid); return power == null ? 0 : power[0]; @@ -53,7 +49,7 @@ public class Smeltery /** * Returns the duration of a smeltery fuel or 0 if it's not a fuel. */ - public static int getFuelDuration(Fluid fluid) + public static int getFuelDuration (Fluid fluid) { Integer[] power = instance.smelteryFuels.get(fluid); return power == null ? 0 : power[1]; diff --git a/src/main/java/tconstruct/library/crafting/StencilBuilder.java b/src/main/java/tconstruct/library/crafting/StencilBuilder.java index 8654c51f..9d5d73b5 100644 --- a/src/main/java/tconstruct/library/crafting/StencilBuilder.java +++ b/src/main/java/tconstruct/library/crafting/StencilBuilder.java @@ -1,12 +1,11 @@ package tconstruct.library.crafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import java.util.*; +import net.minecraft.item.*; import net.minecraftforge.oredict.OreDictionary; -import java.util.*; - -public class StencilBuilder { +public class StencilBuilder +{ public static StencilBuilder instance = new StencilBuilder(); public List blanks = new LinkedList(); // i wish ItemStack would support equals so i could use a Set here... @@ -15,50 +14,58 @@ public class StencilBuilder { /** * Returns whether the given ItemStack is a blank pattern and therefore usable for stencil crafting. */ - public static boolean isBlank(ItemStack stack) + public static boolean isBlank (ItemStack stack) { - for(ItemStack blank : instance.blanks) - if(OreDictionary.itemMatches(stack, blank, false)) // this has nothing to do with the oredictionary. + for (ItemStack blank : instance.blanks) + if (OreDictionary.itemMatches(stack, blank, false)) // this has nothing to do with the oredictionary. return true; return false; } - public static void registerBlankStencil(ItemStack itemStack) + public static void registerBlankStencil (ItemStack itemStack) { instance.blanks.add(itemStack); } - public static void registerStencil(Item item, int meta) + public static void registerStencil (Item item, int meta) { instance.stencils.add(new ItemStack(item, 1, meta)); } - public static void registerStencil(ItemStack pattern) + public static void registerStencil (ItemStack pattern) { instance.stencils.add(pattern); } - public static List getStencils() { return instance.stencils; } + public static List getStencils () + { + return instance.stencils; + } /** * Returns the index of the given stencil. If no stencil is found, returns -1. */ - public static int getIndex(ItemStack stencil) { - for(int i = 0; i < instance.stencils.size(); i++) - if(OreDictionary.itemMatches(stencil, getStencil(i), false)) + public static int getIndex (ItemStack stencil) + { + for (int i = 0; i < instance.stencils.size(); i++) + if (OreDictionary.itemMatches(stencil, getStencil(i), false)) return i; return -1; } // returns the stencil with the given index - public static ItemStack getStencil(int num) { - if(num >= instance.stencils.size()) + public static ItemStack getStencil (int num) + { + if (num >= instance.stencils.size()) return null; return instance.stencils.get(num).copy(); } - public static int getStencilCount() { return instance.stencils.size(); } + public static int getStencilCount () + { + return instance.stencils.size(); + } } diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index bd791498..4b7166dd 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -1,23 +1,16 @@ package tconstruct.library.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event.Result; +import java.util.*; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.ToolBuildEvent; -import tconstruct.library.event.ToolCraftEvent; +import tconstruct.library.event.*; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.ToolMaterial; +import tconstruct.library.tools.*; import tconstruct.library.util.IToolPart; -import cpw.mods.fml.common.eventhandler.Event.Result; public class ToolBuilder { @@ -130,7 +123,7 @@ public class ToolBuilder if (headStack == null || handleStack == null) //Nothing to build without these. All tools need at least two parts! return null; - if(name == null) + if (name == null) name = ""; // fire the ToolBuild event to get the correct items @@ -378,7 +371,6 @@ public class ToolBuilder return null; }*/ - int buildReinforced (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat, ToolMaterial extraMat) { int reinforced = 0; @@ -423,25 +415,25 @@ public class ToolBuilder return (sHead + sHandle) / 2f; } - public static String defaultToolName(ItemStack stack) + public static String defaultToolName (ItemStack stack) { - if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("InfiTool")) return null; - if(!(stack.getItem() instanceof ToolCore)) + if (!(stack.getItem() instanceof ToolCore)) return null; int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Head"); return defaultToolName(TConstructRegistry.getMaterial(mat), (ToolCore) stack.getItem()); } - public static String defaultToolName(ToolMaterial headMat, ToolCore tool) + public static String defaultToolName (ToolMaterial headMat, ToolCore tool) { return String.format("%s %s", headMat.prefixName(), tool.getLocalizedToolName()); } //Passthrough for now @Deprecated - public static void registerToolMod(ItemModifier mod) + public static void registerToolMod (ItemModifier mod) { ModifyBuilder.registerModifier(mod); } diff --git a/src/main/java/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java index fca7033f..8466fb9e 100644 --- a/src/main/java/tconstruct/library/crafting/ToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ToolRecipe.java @@ -1,7 +1,6 @@ package tconstruct.library.crafting; import java.util.LinkedList; - import net.minecraft.init.Items; import net.minecraft.item.Item; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/library/event/PartBuilderEvent.java b/src/main/java/tconstruct/library/event/PartBuilderEvent.java index 8f79c236..ab3ca236 100644 --- a/src/main/java/tconstruct/library/event/PartBuilderEvent.java +++ b/src/main/java/tconstruct/library/event/PartBuilderEvent.java @@ -1,7 +1,7 @@ package tconstruct.library.event; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.eventhandler.Event; +import net.minecraft.item.ItemStack; /* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. diff --git a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java index c384bc7c..bbbdf301 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java @@ -9,23 +9,29 @@ import tconstruct.library.crafting.CastingRecipe; * * Set result to DENY to prevent casting. */ -public abstract class SmelteryCastEvent extends Event { +public abstract class SmelteryCastEvent extends Event +{ public final CastingRecipe recipe; public final FluidStack fluid; - public SmelteryCastEvent(CastingRecipe recipe, FluidStack fluid) { + public SmelteryCastEvent(CastingRecipe recipe, FluidStack fluid) + { this.recipe = recipe; this.fluid = fluid; } - public static class CastingTable extends SmelteryCastEvent { - public CastingTable(CastingRecipe recipe, FluidStack fluid) { + public static class CastingTable extends SmelteryCastEvent + { + public CastingTable(CastingRecipe recipe, FluidStack fluid) + { super(recipe, fluid); } } - public static class CastingBasin extends SmelteryCastEvent { - public CastingBasin(CastingRecipe recipe, FluidStack fluid) { + public static class CastingBasin extends SmelteryCastEvent + { + public CastingBasin(CastingRecipe recipe, FluidStack fluid) + { super(recipe, fluid); } } diff --git a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java index f0c420b1..0c498dce 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java @@ -8,26 +8,31 @@ import tconstruct.library.crafting.CastingRecipe; * Fired when an item is cast in the casting table. * If consumeCast is set to true, the cast will be destroyed. */ -public abstract class SmelteryCastedEvent extends Event { +public abstract class SmelteryCastedEvent extends Event +{ public final CastingRecipe recipe; public ItemStack output; public boolean consumeCast; - public SmelteryCastedEvent(CastingRecipe recipe, ItemStack output) { + public SmelteryCastedEvent(CastingRecipe recipe, ItemStack output) + { this.recipe = recipe; this.consumeCast = recipe.consumeCast; this.output = output; } - - public static class CastingTable extends SmelteryCastedEvent { - public CastingTable(CastingRecipe recipe, ItemStack output) { + public static class CastingTable extends SmelteryCastedEvent + { + public CastingTable(CastingRecipe recipe, ItemStack output) + { super(recipe, output); } } - public static class CastingBasin extends SmelteryCastedEvent { - public CastingBasin(CastingRecipe recipe, ItemStack output) { + public static class CastingBasin extends SmelteryCastedEvent + { + public CastingBasin(CastingRecipe recipe, ItemStack output) + { super(recipe, output); } } diff --git a/src/main/java/tconstruct/library/event/SmelteryEvent.java b/src/main/java/tconstruct/library/event/SmelteryEvent.java index a19fd784..44ac8201 100644 --- a/src/main/java/tconstruct/library/event/SmelteryEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryEvent.java @@ -1,9 +1,9 @@ package tconstruct.library.event; +import cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.eventhandler.Event; public class SmelteryEvent extends Event { diff --git a/src/main/java/tconstruct/library/event/ToolBuildEvent.java b/src/main/java/tconstruct/library/event/ToolBuildEvent.java index 7afb70b5..94c15756 100644 --- a/src/main/java/tconstruct/library/event/ToolBuildEvent.java +++ b/src/main/java/tconstruct/library/event/ToolBuildEvent.java @@ -7,14 +7,16 @@ import net.minecraft.item.ItemStack; * Called when the ToolBuilder tries to piece together the Parts of a tool. * */ -public class ToolBuildEvent extends Event { +public class ToolBuildEvent extends Event +{ public ItemStack headStack; public ItemStack handleStack; public ItemStack accessoryStack; public ItemStack extraStack; public String name; // to allow shenanigans - public ToolBuildEvent(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) { + public ToolBuildEvent(ItemStack headStack, ItemStack handleStack, ItemStack accessoryStack, ItemStack extraStack, String name) + { this.headStack = headStack; this.handleStack = handleStack; this.accessoryStack = accessoryStack; diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index 68fc6339..927ca433 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -1,10 +1,9 @@ package tconstruct.library.event; +import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.tools.ToolMaterial; -import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.common.eventhandler.Event; +import tconstruct.library.tools.*; /* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. diff --git a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java index e5383629..07053c36 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java @@ -1,9 +1,9 @@ package tconstruct.library.event; +import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.eventhandler.Event; public class ToolCraftedEvent extends Event { diff --git a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java index ad21cdc3..1e7ccc06 100644 --- a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java +++ b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java @@ -3,14 +3,13 @@ package tconstruct.library.modifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.library.armor.ArmorCore; -import tconstruct.library.armor.ArmorPart; +import tconstruct.library.armor.*; public class ActiveArmorMod { /* Ticks for every armor piece on client and server */ public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack, ArmorCore armor, ArmorPart type) { - + } } diff --git a/src/main/java/tconstruct/library/modifier/IModifyable.java b/src/main/java/tconstruct/library/modifier/IModifyable.java index f49cab50..24cdbfd2 100644 --- a/src/main/java/tconstruct/library/modifier/IModifyable.java +++ b/src/main/java/tconstruct/library/modifier/IModifyable.java @@ -5,9 +5,9 @@ public interface IModifyable /** * @return The base tag to modify. Ex: InfiTool */ - public String getBaseTagName(); - - public String getModifyType(); - - public String[] getTraits(); + public String getBaseTagName (); + + public String getModifyType (); + + public String[] getTraits (); } diff --git a/src/main/java/tconstruct/library/modifier/ItemModifier.java b/src/main/java/tconstruct/library/modifier/ItemModifier.java index 0165c268..ea43d01b 100644 --- a/src/main/java/tconstruct/library/modifier/ItemModifier.java +++ b/src/main/java/tconstruct/library/modifier/ItemModifier.java @@ -1,11 +1,6 @@ package tconstruct.library.modifier; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.UUID; - +import java.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,7 +10,7 @@ public abstract class ItemModifier public final List stacks; public final int effectIndex; public static Random random = new Random(); - + /** Default constructor * * @param recipe Items to compare against when checking the modifier @@ -78,12 +73,12 @@ public abstract class ItemModifier return list.isEmpty(); } - protected String getTagName(ItemStack stack) + protected String getTagName (ItemStack stack) { - return ((IModifyable)stack.getItem()).getBaseTagName(); + return ((IModifyable) stack.getItem()).getBaseTagName(); } - - protected NBTTagCompound getModifierTag(ItemStack stack) + + protected NBTTagCompound getModifierTag (ItemStack stack) { return stack.getTagCompound().getCompoundTag(getTagName(stack)); } @@ -245,7 +240,7 @@ public abstract class ItemModifier return false; return ItemStack.areItemStackTagsEqual(stack1, stack2); } - + public static NBTTagCompound getAttributeTag (String attributeType, String modifierName, double amount, boolean flat, UUID uuid) { NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 1c7b3ac4..e3ecec53 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -1,40 +1,27 @@ package tconstruct.library.tools; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.eventhandler.Event.Result; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.monster.*; import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.*; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatList; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.stats.*; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.UseHoeEvent; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; +import tconstruct.library.*; import tconstruct.library.util.PiercingEntityDamage; -import cpw.mods.fml.common.eventhandler.Event.Result; public class AbilityHelper { @@ -139,8 +126,7 @@ public class AbilityHelper if (damage > 0 || enchantDamage > 0) { - boolean criticalHit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) - && player.ridingEntity == null && entity instanceof EntityLivingBase; + boolean criticalHit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null && entity instanceof EntityLivingBase; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { @@ -212,8 +198,7 @@ public class AbilityHelper if (knockback > 0) { - entity.addVelocity((double) (-MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F), 0.1D, - (double) (MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F)); + entity.addVelocity((double) (-MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F), 0.1D, (double) (MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) * (float) knockback * 0.5F)); player.motionX *= 0.6D; player.motionZ *= 0.6D; player.setSprinting(false); @@ -309,8 +294,7 @@ public class AbilityHelper if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living)) { - List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, - AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); + List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); Iterator var4 = var6.iterator(); while (var4.hasNext()) @@ -386,7 +370,7 @@ public class AbilityHelper } } - public static boolean damageEnergyTool(ItemStack stack, NBTTagCompound tags, Entity entity) + public static boolean damageEnergyTool (ItemStack stack, NBTTagCompound tags, Entity entity) { if (!tags.hasKey("Energy")) return false; @@ -424,7 +408,8 @@ public class AbilityHelper { ToolCore tool = (ToolCore) stack.getItem(); // first try charging from the hotbar - if(entity instanceof EntityPlayer) { + if (entity instanceof EntityPlayer) + { // workaround for charging flux-capacitors making tools unusable chargeEnergyFromHotbar(stack, (EntityPlayer) entity, tags); energy = tool.getEnergyStored(stack); @@ -440,7 +425,6 @@ public class AbilityHelper energy -= trueSpeed * 2; tags.setInteger("Energy", energy); - stack.setItemDamage(1 + (tool.getMaxEnergyStored(stack) - energy) * (stack.getMaxDamage() - 1) / tool.getMaxEnergyStored(stack)); } return true; @@ -449,13 +433,13 @@ public class AbilityHelper protected static void chargeEnergyFromHotbar (ItemStack stack, EntityPlayer player, NBTTagCompound tags) { // cool kids only - if(!(stack.getItem() instanceof ToolCore)) + if (!(stack.getItem() instanceof ToolCore)) return; - ToolCore tool = (ToolCore)stack.getItem(); + ToolCore tool = (ToolCore) stack.getItem(); // check if the tool can actually receive energy - if(tool.receiveEnergy(stack, 1, true) != 1) + if (tool.receiveEnergy(stack, 1, true) != 1) // no you're not going to charge that potato battery on your tool return; @@ -464,7 +448,7 @@ public class AbilityHelper int missing = max - buffer; // you're full. xbox go home. - if(missing <= 0) + if (missing <= 0) return; // iterate through hotbar @@ -473,10 +457,10 @@ public class AbilityHelper ItemStack slot = player.inventory.mainInventory[iter]; // check if item is not another tool - if(slot == null || slot.getItem() instanceof ToolCore) + if (slot == null || slot.getItem() instanceof ToolCore) continue; // check if item gives energy - if(!(slot.getItem() instanceof IEnergyContainerItem)) + if (!(slot.getItem() instanceof IEnergyContainerItem)) continue; IEnergyContainerItem fluxItem = (IEnergyContainerItem) slot.getItem(); @@ -488,7 +472,7 @@ public class AbilityHelper } } // update energy - tags.setInteger("Energy", max-missing); + tags.setInteger("Energy", max - missing); } public static void breakTool (ItemStack stack, NBTTagCompound tags, Entity entity) @@ -546,7 +530,7 @@ public class AbilityHelper if (side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; - world.playSoundEffect((double)((float)x + 0.5F), (double)((float)y + 0.5F), (double)((float)z + 0.5F), block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); if (world.isRemote) { @@ -680,7 +664,7 @@ public class AbilityHelper return world.func_147447_a(vec3, vec31, par3, !par3, par3); } - public static float calcToolSpeed(ToolCore tool, NBTTagCompound tags) + public static float calcToolSpeed (ToolCore tool, NBTTagCompound tags) { float mineSpeed = tags.getInteger("MiningSpeed"); int heads = 1; @@ -702,7 +686,7 @@ public class AbilityHelper heads++; } float speedMod = 1f; - if(tool instanceof HarvestTool) + if (tool instanceof HarvestTool) speedMod = ((HarvestTool) tool).breakSpeedModifier(); float trueSpeed = mineSpeed / (heads * 100f) * speedMod; @@ -711,12 +695,12 @@ public class AbilityHelper return trueSpeed; } - public static float calcStoneboundBonus(ToolCore tool, NBTTagCompound tags) + public static float calcStoneboundBonus (ToolCore tool, NBTTagCompound tags) { int durability = tags.getInteger("Damage"); float stonebound = tags.getFloat("Shoddy"); float stoneboundMod = 72f; - if(tool instanceof HarvestTool) + if (tool instanceof HarvestTool) stoneboundMod = ((HarvestTool) tool).stoneboundModifier(); return (float) Math.log(durability / stoneboundMod + 1) * 2 * stonebound; diff --git a/src/main/java/tconstruct/library/tools/CustomMaterial.java b/src/main/java/tconstruct/library/tools/CustomMaterial.java index a36af1f8..da9f5b9b 100644 --- a/src/main/java/tconstruct/library/tools/CustomMaterial.java +++ b/src/main/java/tconstruct/library/tools/CustomMaterial.java @@ -1,11 +1,9 @@ package tconstruct.library.tools; -import net.minecraft.init.Items; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import java.util.List; - public abstract class CustomMaterial { public final int materialID; @@ -35,13 +33,13 @@ public abstract class CustomMaterial /** * Wether an itemstack is a stack of this custom material or not. */ - public boolean matches(ItemStack stack) + public boolean matches (ItemStack stack) { - if(this.oredict != null) + if (this.oredict != null) { List items = OreDictionary.getOres(oredict); - for(ItemStack item : items) - if(OreDictionary.itemMatches(item, stack, false)) + for (ItemStack item : items) + if (OreDictionary.itemMatches(item, stack, false)) return true; return false; } diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 2eb4fd99..3b44d79b 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -8,8 +8,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; +import tconstruct.library.*; /* Base class for harvest tools with each head having a different purpose */ @@ -19,7 +18,7 @@ public abstract class DualHarvestTool extends HarvestTool { super(baseDamage); } - + @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { @@ -123,12 +122,13 @@ public abstract class DualHarvestTool extends HarvestTool } @Override - public boolean isEffective(Material material) { - if(super.isEffective(material)) + public boolean isEffective (Material material) + { + if (super.isEffective(material)) return true; - for(Material m : getEffectiveSecondaryMaterials()) - if(m == material) + for (Material m : getEffectiveSecondaryMaterials()) + if (m == material) return true; return false; diff --git a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java index c3bae9b8..5c2184a2 100644 --- a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java @@ -3,16 +3,18 @@ package tconstruct.library.tools; import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import tconstruct.tools.TinkerToolEvents; -public class FletchlingLeafMaterial extends FletchingMaterial { - public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass) { +public class FletchlingLeafMaterial extends FletchingMaterial +{ + public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass) + { super(materialID, value, oredict, craftingItem, accuracy, breakChance, mass); } @Override - public boolean matches(ItemStack stack) { - if(matchesLeaves(stack)) + public boolean matches (ItemStack stack) + { + if (matchesLeaves(stack)) return true; return super.matches(stack); diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index bc353144..08dcafee 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -5,22 +5,18 @@ import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetHandler; import net.minecraft.network.play.client.C07PacketPlayerDigging; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; +import tconstruct.library.*; /* Base class for tools that should be harvesting blocks */ @@ -30,7 +26,7 @@ public abstract class HarvestTool extends ToolCore { super(baseDamage); } - + @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { @@ -138,7 +134,7 @@ public abstract class HarvestTool extends ToolCore return calculateStrength(tags, block, meta); } } - if (this.getHarvestType().equals(block.getHarvestTool(meta)) && block.getHarvestLevel(meta) > 0) + if (this.getHarvestType().equals(block.getHarvestTool(meta)) && block.getHarvestLevel(meta) > 0) { return calculateStrength(tags, block, meta); // No issue if the // harvest level is @@ -157,12 +153,12 @@ public abstract class HarvestTool extends ToolCore return AbilityHelper.calcToolSpeed(this, tags); } - public float breakSpeedModifier() + public float breakSpeedModifier () { return 1.0f; } - - public float stoneboundModifier() + + public float stoneboundModifier () { return 72f; } @@ -193,10 +189,10 @@ public abstract class HarvestTool extends ToolCore protected abstract String getHarvestType (); - public boolean isEffective(Material material) + public boolean isEffective (Material material) { - for(Material m : getEffectiveMaterials()) - if(m == material) + for (Material m : getEffectiveMaterials()) + if (m == material) return true; return false; @@ -297,7 +293,7 @@ public abstract class HarvestTool extends ToolCore } // The Scythe is not a HarvestTool and can't call this method, if you change something here you might change it there too. - public void mineBlock(World world, int x, int y, int z, int meta, EntityPlayer player, Block block) + public void mineBlock (World world, int x, int y, int z, int meta, EntityPlayer player, Block block) { // Workaround for dropping experience boolean silktouch = EnchantmentHelper.getSilkTouchModifier(player); @@ -313,9 +309,11 @@ public abstract class HarvestTool extends ToolCore if (!silktouch) block.dropXpOnBlockBreak(world, x, y, z, exp); - if(world.isRemote) { + if (world.isRemote) + { INetHandler handler = FMLClientHandler.instance().getClientPlayHandler(); - if(handler != null && handler instanceof NetHandlerPlayClient) { + if (handler != null && handler instanceof NetHandlerPlayClient) + { NetHandlerPlayClient handlerClient = (NetHandlerPlayClient) handler; handlerClient.addToSendQueue(new C07PacketPlayerDigging(0, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); handlerClient.addToSendQueue(new C07PacketPlayerDigging(2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index b53b3cd8..af2cf0a8 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -1,34 +1,22 @@ package tconstruct.library.tools; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; - +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; +import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; +import tconstruct.library.modifier.*; import tconstruct.tools.entity.FancyEntityItem; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * NBTTags Main tag - InfiTool @@ -74,15 +62,15 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo setNoRepair(); canRepair = false; } - + @Override - public String getBaseTagName() + public String getBaseTagName () { return "InfiTool"; } - + @Override - public String getModifyType() + public String getModifyType () { return "Tool"; } @@ -119,7 +107,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo return this.getClass().getSimpleName(); } - public String getLocalizedToolName() + public String getLocalizedToolName () { return StatCollector.translateToLocal("tool." + getToolName().toLowerCase()); } @@ -801,8 +789,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo if (tags == null || !tags.hasKey("Energy")) return 0; int energy = tags.getInteger("Energy"); - int energyReceived = tags.hasKey("EnergyReceiveRate") ? tags.getInteger("EnergyReceiveRate") : this.maxReceive; // backup value - int maxEnergy = tags.hasKey("EnergyMax") ? tags.getInteger("EnergyMax") : this.capacity; // backup value + int energyReceived = tags.hasKey("EnergyReceiveRate") ? tags.getInteger("EnergyReceiveRate") : this.maxReceive; // backup value + int maxEnergy = tags.hasKey("EnergyMax") ? tags.getInteger("EnergyMax") : this.capacity; // backup value // calculate how much we can receive energyReceived = Math.min(maxEnergy - energy, Math.min(energyReceived, maxReceive)); @@ -858,7 +846,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo if (tags == null || !tags.hasKey("Energy")) return 0; - if(tags.hasKey("EnergyMax")) + if (tags.hasKey("EnergyMax")) return tags.getInteger("EnergyMax"); // backup return capacity; diff --git a/src/main/java/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java index d13e8c44..0ba7e043 100644 --- a/src/main/java/tconstruct/library/tools/ToolMaterial.java +++ b/src/main/java/tconstruct/library/tools/ToolMaterial.java @@ -17,11 +17,11 @@ public class ToolMaterial public final float stonebound; public final String tipStyle; - @Deprecated public String displayName; @Deprecated public String ability; + @Deprecated public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) { @@ -56,12 +56,15 @@ public class ToolMaterial return materialName; } - public String localizedName() { return StatCollector.translateToLocal("material." + materialName.toLowerCase()); } + public String localizedName () + { + return StatCollector.translateToLocal("material." + materialName.toLowerCase()); + } - public String prefixName() + public String prefixName () { // check if there's a special name, otherwise use the regular one - if(StatCollector.canTranslate(String.format("material.%s.display", materialName.toLowerCase()))) + if (StatCollector.canTranslate(String.format("material.%s.display", materialName.toLowerCase()))) return StatCollector.translateToLocal(String.format("material.%s.display", materialName.toLowerCase())); return localizedName(); } @@ -112,7 +115,7 @@ public class ToolMaterial */ public String ability () { - if(StatCollector.canTranslate(String.format("material.%s.ability", materialName.toLowerCase()))) + if (StatCollector.canTranslate(String.format("material.%s.ability", materialName.toLowerCase()))) return StatCollector.translateToLocal(String.format("material.%s.ability", materialName.toLowerCase())); return ""; } diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index e88c4c16..1007e07c 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -1,15 +1,13 @@ package tconstruct.library.tools; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public abstract class Weapon extends ToolCore { diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index b7383a49..0664f9fe 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -1,27 +1,31 @@ package tconstruct.library.util; +import java.util.*; import net.minecraft.util.StatCollector; -import java.util.HashMap; -import java.util.Map; - /** * Lookup for the name of each harvest level. Use this clientside only for display purposes. */ -public final class HarvestLevels { - private HarvestLevels() {} // non-instantiable +public final class HarvestLevels +{ + private HarvestLevels() + { + } // non-instantiable public static final Map harvestLevelNames = new HashMap(); - public static String getHarvestLevelName (int num) { + public static String getHarvestLevelName (int num) + { return harvestLevelNames.containsKey(num) ? harvestLevelNames.get(num) : String.valueOf(num); } // initialization - static{ + static + { String base = "gui.mining"; int i = 0; - while(StatCollector.canTranslate(String.format("%s%d", base, i+1))) { + while (StatCollector.canTranslate(String.format("%s%d", base, i + 1))) + { harvestLevelNames.put(i, StatCollector.translateToLocal(String.format("%s%d", base, i + 1))); i++; } diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java index 4a1e7b9f..58e0c07f 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java @@ -1,38 +1,37 @@ package tconstruct.mechworks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.world.World; import tconstruct.client.entity.item.ExplosiveRender; import tconstruct.common.TProxyCommon; -import tconstruct.mechworks.entity.item.EntityLandmineFirework; -import tconstruct.mechworks.entity.item.ExplosivePrimed; +import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.gui.GuiLandmine; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; -import cpw.mods.fml.client.registry.RenderingRegistry; public class MechworksProxyClient extends MechworksProxyCommon -{ - public void initialize() +{ + public void initialize () { registerRenderer(); - registerGuiHandler(); + registerGuiHandler(); } - void registerRenderer() + void registerRenderer () { RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.fireworks)); RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender()); } - - protected void registerGuiHandler() + + protected void registerGuiHandler () { super.registerGuiHandler(); TProxyCommon.registerClientGuiHandler(landmineID, this); } - + @Override public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java index b5433c33..df6f9e25 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java @@ -1,23 +1,23 @@ package tconstruct.mechworks; +import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import tconstruct.common.TProxyCommon; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; -import cpw.mods.fml.common.network.IGuiHandler; public class MechworksProxyCommon implements IGuiHandler -{ - public void initialize() +{ + public void initialize () { registerGuiHandler(); } - + public static int drawbridgeID = 9; public static final int landmineID = 10; - - protected void registerGuiHandler() + + protected void registerGuiHandler () { TProxyCommon.registerServerGuiHandler(landmineID, this); } diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java index 8ce05191..27ea3bda 100644 --- a/src/main/java/tconstruct/mechworks/TinkerMechworks.java +++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java @@ -1,27 +1,21 @@ package tconstruct.mechworks; import cpw.mods.fml.common.SidedProxy; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import tconstruct.TConstruct; import tconstruct.mechworks.blocks.BlockLandmine; -import tconstruct.mechworks.entity.item.EntityLandmineFirework; -import tconstruct.mechworks.entity.item.ExplosivePrimed; +import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) //TODO handle migration of all items/blocks that were owned by the previously seperate mod @@ -43,14 +37,10 @@ public class TinkerMechworks GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); // Landmine Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', - Items.redstone, 'p', Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 1), "mcm", "rpr", 'm', Blocks.stone, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', - Items.redstone, 'p', Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 2), "mcm", "rpr", 'm', Blocks.obsidian, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', - Items.redstone, 'p', Blocks.stone_pressure_plate)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 3), "mcm", "rpr", 'm', Items.repeater, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', - Items.redstone, 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 1), "mcm", "rpr", 'm', Blocks.stone, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 2), "mcm", "rpr", 'm', Blocks.obsidian, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, 'p', Blocks.stone_pressure_plate)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerMechworks.landmine, 1, 3), "mcm", "rpr", 'm', Items.repeater, 'c', new ItemStack(TinkerTools.blankPattern, 1, 1), 'r', Items.redstone, 'p', Blocks.stone_pressure_plate)); EntityRegistry.registerModEntity(EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true); diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index 8193391f..7b36bebf 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -1,49 +1,30 @@ package tconstruct.mechworks.blocks; -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - -import java.util.Iterator; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import mantle.blocks.BlockUtils; import mantle.world.WorldHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.*; import net.minecraft.block.BlockPressurePlate.Sensitivity; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.entity.*; +import net.minecraft.entity.item.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; import tconstruct.mechworks.MechworksProxyCommon; import tconstruct.mechworks.landmine.Helper; -import tconstruct.mechworks.logic.LandmineExplodeLogic; -import tconstruct.mechworks.logic.TileEntityLandmine; +import tconstruct.mechworks.logic.*; import tconstruct.world.model.RenderLandmine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import static net.minecraftforge.common.util.ForgeDirection.*; /** * @@ -177,8 +158,7 @@ public class BlockLandmine extends BlockContainer int ss = itemstack.stackSize; itemstack.stackSize -= ss; - EntityItem entityitem = new EntityItem(par1World, (double) ((float) par2), (double) ((float) par3), (double) ((float) par4), new ItemStack(itemstack.getItem(), ss, - itemstack.getItemDamage())); + EntityItem entityitem = new EntityItem(par1World, (double) ((float) par2), (double) ((float) par3), (double) ((float) par4), new ItemStack(itemstack.getItem(), ss, itemstack.getItemDamage())); if (itemstack.hasTagCompound()) { @@ -223,16 +203,13 @@ public class BlockLandmine extends BlockContainer public boolean canPlaceBlockOnSide (World par1World, int par2, int par3, int par4, int par5) { ForgeDirection dir = ForgeDirection.getOrientation(par5); - return (dir == DOWN && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isSideSolid(par2, par3 - 1, par4, UP)) - || (dir == NORTH && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) || (dir == SOUTH && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) - || (dir == WEST && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) || (dir == EAST && par1World.isSideSolid(par2 - 1, par3, par4, EAST)); + return (dir == DOWN && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isSideSolid(par2, par3 - 1, par4, UP)) || (dir == NORTH && par1World.isSideSolid(par2, par3, par4 + 1, NORTH)) || (dir == SOUTH && par1World.isSideSolid(par2, par3, par4 - 1, SOUTH)) || (dir == WEST && par1World.isSideSolid(par2 + 1, par3, par4, WEST)) || (dir == EAST && par1World.isSideSolid(par2 - 1, par3, par4, EAST)); } @Override public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST) || par1World.isSideSolid(par2 + 1, par3, par4, WEST) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) - || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) || par1World.isSideSolid(par2, par3 - 1, par4, UP) || par1World.isSideSolid(par2, par3 + 1, par4, DOWN); + return par1World.isSideSolid(par2 - 1, par3, par4, EAST) || par1World.isSideSolid(par2 + 1, par3, par4, WEST) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) || par1World.isSideSolid(par2, par3 - 1, par4, UP) || par1World.isSideSolid(par2, par3 + 1, par4, DOWN); } @Override diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 2cb1aa0c..1f16fb93 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -1,13 +1,12 @@ package tconstruct.mechworks.entity.item; +import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.util.DamageSourceFireworkExplode; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EntityLandmineFirework extends Entity { diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index 3499e1aa..52c6bf69 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -1,14 +1,11 @@ package tconstruct.mechworks.entity.item; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.world.MiningExplosion; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ExplosivePrimed extends Entity { diff --git a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java index 0a92426a..3db4b7f4 100644 --- a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java @@ -1,16 +1,11 @@ package tconstruct.mechworks.gui; import java.util.List; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - +import net.minecraft.util.*; import org.lwjgl.opengl.GL11; - import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.landmine.behavior.Behavior; diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index 46d69797..4a1232cb 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -1,17 +1,11 @@ package tconstruct.mechworks.inventory; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -import tconstruct.armor.inventory.SlotBehavedOnly; -import tconstruct.armor.inventory.SlotOpaqueBlocksOnly; +import tconstruct.armor.inventory.*; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.logic.TileEntityLandmine; @@ -145,8 +139,7 @@ public class ContainerLandmine extends Container { Slot slot = (Slot) this.inventorySlots.get(par1); - if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) - && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) + if (slot != null && func_94527_a(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.field_94537_h.size() && this.canDragIntoSlot(slot)) { this.field_94537_h.add(slot); } @@ -163,8 +156,7 @@ public class ContainerLandmine extends Container { Slot slot1 = (Slot) iterator.next(); - if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) - && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) + if (slot1 != null && func_94527_a(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.field_94537_h.size() && this.canDragIntoSlot(slot1)) { ItemStack itemstack2 = itemstack1.copy(); int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0; @@ -481,8 +473,7 @@ public class ContainerLandmine extends Container { Slot slot3 = (Slot) this.inventorySlots.get(i2); - if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) && slot3.canTakeStack(par4EntityPlayer) && this.func_94530_a(itemstack1, slot3) - && (l1 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) + if (slot3.getHasStack() && func_94527_a(slot3, itemstack1, true) && slot3.canTakeStack(par4EntityPlayer) && this.func_94530_a(itemstack1, slot3) && (l1 != 0 || slot3.getStack().stackSize != slot3.getStack().getMaxStackSize())) { int j2 = Math.min(itemstack1.getMaxStackSize() - itemstack1.stackSize, slot3.getStack().stackSize); ItemStack itemstack5 = slot3.decrStackSize(j2); diff --git a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java index d80c2369..518afb11 100644 --- a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java @@ -1,12 +1,9 @@ package tconstruct.mechworks.itemblocks; -import java.util.List; -import java.util.Random; - +import java.util.*; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.mechworks.TinkerMechworks; diff --git a/src/main/java/tconstruct/mechworks/landmine/Helper.java b/src/main/java/tconstruct/mechworks/landmine/Helper.java index 7f4519f4..1a741ce2 100644 --- a/src/main/java/tconstruct/mechworks/landmine/Helper.java +++ b/src/main/java/tconstruct/mechworks/landmine/Helper.java @@ -1,8 +1,7 @@ package tconstruct.mechworks.landmine; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java index efc80065..9753f824 100644 --- a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java +++ b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java @@ -1,9 +1,7 @@ package tconstruct.mechworks.landmine; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; public class LandmineStack { diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index 7bb9abbd..fb1e0098 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -1,22 +1,14 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; +import java.util.*; +import net.minecraft.block.*; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.mechworks.landmine.Helper; -import tconstruct.mechworks.landmine.LandmineStack; +import tconstruct.mechworks.landmine.*; /** * diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index 25bfb603..92e2008e 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -63,8 +63,7 @@ public class BehaviorBlockThrow extends Behavior break; } - EntityFallingBlock entityfallingsand = new EntityFallingBlock(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), - BlockUtils.getBlockFromItemStack(par5ItemStack), par5ItemStack.getItemDamage()); + EntityFallingBlock entityfallingsand = new EntityFallingBlock(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 2F), (double) ((float) par4 + 0.5F), BlockUtils.getBlockFromItemStack(par5ItemStack), par5ItemStack.getItemDamage()); entityfallingsand.preventEntitySpawning = false; entityfallingsand.ticksExisted = 2; entityfallingsand.setVelocity(vec0, vec1, vec2); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index 1db2675b..f058534e 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -1,14 +1,10 @@ package tconstruct.mechworks.landmine.behavior; import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Item; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.world.World; /** diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java index 153f0ca6..485a4d07 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java @@ -1,13 +1,11 @@ package tconstruct.mechworks.landmine.behavior; import java.util.Random; - import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; @@ -41,8 +39,7 @@ public class BehaviorFirecharge extends Behavior { for (int j = par4 - 2; j <= (par4 + 2); j++) { - if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) - && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) + if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isReplaceable(par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) { par1World.setBlock(i, par3, j, Blocks.fire); } diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java index a62ee1ce..891fa2e0 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java @@ -23,8 +23,7 @@ public class BehaviorFirework extends Behavior for (int i = 0; i < par5ItemStack.stackSize; i++) { // TODO entity registration and stuffs - EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework(par1World, (double) par2, (double) par3, (double) par4, par5ItemStack, facing.ordinal()) - .setRider(i == 0 ? triggerer : null); + EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework(par1World, (double) par2, (double) par3, (double) par4, par5ItemStack, facing.ordinal()).setRider(i == 0 ? triggerer : null); par1World.spawnEntityInWorld(entityfireworkrocket); boolean shouldRun = true; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index 8dafdd97..56ab431f 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -1,15 +1,11 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import java.util.*; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.init.Items; -import net.minecraft.item.ItemPotion; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index b6af0fbf..f8409e41 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -1,11 +1,8 @@ package tconstruct.mechworks.landmine.behavior; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IProjectile; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityEnderPearl; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.entity.projectile.EntitySnowball; +import net.minecraft.entity.projectile.*; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java index 43db64dd..c97adced 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java @@ -1,14 +1,8 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import java.util.*; +import net.minecraft.enchantment.*; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 3d991474..8a67ca57 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -1,10 +1,7 @@ package tconstruct.mechworks.landmine.behavior; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemMonsterPlacer; -import net.minecraft.item.ItemStack; +import net.minecraft.entity.*; +import net.minecraft.item.*; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java index 6049f82f..b1b7cd87 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -1,7 +1,6 @@ package tconstruct.mechworks.landmine.behavior.stackCombo; import java.util.ArrayList; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 838dedfb..692b08b3 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -1,13 +1,9 @@ package tconstruct.mechworks.landmine.behavior.stackCombo; -import java.util.ArrayList; -import java.util.Random; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import java.util.*; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityFireball; -import net.minecraft.entity.projectile.EntityLargeFireball; +import net.minecraft.entity.projectile.*; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index f08fec9c..5cdc6ef1 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -1,8 +1,6 @@ package tconstruct.mechworks.logic; -import java.util.ArrayList; -import java.util.Iterator; - +import java.util.*; import mantle.world.WorldHelper; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index 5f7bcfb6..832c224d 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -1,8 +1,6 @@ package tconstruct.mechworks.logic; -import java.util.ArrayList; -import java.util.Iterator; - +import java.util.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index 91342e4e..9b7e1506 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -3,10 +3,8 @@ package tconstruct.mechworks.logic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.nbt.*; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; @@ -208,8 +206,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory @Override public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, - (double) this.zCoord + 0.5D) <= 64.0D; + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D; } @Override diff --git a/src/main/java/tconstruct/mechworks/model/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java index 829eb9eb..016efb00 100644 --- a/src/main/java/tconstruct/mechworks/model/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -1,19 +1,14 @@ package tconstruct.mechworks.model; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; - +import net.minecraft.util.*; import org.lwjgl.opengl.GL11; - import tconstruct.world.entity.CartEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CartRender extends Render diff --git a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java index f0fb9da8..9ca21fe0 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java +++ b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java @@ -1,7 +1,6 @@ package tconstruct.mechworks.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.*; import net.minecraft.entity.Entity; public class ModelPullcart extends ModelBase diff --git a/src/main/java/tconstruct/mechworks/model/ModelWagon.java b/src/main/java/tconstruct/mechworks/model/ModelWagon.java index 1cbe56e2..0bfedc59 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelWagon.java +++ b/src/main/java/tconstruct/mechworks/model/ModelWagon.java @@ -1,7 +1,6 @@ package tconstruct.mechworks.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.*; import net.minecraft.entity.Entity; public class ModelWagon extends ModelBase diff --git a/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java b/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java index 5ab4f6e7..ec09b8cd 100644 --- a/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java +++ b/src/main/java/tconstruct/modifiers/accessory/GloveClimb.java @@ -1,8 +1,8 @@ package tconstruct.modifiers.accessory; -import tconstruct.library.modifier.ItemModifier; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.modifier.ItemModifier; /* Adds a boolean NBTTag */ @@ -18,7 +18,7 @@ public class GloveClimb extends ItemModifier protected boolean canModify (ItemStack tool, ItemStack[] input) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("TinkerAccessory"); - return tags.getInteger("Modifiers") >= 3 && !tags.getBoolean(key); + return tags.getInteger("Modifiers") >= 3 && !tags.getBoolean(key); } @Override diff --git a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java index 10a418d2..dd5a8730 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java +++ b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java @@ -1,13 +1,9 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.ArmorCore; -import tconstruct.library.armor.ArmorMod; -import tconstruct.library.armor.ArmorPart; +import tconstruct.library.armor.*; /* Adds a boolean NBTTag */ @@ -39,7 +35,7 @@ public class AModBoolean extends ArmorMod @Override public void modify (ItemStack[] recipe, ItemStack input) { - NBTTagCompound tags =getModifierTag(input); + NBTTagCompound tags = getModifierTag(input); tags.setBoolean(key, true); diff --git a/src/main/java/tconstruct/modifiers/armor/AModInteger.java b/src/main/java/tconstruct/modifiers/armor/AModInteger.java index 32c62424..c3410039 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModInteger.java +++ b/src/main/java/tconstruct/modifiers/armor/AModInteger.java @@ -1,11 +1,9 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.ArmorMod; -import tconstruct.library.armor.ArmorPart; +import tconstruct.library.armor.*; /* Adds an integer NBTTag */ diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java index fdb16375..58146d29 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java +++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java @@ -1,11 +1,8 @@ package tconstruct.modifiers.armor; -import java.util.EnumSet; -import java.util.UUID; - +import java.util.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import tconstruct.library.armor.ArmorPart; public class AModLeadBoots extends AModBoolean @@ -29,7 +26,7 @@ public class AModLeadBoots extends AModBoolean armorTag.setInteger("Modifiers", modifiers); addToolTip(armor, color + tooltipName, color + key); - + NBTTagList attributes; if (baseTag.hasKey("AttributeModifiers")) { @@ -48,5 +45,6 @@ public class AModLeadBoots extends AModBoolean } attributes.appendTag(getAttributeTag("generic.knockbackResistance", key, 0.4, true, shoes)); } + private static final UUID shoes = UUID.fromString("4188779d-69d4-487c-b307-c4c182522c47"); } diff --git a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java index ad26545d..b4c3c4bb 100644 --- a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java +++ b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java @@ -3,15 +3,12 @@ package tconstruct.modifiers.armor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; -import tconstruct.library.armor.ArmorCore; -import tconstruct.library.armor.ArmorPart; -import tconstruct.library.modifier.ActiveArmorMod; -import tconstruct.library.modifier.IModifyable; +import tconstruct.library.armor.*; +import tconstruct.library.modifier.*; public class ActiveTinkerArmor extends ActiveArmorMod { @@ -27,7 +24,7 @@ public class ActiveTinkerArmor extends ActiveArmorMod { int current = tag.getInteger("Damage"); if (current > 0) - tag.setInteger("Damage", current-1); + tag.setInteger("Damage", current - 1); } } if (type == ArmorPart.Head) @@ -38,7 +35,7 @@ public class ActiveTinkerArmor extends ActiveArmorMod if (tag.getBoolean("Night Vision")) player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0, true)); } - + /*List list = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.addCoord(0.0D, 0.0D, 0.0D).expand(5.0D, 5.0D, 5.0D)); //TODO: Add modifier code for (int k = 0; k < list.size(); k++) { diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java index e303c2fc..eb98b068 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java @@ -1,17 +1,16 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.ArmorMod; -import tconstruct.library.armor.ArmorPart; +import tconstruct.library.armor.*; import tconstruct.library.modifier.IModifyable; public class TravelModDoubleJump extends ArmorMod { String color = "\u00a77"; String tooltipName = "Double-Jump"; + public TravelModDoubleJump(EnumSet armorTypes, ItemStack[] items) { super(0, "Double-Jump", armorTypes, items); @@ -45,7 +44,7 @@ public class TravelModDoubleJump extends ArmorMod addToolTip(input, color + tooltipName, color + key); } - + @Override protected int addToolTip (ItemStack tool, String tooltip, String modifierTip) { @@ -88,10 +87,10 @@ public class TravelModDoubleJump extends ArmorMod if (tag.contains("Quadruple-Jump")) return color + "Quintuple-Jump"; - + if (tag.contains("Quintuple-Jump")) return color + "Sextuple-Jump"; - + if (tag.contains("Sextuple-Jump")) return color + "Septuple-Jump"; diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java index d5ced402..47221e94 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java @@ -46,8 +46,6 @@ public class TravelModRepair extends ItemModifier } return false; } - - private int calculateIncrease (ItemStack tool, NBTTagCompound tags, int materialValue, int itemsUsed) { diff --git a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java index 5622b11e..7e835c39 100644 --- a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java +++ b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java @@ -1,8 +1,6 @@ package tconstruct.modifiers.tools; -import java.util.ArrayList; -import java.util.List; - +import java.util.*; import net.minecraft.item.ItemStack; import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index 5e617b01..a0efc37e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -23,7 +23,7 @@ public class ModAntiSpider extends ItemModTypeFilter if (!tags.hasKey(key)) return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; int keyPair[] = tags.getIntArray(key); diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java index b4529c43..92337b18 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -21,7 +21,7 @@ public class ModAttack extends ItemModTypeFilter threshold = 24; modifierType = "Tool"; } - + public ModAttack(String type, int effect, ItemStack[] items, int[] value, int max, int threshold, String modifierType) { super(effect, "ModAttack", items, value); @@ -41,7 +41,7 @@ public class ModAttack extends ItemModTypeFilter if (!validType(toolItem)) return false; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag(toolItem.getBaseTagName()); @@ -57,7 +57,7 @@ public class ModAttack extends ItemModTypeFilter } return false; } - + @Override public boolean validType (IModifyable input) { diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index b1b390a1..3ccc35c0 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -1,8 +1,6 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.List; - +import java.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; @@ -28,7 +26,7 @@ public class ModBlaze extends ItemModTypeFilter if (!validType(toolItem)) return false; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 63376a7b..b2fb3d7c 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -1,17 +1,10 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import tconstruct.library.tools.ToolCore; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; +import java.util.*; +import net.minecraft.enchantment.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; +import tconstruct.library.tools.ToolCore; public class ModButtertouch extends ModBoolean { diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index 02436a4a..4a0f367a 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -2,8 +2,7 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; +import tconstruct.library.modifier.*; public class ModExtraModifier extends ItemModifier { diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 6b1eaf35..1ebca93d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -1,13 +1,10 @@ package tconstruct.modifiers.tools; import cofh.api.energy.IEnergyContainerItem; - import java.util.ArrayList; - -import tconstruct.library.tools.ToolCore; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; /* TE3 support */ @@ -28,17 +25,17 @@ public class ModFlux extends ModBoolean ItemStack foundBattery = null; // try to find the battery in the input - for(ItemStack stack : input) - for(ItemStack battery : batteries) + for (ItemStack stack : input) + for (ItemStack battery : batteries) { - if(stack == null) + if (stack == null) continue; - if(stack.getItem() != battery.getItem()) + if (stack.getItem() != battery.getItem()) continue; - if(!(stack.getItem() instanceof IEnergyContainerItem)) + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; // we don't allow multiple batteries to be added - if(foundBattery != null) + if (foundBattery != null) return false; // battery found, gogogo @@ -46,20 +43,20 @@ public class ModFlux extends ModBoolean } // no battery present - if(foundBattery == null) + if (foundBattery == null) return false; // check if we already have a flux modifier - if(tags.getBoolean(key)) + if (tags.getBoolean(key)) { // only allow if it's an upgrade // remark: we use the ToolCores function here instead of accessing the tag directly, to achieve backwards compatibility with tools without tags. - int a = ((IEnergyContainerItem)foundBattery.getItem()).getMaxEnergyStored(foundBattery); - int b = ((ToolCore)tool.getItem()).getMaxEnergyStored(tool); - return ((IEnergyContainerItem)foundBattery.getItem()).getMaxEnergyStored(foundBattery) > ((ToolCore)tool.getItem()).getMaxEnergyStored(tool); + int a = ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery); + int b = ((ToolCore) tool.getItem()).getMaxEnergyStored(tool); + return ((IEnergyContainerItem) foundBattery.getItem()).getMaxEnergyStored(foundBattery) > ((ToolCore) tool.getItem()).getMaxEnergyStored(tool); } // otherwise check if we have enough modfiers - else if(tags.getInteger("Modifiers") < modifiersRequired) + else if (tags.getInteger("Modifiers") < modifiersRequired) return false; // all requirements satisfied! @@ -72,7 +69,8 @@ public class ModFlux extends ModBoolean NBTTagCompound tags = tool.getTagCompound(); // update modifiers (only applies if it's not an upgrade) - if(!tags.hasKey(key)) { + if (!tags.hasKey(key)) + { int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); modifiers -= modifiersRequired; tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); @@ -81,17 +79,16 @@ public class ModFlux extends ModBoolean tags.getCompoundTag("InfiTool").setBoolean(key, true); - // find the battery in the input ItemStack inputBattery = null; - for(ItemStack stack : input) - for(ItemStack battery : batteries) + for (ItemStack stack : input) + for (ItemStack battery : batteries) { - if(stack == null) + if (stack == null) continue; - if(stack.getItem() != battery.getItem()) + if (stack.getItem() != battery.getItem()) continue; - if(!(stack.getItem() instanceof IEnergyContainerItem)) + if (!(stack.getItem() instanceof IEnergyContainerItem)) continue; // we're guaranteed to only find one battery because more are prevented above @@ -99,13 +96,13 @@ public class ModFlux extends ModBoolean } // get the energy interface - IEnergyContainerItem energyContainer = (IEnergyContainerItem)inputBattery.getItem(); + IEnergyContainerItem energyContainer = (IEnergyContainerItem) inputBattery.getItem(); // set the charge values int charge = energyContainer.getEnergyStored(inputBattery); // add already present charge in the tool - if(tags.hasKey("Energy")) + if (tags.hasKey("Energy")) charge += tags.getInteger("Energy"); int maxCharge = energyContainer.getMaxEnergyStored(inputBattery); @@ -113,7 +110,8 @@ public class ModFlux extends ModBoolean int progress = 0, change = 1; // prevent endless loops with creative battery, blah // fill the battery full - while(progress < maxCharge && change > 0) { + while (progress < maxCharge && change > 0) + { change = energyContainer.receiveEnergy(subject42, 100000, false); progress += change; } @@ -123,8 +121,10 @@ public class ModFlux extends ModBoolean subject42 = inputBattery.copy(); // completely empty the battery - progress = 0; change = 1; - while(progress < maxCharge && change > 0) { + progress = 0; + change = 1; + while (progress < maxCharge && change > 0) + { change = energyContainer.extractEnergy(subject42, 100000, false); progress += change; } diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 5cab0239..941bc894 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -1,15 +1,9 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; +import java.util.*; +import net.minecraft.enchantment.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import tconstruct.library.tools.ToolCore; public class ModLapis extends ItemModTypeFilter @@ -32,7 +26,7 @@ public class ModLapis extends ItemModTypeFilter if (!validType(toolItem)) return false; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index 4905e4d2..8c54ede9 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -1,8 +1,6 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.List; - +import java.util.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; @@ -27,7 +25,7 @@ public class ModPiston extends ItemModTypeFilter if (!validType(toolItem)) return false; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 481bb570..aa5f5cd7 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -1,10 +1,7 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import java.util.*; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; @@ -28,7 +25,7 @@ public class ModRedstone extends ItemModTypeFilter if (!validType(toolItem)) return false; - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index 8bfa9ec3..c6c17e50 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -4,8 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; /* Little mod for actually adding the lapis modifier */ diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java index 9d6c829f..ee2b639f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModSmite.java +++ b/src/main/java/tconstruct/modifiers/tools/ModSmite.java @@ -19,7 +19,7 @@ public class ModSmite extends ItemModTypeFilter @Override protected boolean canModify (ItemStack tool, ItemStack[] input) { - if(matchingAmount(input) > max) + if (matchingAmount(input) > max) return false; NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java index 80fba45e..a78fff15 100644 --- a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java +++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java @@ -1,15 +1,11 @@ package tconstruct.plugins.ic2; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index 85650a32..408d7d3b 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -1,28 +1,21 @@ package tconstruct.plugins.imc; -import java.util.Arrays; -import java.util.List; - -import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import java.util.*; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; -import cpw.mods.fml.common.event.FMLInterModComms; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2") public class TinkerAE2 { - private static List spatialIOLogics = Arrays.asList( - "EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these? + private static List spatialIOLogics = Arrays.asList("EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these? "MultiServantLogic"); //TODO Should Mantle handle this? - private static List spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", - "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic"); + private static List spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic"); - private static List spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic", - "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic"); + private static List spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic", "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic"); @Handler public void init (FMLInitializationEvent event) @@ -32,18 +25,18 @@ public class TinkerAE2 addtoSpatialWhitelist("tconstruct.blocks.logic.DryingRackLogic"); addtoSpatialWhitelist("tconstruct.mechworks.logic.TileEntityLandmine"); - for(String s : spatialIOSmelteryLogics) + for (String s : spatialIOSmelteryLogics) { addtoSpatialWhitelist("tconstruct.smeltery.logic." + s); } - for(String s : spatialIOToolLogics) + for (String s : spatialIOToolLogics) { addtoSpatialWhitelist("tconstruct.tools.logic." + s); } } - public void addtoSpatialWhitelist(String teClass) + public void addtoSpatialWhitelist (String teClass) { FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", teClass); } diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java index 72de026e..94cb3895 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java @@ -1,13 +1,10 @@ package tconstruct.plugins.imc; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; @@ -16,7 +13,7 @@ import tconstruct.smeltery.TinkerSmeltery; public class TinkerBuildCraft { @Handler - public void init(FMLInitializationEvent event) + public void init (FMLInitializationEvent event) { TConstruct.logger.info("BuildCraft detected. Registering facades."); // Smeltery Blocks diff --git a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java index 798d8f99..514e4ac2 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java @@ -1,20 +1,16 @@ package tconstruct.plugins.imc; -import net.minecraft.nbt.NBTTagCompound; - -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; +import net.minecraft.nbt.NBTTagCompound; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft") public class TinkerMystcraft { - private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite", - "ender", "steel.molten", "platinum.molten" }; + private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite", "ender", "steel.molten", "platinum.molten" }; @Handler public void init (FMLInitializationEvent event) diff --git a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java index 4359b983..5403979e 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java @@ -1,13 +1,11 @@ package tconstruct.plugins.imc; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft", pulsesRequired = "Tinkers' World") diff --git a/src/main/java/tconstruct/plugins/mfr/Drinkables.java b/src/main/java/tconstruct/plugins/mfr/Drinkables.java index d978a881..f5925e88 100644 --- a/src/main/java/tconstruct/plugins/mfr/Drinkables.java +++ b/src/main/java/tconstruct/plugins/mfr/Drinkables.java @@ -1,9 +1,7 @@ package tconstruct.plugins.mfr; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; - +import net.minecraft.potion.*; import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler; public class Drinkables implements ILiquidDrinkHandler diff --git a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java index 027e4eef..267a70b5 100644 --- a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java @@ -1,16 +1,11 @@ package tconstruct.plugins.mfr; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import java.util.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - -import powercrystals.minefactoryreloaded.api.IFactoryGrindable; -import powercrystals.minefactoryreloaded.api.MobDrop; +import powercrystals.minefactoryreloaded.api.*; import tconstruct.tools.TinkerTools; public class GrindableHorse implements IFactoryGrindable diff --git a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java index be5ac46d..e0ad176a 100644 --- a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java @@ -1,17 +1,10 @@ package tconstruct.plugins.mfr; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Random; - +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; - -import powercrystals.minefactoryreloaded.api.HarvestType; -import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; +import powercrystals.minefactoryreloaded.api.*; public class HarvestableOreBerry implements IFactoryHarvestable { diff --git a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java index ff0c18b8..28c69f13 100644 --- a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java +++ b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java @@ -1,7 +1,6 @@ package tconstruct.plugins.mfr; -import powercrystals.minefactoryreloaded.api.FactoryRegistry; -import powercrystals.minefactoryreloaded.api.ValuedItem; +import powercrystals.minefactoryreloaded.api.*; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java index 942dc966..973eeb0e 100644 --- a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java +++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java @@ -2,8 +2,7 @@ package tconstruct.plugins.mfr; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/plugins/nei/NEICompat.java b/src/main/java/tconstruct/plugins/nei/NEICompat.java index 9417aa90..18e10360 100644 --- a/src/main/java/tconstruct/plugins/nei/NEICompat.java +++ b/src/main/java/tconstruct/plugins/nei/NEICompat.java @@ -1,10 +1,10 @@ package tconstruct.plugins.nei; -import tconstruct.tools.gui.CraftingStationGui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.common.FMLCommonHandler; -import codechicken.nei.recipe.DefaultOverlayHandler; import codechicken.nei.api.API; +import codechicken.nei.recipe.DefaultOverlayHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import tconstruct.tools.gui.CraftingStationGui; public class NEICompat { diff --git a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java index a9b5b355..86f27286 100644 --- a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java +++ b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java @@ -1,10 +1,9 @@ package tconstruct.plugins.nei; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; -import tconstruct.TConstruct; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers NEI Compatibility", description = "Tinkers Construct compatibility for NEI", modsRequired = "NotEnoughItems") diff --git a/src/main/java/tconstruct/plugins/te4/TE4Helper.java b/src/main/java/tconstruct/plugins/te4/TE4Helper.java index 3b86e130..3c1aa07f 100644 --- a/src/main/java/tconstruct/plugins/te4/TE4Helper.java +++ b/src/main/java/tconstruct/plugins/te4/TE4Helper.java @@ -1,11 +1,10 @@ package tconstruct.plugins.te4; +import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.event.FMLInterModComms; - /** * Taken from CoFHLib * @@ -14,9 +13,11 @@ import cpw.mods.fml.common.event.FMLInterModComms; public class TE4Helper { - public static void addFurnaceRecipe(int energy, ItemStack input, ItemStack output) { + public static void addFurnaceRecipe (int energy, ItemStack input, ItemStack output) + { - if (input == null || output == null) { + if (input == null || output == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -30,19 +31,23 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "FurnaceRecipe", toSend); } - public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput) { + public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput) + { addPulverizerRecipe(energy, input, primaryOutput, null, 0); } - public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { + public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) + { addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { + public static void addPulverizerRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) + { - if (input == null || primaryOutput == null || secondaryOutput == null) { + if (input == null || primaryOutput == null || secondaryOutput == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -60,19 +65,23 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "PulverizerRecipe", toSend); } - public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput) { + public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput) + { addSawmillRecipe(energy, input, primaryOutput, null, 0); } - public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) { + public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) + { addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100); } - public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) { + public static void addSawmillRecipe (int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) + { - if (input == null || primaryOutput == null || secondaryOutput == null) { + if (input == null || primaryOutput == null || secondaryOutput == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -90,20 +99,23 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend); } - public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) { + public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) + { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0); } - public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput) { + public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput) + { addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100); } - public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput, - int secondaryChance) { + public static void addSmelterRecipe (int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) + { - if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) { + if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -131,7 +143,8 @@ public class TE4Helper * * @param oreType */ - public static void addSmelterBlastOre(String oreType) { + public static void addSmelterBlastOre (String oreType) + { NBTTagCompound toSend = new NBTTagCompound(); @@ -140,9 +153,11 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "SmelterBlastOreType", toSend); } - public static void addCrucibleRecipe(int energy, ItemStack input, FluidStack output) { + public static void addCrucibleRecipe (int energy, ItemStack input, FluidStack output) + { - if (input == null || output == null) { + if (input == null || output == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -157,9 +172,11 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend); } - public static void addTransposerFill(int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) { + public static void addTransposerFill (int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) + { - if (input == null || output == null || fluid == null) { + if (input == null || output == null || fluid == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -177,9 +194,11 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend); } - public static void addTransposerExtract(int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) { + public static void addTransposerExtract (int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) + { - if (input == null || output == null || fluid == null) { + if (input == null || output == null || fluid == null) + { return; } NBTTagCompound toSend = new NBTTagCompound(); @@ -198,7 +217,8 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "TransposerExtractRecipe", toSend); } - public static void addMagmaticFuel(String fluidName, int energy) { + public static void addMagmaticFuel (String fluidName, int energy) + { NBTTagCompound toSend = new NBTTagCompound(); @@ -208,7 +228,8 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "MagmaticFuel", toSend); } - public static void addCompressionFuel(String fluidName, int energy) { + public static void addCompressionFuel (String fluidName, int energy) + { NBTTagCompound toSend = new NBTTagCompound(); @@ -218,7 +239,8 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "CompressionFuel", toSend); } - public static void addReactantFuel(String fluidName, int energy) { + public static void addReactantFuel (String fluidName, int energy) + { NBTTagCompound toSend = new NBTTagCompound(); @@ -228,7 +250,8 @@ public class TE4Helper FMLInterModComms.sendMessage("ThermalExpansion", "ReactantFuel", toSend); } - public static void addCoolant(String fluidName, int energy) { + public static void addCoolant (String fluidName, int energy) + { NBTTagCompound toSend = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java index 938fe557..f2db9f5e 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java +++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java @@ -1,14 +1,11 @@ package tconstruct.plugins.te4; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import net.minecraftforge.oredict.*; import tconstruct.TConstruct; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index b10f5341..82c2ea19 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -1,15 +1,11 @@ package tconstruct.plugins.waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; +import java.util.List; +import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.CastingBasinLogic; -import java.util.List; - public class BasinDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index df01b5f0..e444c761 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -1,16 +1,11 @@ package tconstruct.plugins.waila; import java.util.List; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; +import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.*; import tconstruct.smeltery.logic.CastingChannelLogic; public class CastingChannelDataProvider implements IWailaDataProvider diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index ff47d42b..e552f5e1 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -1,15 +1,11 @@ package tconstruct.plugins.waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; +import java.util.List; +import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.LavaTankLogic; -import java.util.List; - public class SearedTankDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index 04777414..e2db11dd 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -1,15 +1,11 @@ package tconstruct.plugins.waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; +import java.util.List; +import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import tconstruct.smeltery.logic.SmelteryLogic; -import java.util.List; - public class SmelteryDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index 54e59909..e50c05c5 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -1,13 +1,10 @@ package tconstruct.plugins.waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; +import java.util.List; +import mcp.mobius.waila.api.*; import net.minecraft.item.ItemStack; import tconstruct.smeltery.logic.CastingTableLogic; -import java.util.List; - public class TableDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 2cd8cb7d..55e0b1d1 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -1,10 +1,8 @@ package tconstruct.plugins.waila; -import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import cpw.mods.fml.common.event.FMLInterModComms; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index 7e1f6cc7..f2c73648 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -3,11 +3,8 @@ package tconstruct.plugins.waila; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; -import tconstruct.smeltery.blocks.LavaTankBlock; -import tconstruct.smeltery.blocks.SmelteryBlock; -import tconstruct.smeltery.logic.CastingBasinLogic; -import tconstruct.smeltery.logic.CastingChannelLogic; -import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.blocks.*; +import tconstruct.smeltery.logic.*; public class WailaRegistrar { diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index c5fd32a0..667b459e 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -1,10 +1,7 @@ package tconstruct.smeltery; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import tconstruct.library.tools.AbilityHelper; public class SmelteryDamageSource extends DamageSource @@ -36,7 +33,6 @@ public class SmelteryDamageSource extends DamageSource EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK(); String s = "death." + type + this.damageType; String s1 = s + ".player"; - return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] { par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_() }) - : new ChatComponentTranslation(s, new Object[] { par1EntityLiving.func_145748_c_() }); + return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] { par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_() }) : new ChatComponentTranslation(s, new Object[] { par1EntityLiving.func_145748_c_() }); } } diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java index 018e98b3..d84e22ab 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java @@ -1,48 +1,29 @@ package tconstruct.smeltery; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.client.registry.*; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.init.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.RenderBlockFluid; import tconstruct.armor.TinkerArmor; -import tconstruct.armor.modelblock.DryingRackRender; -import tconstruct.armor.modelblock.DryingRackSpecialRender; +import tconstruct.armor.modelblock.*; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.client.pages.BlockCastPage; import tconstruct.common.TProxyCommon; -import tconstruct.smeltery.gui.AdaptiveSmelteryGui; -import tconstruct.smeltery.gui.SmelteryGui; -import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; -import tconstruct.smeltery.logic.CastingBasinLogic; -import tconstruct.smeltery.logic.CastingTableLogic; -import tconstruct.smeltery.logic.SmelteryLogic; -import tconstruct.smeltery.model.BlockRenderCastingChannel; -import tconstruct.smeltery.model.CastingBasinSpecialRender; -import tconstruct.smeltery.model.CastingTableSpecialRenderer; -import tconstruct.smeltery.model.PaneConnectedRender; -import tconstruct.smeltery.model.PaneRender; -import tconstruct.smeltery.model.CastingBlockRender; -import tconstruct.smeltery.model.SmelteryRender; -import tconstruct.smeltery.model.TankAirRender; -import tconstruct.smeltery.model.TankRender; +import tconstruct.smeltery.gui.*; +import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.model.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; public class SmelteryProxyClient extends SmelteryProxyCommon -{ +{ @Override - public void initialize() + public void initialize () { registerRenderer(); registerGuiHandler(); @@ -50,8 +31,8 @@ public class SmelteryProxyClient extends SmelteryProxyCommon registerManualRecipes(); MinecraftForge.EVENT_BUS.register(this); } - - void registerRenderer() + + void registerRenderer () { RenderingRegistry.registerBlockHandler(new TankRender()); RenderingRegistry.registerBlockHandler(new TankAirRender()); @@ -69,8 +50,8 @@ public class SmelteryProxyClient extends SmelteryProxyCommon ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender()); ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender()); } - - void registerManualIcons() + + void registerManualIcons () { MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TinkerTools.manualBook, 1, 2)); MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TinkerSmeltery.smeltery)); @@ -82,17 +63,17 @@ public class SmelteryProxyClient extends SmelteryProxyCommon MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TinkerSmeltery.smeltery, 1, 2)); MantleClientRegistry.registerManualIcon("drain", new ItemStack(TinkerSmeltery.smeltery, 1, 1)); MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1)); - + MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TinkerSmeltery.buckets, 1, 16)); MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TinkerSmeltery.buckets, 1, 15)); MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TinkerSmeltery.buckets, 1, 25)); MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TinkerSmeltery.buckets, 1, 24)); MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TinkerSmeltery.buckets, 1, 23)); - + MProxyClient.registerManualPage("blockcast", BlockCastPage.class); } - - void registerManualRecipes() + + void registerManualRecipes () { ItemStack sand = new ItemStack(Blocks.sand, 1, 0); ItemStack gravel = new ItemStack(Blocks.gravel, 1, 0); @@ -107,29 +88,23 @@ public class SmelteryProxyClient extends SmelteryProxyCommon MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TinkerSmeltery.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, - searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TinkerArmor.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, - searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, - searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick, searedbrick, searedbrick); MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TinkerSmeltery.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, - searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, - null, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TinkerSmeltery.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); - MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, - searedbrick, searedbrick); + MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick); } - + @Override - protected void registerGuiHandler() + protected void registerGuiHandler () { TProxyCommon.registerClientGuiHandler(smelteryGuiID, this); TProxyCommon.registerServerGuiHandler(smelteryGuiID, this); diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java index 6c126e9a..152ab1c2 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java @@ -1,22 +1,22 @@ package tconstruct.smeltery; +import cpw.mods.fml.common.network.IGuiHandler; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tconstruct.common.TProxyCommon; -import cpw.mods.fml.common.network.IGuiHandler; public class SmelteryProxyCommon implements IGuiHandler { public static final int smelteryGuiID = 7; - - public void initialize() + + public void initialize () { - registerGuiHandler(); + registerGuiHandler(); } - - protected void registerGuiHandler() + + protected void registerGuiHandler () { TProxyCommon.registerServerGuiHandler(smelteryGuiID, this); } @@ -29,7 +29,7 @@ public class SmelteryProxyCommon implements IGuiHandler { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); } - + return null; } diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 1406f512..096974a5 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1,88 +1,33 @@ package tconstruct.smeltery; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import java.util.*; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.MultiServantLogic; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import mantle.pulsar.pulse.*; import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.block.material.*; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.oredict.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.FluidType; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.Smeltery; +import tconstruct.library.crafting.*; import tconstruct.library.util.IPattern; -import tconstruct.smeltery.blocks.BloodBlock; -import tconstruct.smeltery.blocks.CastingChannelBlock; -import tconstruct.smeltery.blocks.GlassBlockConnected; -import tconstruct.smeltery.blocks.GlassBlockConnectedMeta; -import tconstruct.smeltery.blocks.GlassPaneConnected; -import tconstruct.smeltery.blocks.GlassPaneStained; -import tconstruct.smeltery.blocks.GlueBlock; -import tconstruct.smeltery.blocks.GlueFluid; -import tconstruct.smeltery.blocks.LavaTankBlock; -import tconstruct.smeltery.blocks.PigIronMoltenBlock; -import tconstruct.smeltery.blocks.SearedBlock; -import tconstruct.smeltery.blocks.SearedSlab; -import tconstruct.smeltery.blocks.SmelteryBlock; -import tconstruct.smeltery.blocks.SpeedBlock; -import tconstruct.smeltery.blocks.SpeedSlab; -import tconstruct.smeltery.blocks.TConstructFluid; -import tconstruct.smeltery.blocks.TankAirBlock; -import tconstruct.smeltery.itemblocks.CastingChannelItem; -import tconstruct.smeltery.itemblocks.GlassBlockItem; -import tconstruct.smeltery.itemblocks.GlassPaneItem; -import tconstruct.smeltery.itemblocks.LavaTankItemBlock; -import tconstruct.smeltery.itemblocks.SearedSlabItem; -import tconstruct.smeltery.itemblocks.SearedTableItemBlock; -import tconstruct.smeltery.itemblocks.SmelteryItemBlock; -import tconstruct.smeltery.itemblocks.SpeedBlockItem; -import tconstruct.smeltery.itemblocks.SpeedSlabItem; -import tconstruct.smeltery.itemblocks.StainedGlassClearItem; -import tconstruct.smeltery.itemblocks.StainedGlassClearPaneItem; -import tconstruct.smeltery.items.FilledBucket; -import tconstruct.smeltery.items.MetalPattern; -import tconstruct.smeltery.logic.AdaptiveDrainLogic; -import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; -import tconstruct.smeltery.logic.CastingBasinLogic; -import tconstruct.smeltery.logic.CastingChannelLogic; -import tconstruct.smeltery.logic.CastingTableLogic; -import tconstruct.smeltery.logic.FaucetLogic; -import tconstruct.smeltery.logic.LavaTankLogic; -import tconstruct.smeltery.logic.SmelteryDrainLogic; -import tconstruct.smeltery.logic.SmelteryLogic; -import tconstruct.smeltery.logic.TankAirLogic; +import tconstruct.smeltery.blocks.*; +import tconstruct.smeltery.itemblocks.*; +import tconstruct.smeltery.items.*; +import tconstruct.smeltery.logic.*; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Smeltery", description = "Liquid metals, casting, and the multiblock structure.") @@ -226,8 +171,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenIronFluid.setBlock(TinkerSmeltery.moltenIron); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenIronFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 0), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 0), new ItemStack(Items.bucket))); TinkerSmeltery.moltenGoldFluid = new Fluid("gold.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isGoldPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenGoldFluid); @@ -246,8 +190,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenGoldFluid.setBlock(TinkerSmeltery.moltenGold); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenGoldFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGoldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 1), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGoldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 1), new ItemStack(Items.bucket))); TinkerSmeltery.moltenCopperFluid = new Fluid("copper.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isCopperPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenCopperFluid); @@ -266,8 +209,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenCopperFluid.setBlock(TinkerSmeltery.moltenCopper); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenCopperFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCopperFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 2), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCopperFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 2), new ItemStack(Items.bucket))); TinkerSmeltery.moltenTinFluid = new Fluid("tin.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isTinPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenTinFluid); @@ -286,8 +228,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenTinFluid.setBlock(TinkerSmeltery.moltenTin); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenTinFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenTinFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 3), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenTinFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 3), new ItemStack(Items.bucket))); TinkerSmeltery.moltenAluminumFluid = new Fluid("aluminum.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isAluminumPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenAluminumFluid); @@ -306,8 +247,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenAluminumFluid.setBlock(TinkerSmeltery.moltenAluminum); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenAluminumFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAluminumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 4), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAluminumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 4), new ItemStack(Items.bucket))); TinkerSmeltery.moltenCobaltFluid = new Fluid("cobalt.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isCobaltPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenCobaltFluid); @@ -326,8 +266,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenCobaltFluid.setBlock(TinkerSmeltery.moltenCobalt); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 5), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 5), new ItemStack(Items.bucket))); TinkerSmeltery.moltenArditeFluid = new Fluid("ardite.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isArditePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenArditeFluid); @@ -346,8 +285,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenArditeFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenArditeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 6), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenArditeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 6), new ItemStack(Items.bucket))); TinkerSmeltery.moltenBronzeFluid = new Fluid("bronze.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isBronzeFluid = !FluidRegistry.registerFluid(TinkerSmeltery.moltenBronzeFluid); @@ -366,8 +304,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenBronzeFluid.setBlock(TinkerSmeltery.moltenBronze); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 7), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 7), new ItemStack(Items.bucket))); TinkerSmeltery.moltenAlubrassFluid = new Fluid("aluminumbrass.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isAlubrassPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenAlubrassFluid); @@ -386,8 +323,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenAlubrassFluid.setBlock(TinkerSmeltery.moltenAlubrass); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 8), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 8), new ItemStack(Items.bucket))); TinkerSmeltery.moltenManyullynFluid = new Fluid("manyullyn.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isManyullynPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenManyullynFluid); @@ -406,8 +342,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenManyullynFluid.setBlock(TinkerSmeltery.moltenManyullyn); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 9), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 9), new ItemStack(Items.bucket))); TinkerSmeltery.moltenAlumiteFluid = new Fluid("alumite.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isAlumitePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenAlumiteFluid); @@ -426,8 +361,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenAlumiteFluid.setBlock(TinkerSmeltery.moltenAlumite); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 10), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 10), new ItemStack(Items.bucket))); TinkerSmeltery.moltenObsidianFluid = new Fluid("obsidian.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isObsidianPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenObsidianFluid); @@ -446,8 +380,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenObsidianFluid.setBlock(TinkerSmeltery.moltenObsidian); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 11), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 11), new ItemStack(Items.bucket))); TinkerSmeltery.moltenSteelFluid = new Fluid("steel.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isSteelPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenSteelFluid); @@ -466,8 +399,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenSteelFluid.setBlock(TinkerSmeltery.moltenSteel); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenSteelFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSteelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 12), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSteelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 12), new ItemStack(Items.bucket))); TinkerSmeltery.moltenGlassFluid = new Fluid("glass.molten").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isGlassPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenGlassFluid); @@ -486,8 +418,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenGlassFluid.setBlock(TinkerSmeltery.moltenGlass); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 13), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenGlassFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 13), new ItemStack(Items.bucket))); TinkerSmeltery.moltenStoneFluid = new Fluid("stone.seared").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isStonePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenStoneFluid); @@ -506,8 +437,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenStoneFluid.setBlock(TinkerSmeltery.moltenStone); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenStoneFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenStoneFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 14), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenStoneFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 14), new ItemStack(Items.bucket))); TinkerSmeltery.moltenEmeraldFluid = new Fluid("emerald.liquid").setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isEmeraldPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenEmeraldFluid); @@ -526,8 +456,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenEmeraldFluid.setBlock(TinkerSmeltery.moltenEmerald); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 15), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 15), new ItemStack(Items.bucket))); TinkerSmeltery.bloodFluid = new Fluid("blood").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isBloodPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.bloodFluid); @@ -546,8 +475,7 @@ public class TinkerSmeltery TinkerSmeltery.bloodFluid.setBlock(TinkerSmeltery.blood); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 16), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.bloodFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 16), new ItemStack(Items.bucket))); TinkerSmeltery.moltenNickelFluid = new Fluid("nickel.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isNickelPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenNickelFluid); @@ -566,8 +494,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenNickelFluid.setBlock(TinkerSmeltery.moltenNickel); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenNickelFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenNickelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 17), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenNickelFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 17), new ItemStack(Items.bucket))); TinkerSmeltery.moltenLeadFluid = new Fluid("lead.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isLeadPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenLeadFluid); @@ -586,8 +513,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenLeadFluid.setBlock(TinkerSmeltery.moltenLead); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenLeadFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenLeadFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 18), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenLeadFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 18), new ItemStack(Items.bucket))); TinkerSmeltery.moltenSilverFluid = new Fluid("silver.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isSilverPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenSilverFluid); @@ -606,8 +532,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenSilverFluid.setBlock(TinkerSmeltery.moltenSilver); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenSilverFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSilverFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 19), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenSilverFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 19), new ItemStack(Items.bucket))); TinkerSmeltery.moltenShinyFluid = new Fluid("platinum.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isShinyPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenShinyFluid); @@ -626,8 +551,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenShinyFluid.setBlock(TinkerSmeltery.moltenShiny); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenShinyFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenShinyFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 20), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenShinyFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 20), new ItemStack(Items.bucket))); TinkerSmeltery.moltenInvarFluid = new Fluid("invar.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isInvarPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenInvarFluid); @@ -646,8 +570,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenInvarFluid.setBlock(TinkerSmeltery.moltenInvar); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenInvarFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenInvarFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 21), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenInvarFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 21), new ItemStack(Items.bucket))); TinkerSmeltery.moltenElectrumFluid = new Fluid("electrum.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); boolean isElectrumPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenElectrumFluid); @@ -666,8 +589,7 @@ public class TinkerSmeltery TinkerSmeltery.moltenElectrumFluid.setBlock(TinkerSmeltery.moltenElectrum); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenElectrumFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenElectrumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 22), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenElectrumFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 22), new ItemStack(Items.bucket))); TinkerSmeltery.moltenEnderFluid = new Fluid("ender").setDensity(3000).setViscosity(6000); boolean isEnderPreReg = !FluidRegistry.registerFluid(TinkerSmeltery.moltenEnderFluid); @@ -686,14 +608,12 @@ public class TinkerSmeltery TinkerSmeltery.moltenEnderFluid.setBlock(TinkerSmeltery.moltenEnder); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 23), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEnderFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 23), new ItemStack(Items.bucket))); // Glue TinkerSmeltery.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); boolean isGluePreReg = !FluidRegistry.registerFluid(TinkerSmeltery.glueFluid); - TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep) - .setBlockName("liquid.glue"); + TinkerSmeltery.glueFluidBlock = new GlueFluid(TinkerSmeltery.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TinkerWorld.slimeStep).setBlockName("liquid.glue"); GameRegistry.registerBlock(TinkerSmeltery.glueFluidBlock, "liquid.glue"); if (isGluePreReg) { @@ -708,8 +628,7 @@ public class TinkerSmeltery TinkerSmeltery.glueFluid.setBlock(TinkerSmeltery.glueFluidBlock); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 25), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.glueFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 25), new ItemStack(Items.bucket))); // PigIron TinkerSmeltery.pigIronFluid = new Fluid("pigiron.molten").setDensity(3000).setViscosity(6000).setTemperature(1300); @@ -729,20 +648,10 @@ public class TinkerSmeltery TinkerSmeltery.pigIronFluid.setBlock(TinkerSmeltery.pigIronFluidBlock); } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(Items.bucket)) == null) - FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 26), new ItemStack( - Items.bucket))); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.pigIronFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 26), new ItemStack(Items.bucket))); - TinkerSmeltery.fluids = new Fluid[] { TinkerSmeltery.moltenIronFluid, TinkerSmeltery.moltenGoldFluid, TinkerSmeltery.moltenCopperFluid, TinkerSmeltery.moltenTinFluid, - TinkerSmeltery.moltenAluminumFluid, TinkerSmeltery.moltenCobaltFluid, TinkerSmeltery.moltenArditeFluid, TinkerSmeltery.moltenBronzeFluid, TinkerSmeltery.moltenAlubrassFluid, - TinkerSmeltery.moltenManyullynFluid, TinkerSmeltery.moltenAlumiteFluid, TinkerSmeltery.moltenObsidianFluid, TinkerSmeltery.moltenSteelFluid, TinkerSmeltery.moltenGlassFluid, - TinkerSmeltery.moltenStoneFluid, TinkerSmeltery.moltenEmeraldFluid, TinkerSmeltery.bloodFluid, TinkerSmeltery.moltenNickelFluid, TinkerSmeltery.moltenLeadFluid, - TinkerSmeltery.moltenSilverFluid, TinkerSmeltery.moltenShinyFluid, TinkerSmeltery.moltenInvarFluid, TinkerSmeltery.moltenElectrumFluid, TinkerSmeltery.moltenEnderFluid, - TinkerWorld.blueSlimeFluid, TinkerSmeltery.glueFluid, TinkerSmeltery.pigIronFluid }; - TinkerSmeltery.fluidBlocks = new Block[] { TinkerSmeltery.moltenIron, TinkerSmeltery.moltenGold, TinkerSmeltery.moltenCopper, TinkerSmeltery.moltenTin, TinkerSmeltery.moltenAluminum, - TinkerSmeltery.moltenCobalt, TinkerSmeltery.moltenArdite, TinkerSmeltery.moltenBronze, TinkerSmeltery.moltenAlubrass, TinkerSmeltery.moltenManyullyn, TinkerSmeltery.moltenAlumite, - TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, - TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, - TinkerSmeltery.moltenEnder, TinkerWorld.slimePool, TinkerSmeltery.glueFluidBlock, TinkerSmeltery.pigIronFluidBlock }; + TinkerSmeltery.fluids = new Fluid[] { TinkerSmeltery.moltenIronFluid, TinkerSmeltery.moltenGoldFluid, TinkerSmeltery.moltenCopperFluid, TinkerSmeltery.moltenTinFluid, TinkerSmeltery.moltenAluminumFluid, TinkerSmeltery.moltenCobaltFluid, TinkerSmeltery.moltenArditeFluid, TinkerSmeltery.moltenBronzeFluid, TinkerSmeltery.moltenAlubrassFluid, TinkerSmeltery.moltenManyullynFluid, TinkerSmeltery.moltenAlumiteFluid, TinkerSmeltery.moltenObsidianFluid, TinkerSmeltery.moltenSteelFluid, TinkerSmeltery.moltenGlassFluid, TinkerSmeltery.moltenStoneFluid, TinkerSmeltery.moltenEmeraldFluid, TinkerSmeltery.bloodFluid, TinkerSmeltery.moltenNickelFluid, TinkerSmeltery.moltenLeadFluid, TinkerSmeltery.moltenSilverFluid, TinkerSmeltery.moltenShinyFluid, TinkerSmeltery.moltenInvarFluid, TinkerSmeltery.moltenElectrumFluid, TinkerSmeltery.moltenEnderFluid, TinkerWorld.blueSlimeFluid, TinkerSmeltery.glueFluid, TinkerSmeltery.pigIronFluid }; + TinkerSmeltery.fluidBlocks = new Block[] { TinkerSmeltery.moltenIron, TinkerSmeltery.moltenGold, TinkerSmeltery.moltenCopper, TinkerSmeltery.moltenTin, TinkerSmeltery.moltenAluminum, TinkerSmeltery.moltenCobalt, TinkerSmeltery.moltenArdite, TinkerSmeltery.moltenBronze, TinkerSmeltery.moltenAlubrass, TinkerSmeltery.moltenManyullyn, TinkerSmeltery.moltenAlumite, TinkerSmeltery.moltenObsidian, TinkerSmeltery.moltenSteel, TinkerSmeltery.moltenGlass, TinkerSmeltery.moltenStone, TinkerSmeltery.moltenEmerald, TinkerSmeltery.blood, TinkerSmeltery.moltenNickel, TinkerSmeltery.moltenLead, TinkerSmeltery.moltenSilver, TinkerSmeltery.moltenShiny, TinkerSmeltery.moltenInvar, TinkerSmeltery.moltenElectrum, TinkerSmeltery.moltenEnder, TinkerWorld.slimePool, TinkerSmeltery.glueFluidBlock, TinkerSmeltery.pigIronFluidBlock }; FluidType.registerFluidType("Water", Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false); FluidType.registerFluidType("Iron", Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true); @@ -778,8 +687,7 @@ public class TinkerSmeltery TinkerSmeltery.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock"); TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass; TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false); - TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", - "blue", "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); + TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass; TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained(); @@ -831,8 +739,7 @@ public class TinkerSmeltery TinkerSmeltery.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); GameRegistry.registerItem(TinkerSmeltery.metalPattern, "metalPattern"); TConstructRegistry.addItemToDirectory("metalPattern", TinkerSmeltery.metalPattern); - String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", - "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; for (int i = 0; i < patternTypes.length; i++) { TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TinkerSmeltery.metalPattern, 1, i)); @@ -862,21 +769,18 @@ public class TinkerSmeltery String[] patSurround = { "###", "#m#", "###" }; // stained Glass Recipes - String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", - "dyeMagenta", "dyeOrange", "dyeWhite" }; + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; String color = ""; for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.clearGlass)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, TinkerSmeltery.clearGlass)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClear, 1, - Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClear, 1, Short.MAX_VALUE))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', TinkerSmeltery.glassPane)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, TinkerSmeltery.glassPane)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, - Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, i), color, new ItemStack(TinkerSmeltery.stainedGlassClearPane, 1, Short.MAX_VALUE))); } @@ -928,8 +832,7 @@ public class TinkerSmeltery public void addOreDictionarySmelteryRecipes () { - List exceptions = Arrays.asList(new FluidType[] { FluidType.getFluidType("Water"), FluidType.getFluidType("Stone"), FluidType.getFluidType("Ender"), - FluidType.getFluidType("Glass"), FluidType.getFluidType("Slime"), FluidType.getFluidType("Obsidian") }); + List exceptions = Arrays.asList(new FluidType[] { FluidType.getFluidType("Water"), FluidType.getFluidType("Stone"), FluidType.getFluidType("Ender"), FluidType.getFluidType("Glass"), FluidType.getFluidType("Slime"), FluidType.getFluidType("Obsidian") }); Iterator iter = FluidType.fluidTypes.entrySet().iterator(); while (iter.hasNext()) { @@ -1005,7 +908,7 @@ public class TinkerSmeltery // Compressed materials for (int i = 1; i <= 8; i++) { - Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.getFluidType("Stone"), 0, TConstruct.ingotLiquidValue / 18 * (int)Math.pow(9, i)); + Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.getFluidType("Stone"), 0, TConstruct.ingotLiquidValue / 18 * (int) Math.pow(9, i)); } Smeltery.addDictionaryMelting("compressedSand1x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9); Smeltery.addDictionaryMelting("compressedSand2x", FluidType.getFluidType("Glass"), 175, FluidContainerRegistry.BUCKET_VOLUME * 9 * 9); @@ -1044,10 +947,7 @@ public class TinkerSmeltery tableCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.glassPane), new FluidStack(TinkerSmeltery.moltenGlassFluid, 250), null, 80); // Metal toolpart casting - TinkerSmeltery.liquids = new FluidStack[] { new FluidStack(TinkerSmeltery.moltenIronFluid, 1), new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), - new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), - new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), - new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), new FluidStack(TinkerSmeltery.pigIronFluid, 1) }; + TinkerSmeltery.liquids = new FluidStack[] { new FluidStack(TinkerSmeltery.moltenIronFluid, 1), new FluidStack(TinkerSmeltery.moltenCopperFluid, 1), new FluidStack(TinkerSmeltery.moltenCobaltFluid, 1), new FluidStack(TinkerSmeltery.moltenArditeFluid, 1), new FluidStack(TinkerSmeltery.moltenManyullynFluid, 1), new FluidStack(TinkerSmeltery.moltenBronzeFluid, 1), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, 1), new FluidStack(TinkerSmeltery.moltenObsidianFluid, 1), new FluidStack(TinkerSmeltery.moltenSteelFluid, 1), new FluidStack(TinkerSmeltery.pigIronFluid, 1) }; int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; // ItemStack // damage // value @@ -1060,10 +960,8 @@ public class TinkerSmeltery { ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, iter + 1); - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), - new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), - new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { @@ -1087,21 +985,20 @@ public class TinkerSmeltery } ItemStack fullguardCast = new ItemStack(TinkerSmeltery.metalPattern, 1, 22); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, - 50); - tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, - 50); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(TinkerTools.fullGuard, 1, Short.MAX_VALUE), false, 50); // Golden Food Stuff FluidStack goldAmount = new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 8); tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50); tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50); tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50); - if(TinkerWorld.goldHead != null) + if (TinkerWorld.goldHead != null) tableCasting.addCastingRecipe(new ItemStack(TinkerWorld.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50); // Ensure TConstruct ingots are always first. Otherwise you might get ingots from other mods from casting - if(PHConstruct.tconComesFirst && TinkerTools.materials != null) { + if (PHConstruct.tconComesFirst && TinkerTools.materials != null) + { tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 9), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Copper tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 10), new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Tin tableCasting.addCastingRecipe(new ItemStack(TinkerTools.materials, 1, 11), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue), ingotcast, false, 50); //Aluminum @@ -1121,7 +1018,8 @@ public class TinkerSmeltery // Block Casting basinCasting.addCastingRecipe(new ItemStack(Blocks.iron_block), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); // Iron basinCasting.addCastingRecipe(new ItemStack(Blocks.gold_block), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); // gold - if(PHConstruct.tconComesFirst) { + if (PHConstruct.tconComesFirst) + { basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); // copper basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 5), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); // tin basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 6), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); // aluminum @@ -1137,11 +1035,9 @@ public class TinkerSmeltery basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.clearGlass, 1, 0), new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 4), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared // stone - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 5), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), - true, 100); + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 5), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Blocks.cobblestone), true, 100); basinCasting.addCastingRecipe(new ItemStack(Blocks.emerald_block), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640 * 9), null, true, 100); // emerald - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, - 100); // brownstone + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 1, 0), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Blocks.gravel), true, 100); // brownstone if (PHConstruct.craftEndstone) { basinCasting.addCastingRecipe(new ItemStack(Blocks.end_stone), new FluidStack(TinkerSmeltery.moltenEnderFluid, 50), new ItemStack(Blocks.obsidian), true, 100); @@ -1177,21 +1073,15 @@ public class TinkerSmeltery Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1000, 10); // register pyrotheum if it's present Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); - if(pyrotheum != null) + if (pyrotheum != null) Smeltery.addSmelteryFuel(pyrotheum, 1500, 9); // Alloy Smelting - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack( - TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack( - TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack( - TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), new FluidStack( - TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack( - TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, - TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenBronzeFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsBronzeAlloy)), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.nuggetLiquidValue)); // Bronze + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlubrassFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAluminumBrassAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 1)); // Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenAlumiteFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsAlumiteAlloy)), new FluidStack(TinkerSmeltery.moltenAluminumFluid, TConstruct.nuggetLiquidValue * 5), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.nuggetLiquidValue * 2)); // Alumite + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenManyullynFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsManyullynAlloy)), new FluidStack(TinkerSmeltery.moltenCobaltFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenArditeFluid, TConstruct.nuggetLiquidValue)); // Manyullyn + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.pigIronFluid, (int) (TConstruct.nuggetLiquidValue * PHConstruct.ingotsPigironAlloy)), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.nuggetLiquidValue), new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 640), new FluidStack(TinkerSmeltery.bloodFluid, 80)); // Pigiron Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), new FluidStack(FluidRegistry.LAVA, 1000), new FluidStack(FluidRegistry.WATER, 1000)); //Obsidian // Stone parts FluidType stone = FluidType.getFluidType("Stone"); @@ -1199,8 +1089,7 @@ public class TinkerSmeltery { if (TinkerTools.patternOutputs[sc] != null) { - Smeltery.addMelting(stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, - (8 * ((IPattern) TinkerTools.woodPattern).getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); + Smeltery.addMelting(stone, new ItemStack(TinkerTools.patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) TinkerTools.woodPattern).getPatternCost(new ItemStack(TinkerTools.woodPattern, 1, sc + 1))) / 2); } } @@ -1397,15 +1286,13 @@ public class TinkerSmeltery if (ores.size() > 0) { tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), - new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenInvarFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(TinkerSmeltery.moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenNickelFluid, TConstruct.ingotLiquidValue * 1)); // Invar } ores = OreDictionary.getOres("ingotElectrum"); if (ores.size() > 0) { tableCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); - Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue), - new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum + Smeltery.addAlloyMixing(new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue), new FluidStack(TinkerSmeltery.moltenSilverFluid, TConstruct.ingotLiquidValue)); // Electrum } ores = OreDictionary.getOres("blockNickel"); @@ -1444,14 +1331,14 @@ public class TinkerSmeltery if (ores.size() > 0) { basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.ingotLiquidValue), ores.get(0), true, 100); - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue/3), ores.get(0), true, 100); + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 9), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.ingotLiquidValue / 3), ores.get(0), true, 100); } ores = OreDictionary.getOres("compressedGravel2x"); // Higher won't save // properly if (ores.size() > 0) { basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenTinFluid, TConstruct.blockLiquidValue), ores.get(0), true, 100); - basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue/3), ores.get(0), true, 100); + basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.speedBlock, 81), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue / 3), ores.get(0), true, 100); } /* Rubber */ diff --git a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java index 60b1e870..f278362b 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java @@ -1,22 +1,19 @@ package tconstruct.smeltery; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.tools.AbilityHelper; -import tconstruct.smeltery.blocks.LiquidMetalFinite; -import tconstruct.smeltery.blocks.TankAirBlock; +import tconstruct.smeltery.blocks.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TinkerSmelteryEvents { @@ -37,7 +34,7 @@ public class TinkerSmelteryEvents } } } - + @SubscribeEvent public void bucketFill (FillBucketEvent evt) { diff --git a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java index 0b4ed925..63dd259e 100644 --- a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java @@ -1,10 +1,8 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.*; +import net.minecraft.potion.*; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index 3cd735ed..c3dc171c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -1,15 +1,12 @@ package tconstruct.smeltery.blocks; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingChannelLogic; @@ -66,7 +63,7 @@ public class CastingChannelBlock extends BlockContainer { return false; } - + @Override public boolean isOpaqueCube () { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index 6ea86bb3..41d3ca80 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -1,15 +1,13 @@ package tconstruct.smeltery.blocks; -import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.*; +import tconstruct.blocks.TConstructBlock; public class GlassBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index d4ec2b7a..b684fd66 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -1,17 +1,14 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index 35eb8ab8..dad1c225 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -1,18 +1,14 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index c9901fd4..9947fc9c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -1,13 +1,12 @@ package tconstruct.smeltery.blocks; -import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.blocks.TConstructBlock; public class GlassBlockStained extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 5c225538..40a6d2bf 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -1,20 +1,16 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class GlassPaneConnected extends GlassBlockConnected { @@ -39,8 +35,7 @@ public class GlassPaneConnected extends GlassBlockConnected { if (par5 == 0 || par5 == 1) { - return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] - : getSideTextureIndex(); + return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex(); } else { @@ -683,8 +678,7 @@ public class GlassPaneConnected extends GlassBlockConnected public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir) { - return canThisPaneConnectToThisBlock(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) - || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); + return canThisPaneConnectToThisBlock(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java index 790d1f16..9414ffb6 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java @@ -1,14 +1,12 @@ package tconstruct.smeltery.blocks; -import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import tconstruct.blocks.TConstructBlock; public class GlueBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java index ad946529..f1f87db2 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java @@ -1,17 +1,13 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.entity.*; +import net.minecraft.potion.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidFinite; -import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fluids.*; public class GlueFluid extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index ea3ec739..6e0a50f7 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -1,32 +1,25 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.iface.IServantLogic; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; 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.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.smeltery.model.TankRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LavaTankBlock extends BlockContainer { @@ -98,7 +91,8 @@ public class LavaTankBlock extends BlockContainer } @Override - public boolean canRenderInPass(int pass) { + public boolean canRenderInPass (int pass) + { TankRender.renderPass = pass; return true; } @@ -327,18 +321,19 @@ public class LavaTankBlock extends BlockContainer //Comparator @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride () + { return true; } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int comparatorSide) + public int getComparatorInputOverride (World world, int x, int y, int z, int comparatorSide) { return getTankLogic(world, x, y, z).comparatorStrength(); } - public static LavaTankLogic getTankLogic(IBlockAccess blockAccess, int par1, int par2, int par3) + public static LavaTankLogic getTankLogic (IBlockAccess blockAccess, int par1, int par2, int par3) { - return (LavaTankLogic)blockAccess.getTileEntity(par1, par2, par3); + return (LavaTankLogic) blockAccess.getTileEntity(par1, par2, par3); } } \ No newline at end of file diff --git a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index c3cbc864..eb9ead88 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -1,18 +1,14 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; +import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidFinite; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LiquidMetalFinite extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java index 9193d2a1..09e1e6ed 100644 --- a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -1,14 +1,11 @@ package tconstruct.smeltery.blocks; import java.util.List; - -import tconstruct.blocks.TConstructBlock; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; +import tconstruct.blocks.TConstructBlock; public class MetalOre extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index bbe580bf..4961f34a 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -1,25 +1,14 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockPane; import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import tconstruct.smeltery.model.PaneRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class PaneBase extends BlockStainedGlassPane { @@ -51,20 +40,21 @@ public class PaneBase extends BlockStainedGlassPane @Override @SideOnly(Side.CLIENT) - public IIcon func_149735_b(int p_149735_1_, int p_149735_2_) + public IIcon func_149735_b (int p_149735_1_, int p_149735_2_) { return icons[p_149735_2_]; } @Override @SideOnly(Side.CLIENT) - public IIcon func_150104_b(int p_150104_1_) + public IIcon func_150104_b (int p_150104_1_) { return sideIcons[p_150104_1_]; } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + public IIcon getIcon (int p_149691_1_, int p_149691_2_) + { return icons[p_149691_2_]; } @@ -91,7 +81,8 @@ public class PaneBase extends BlockStainedGlassPane } @Override - public int getRenderType() { + public int getRenderType () + { return PaneRender.model; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 844bd260..50641650 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -1,30 +1,23 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; 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.*; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.SmelteryEvent; import tconstruct.library.tools.AbilityHelper; -import tconstruct.smeltery.logic.CastingBasinLogic; -import tconstruct.smeltery.logic.CastingTableLogic; -import tconstruct.smeltery.logic.FaucetLogic; +import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.CastingBlockRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SearedBlock extends InventoryBlock { @@ -284,7 +277,7 @@ public class SearedBlock extends InventoryBlock float zMin = 0.25F; float zMax = 0.75F; - if(te instanceof FaucetLogic) + if (te instanceof FaucetLogic) { FaucetLogic logic = (FaucetLogic) te; switch (logic.getRenderDirection()) @@ -351,8 +344,7 @@ public class SearedBlock extends InventoryBlock break; } - return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, - (double) ((float) z + zMax)); + return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625, (double) ((float) z + zMax)); } } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index 16368d47..ff7146b3 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -1,18 +1,15 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - -import tconstruct.blocks.SlabBase; -import tconstruct.library.TConstructRegistry; -import tconstruct.smeltery.TinkerSmeltery; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.blocks.SlabBase; +import tconstruct.library.TConstructRegistry; +import tconstruct.smeltery.TinkerSmeltery; public class SearedSlab extends SlabBase { diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index 53d8d069..71094fd4 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -1,36 +1,25 @@ package tconstruct.smeltery.blocks; -import java.util.List; -import java.util.Random; - -import mantle.blocks.abstracts.InventoryBlock; -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import mantle.blocks.abstracts.*; +import mantle.blocks.iface.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.SmelteryProxyCommon; -import tconstruct.smeltery.logic.AdaptiveDrainLogic; -import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; -import tconstruct.smeltery.logic.SmelteryDrainLogic; -import tconstruct.smeltery.logic.SmelteryLogic; +import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.SmelteryRender; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SmelteryBlock extends InventoryBlock { @@ -65,8 +54,7 @@ public class SmelteryBlock extends InventoryBlock @Override public String[] getTextureNames () { - String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver", - "searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" }; + String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver", "searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" }; if (!texturePrefix.equals("")) for (int i = 0; i < textureNames.length; i++) @@ -334,13 +322,13 @@ public class SmelteryBlock extends InventoryBlock int meta = world.getBlockMetadata(x, y, z); if (meta == 0) { - if (PHConstruct.newSmeltery) + if (PHConstruct.newSmeltery) return 0; else return Container.calcRedstoneFromInventory(((SmelteryLogic) world.getTileEntity(x, y, z))); } if (meta == 1) - { + { if (PHConstruct.newSmeltery) return 0; else diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index ae3e1f63..9e8ea46c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -1,22 +1,17 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - -import tconstruct.blocks.TConstructBlock; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.blocks.TConstructBlock; public class SpeedBlock extends TConstructBlock { - public static String[] textureNames = new String[] { "brownstone_rough", "brownstone_rough_road", "brownstone_smooth", "brownstone_smooth_brick", "brownstone_smooth_road", - "brownstone_smooth_fancy", "brownstone_smooth_chiseled" }; + public static String[] textureNames = new String[] { "brownstone_rough", "brownstone_rough_road", "brownstone_smooth", "brownstone_smooth_brick", "brownstone_smooth_road", "brownstone_smooth_fancy", "brownstone_smooth_chiseled" }; public SpeedBlock() { diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index bc877477..9611c850 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -1,20 +1,17 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SpeedSlab extends SlabBase { diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index ddb8fc15..a26f160a 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -1,12 +1,10 @@ package tconstruct.smeltery.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.*; import tconstruct.library.TConstructRegistry; public class TConstructFluid extends BlockFluidClassic diff --git a/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java index bf2902b6..d6806244 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java @@ -1,24 +1,18 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; 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.*; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.smeltery.logic.TankAirLogic; import tconstruct.smeltery.model.TankAirRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TankAirBlock extends BlockContainer { diff --git a/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java b/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java index 0807313c..403c58d2 100644 --- a/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/smeltery/component/SmelteryComponent.java @@ -1,18 +1,14 @@ package tconstruct.smeltery.component; import java.util.ArrayList; - import mantle.world.CoordTuple; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import tconstruct.library.component.LogicComponent; -import tconstruct.library.component.MultiFluidTank; +import net.minecraftforge.fluids.*; +import tconstruct.library.component.*; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; diff --git a/src/main/java/tconstruct/smeltery/component/SmelteryScan.java b/src/main/java/tconstruct/smeltery/component/SmelteryScan.java index 784ba760..07df8302 100644 --- a/src/main/java/tconstruct/smeltery/component/SmelteryScan.java +++ b/src/main/java/tconstruct/smeltery/component/SmelteryScan.java @@ -1,14 +1,10 @@ package tconstruct.smeltery.component; -import java.util.ArrayList; -import java.util.Iterator; - +import java.util.*; import mantle.blocks.iface.IServantLogic; import mantle.world.CoordTuple; import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; import tconstruct.library.component.TankLayerScan; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/component/TankAirComponent.java b/src/main/java/tconstruct/smeltery/component/TankAirComponent.java index 3b1ac06d..0fe52b29 100644 --- a/src/main/java/tconstruct/smeltery/component/TankAirComponent.java +++ b/src/main/java/tconstruct/smeltery/component/TankAirComponent.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.component; import java.util.ArrayList; - import net.minecraftforge.fluids.FluidStack; import tconstruct.library.component.MultiFluidTank; diff --git a/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java index 1bcb8715..11436f66 100644 --- a/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/AdaptiveSmelteryGui.java @@ -1,34 +1,21 @@ package tconstruct.smeltery.gui; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import java.util.*; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - +import net.minecraftforge.fluids.*; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.TConstruct; import tconstruct.client.gui.NewContainerGui; import tconstruct.library.component.MultiFluidTank; import tconstruct.smeltery.component.SmelteryComponent; -import tconstruct.smeltery.inventory.ActiveContainer; -import tconstruct.smeltery.inventory.AdaptiveSmelteryContainer; +import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; public class AdaptiveSmelteryGui extends NewContainerGui diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 84f93ad6..e2db7634 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -1,29 +1,17 @@ package tconstruct.smeltery.gui; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import java.util.*; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - +import org.lwjgl.opengl.*; import tconstruct.TConstruct; import tconstruct.client.gui.NewContainerGui; -import tconstruct.smeltery.inventory.ActiveContainer; -import tconstruct.smeltery.inventory.SmelteryContainer; +import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; @@ -47,10 +35,11 @@ public class SmelteryGui extends NewContainerGui } @Override - public void initGui() { + public void initGui () + { super.initGui(); - if(logic != null) + if (logic != null) logic.updateFuelGague(); } @@ -347,7 +336,7 @@ public class SmelteryGui extends NewContainerGui boolean molten = false; String[] moltenNames = StatCollector.translateToLocal("gui.smeltery.molten.check").split(","); - for (int i = 0; i< moltenNames.length; i++) + for (int i = 0; i < moltenNames.length; i++) { if (fluidName.contains(moltenNames[i].trim())) { @@ -484,8 +473,7 @@ public class SmelteryGui extends NewContainerGui { fluidToBeBroughtUp = liquid.fluidID; - TConstruct.packetPipeline - .sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp)); + TConstruct.packetPipeline.sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp)); } } } diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index 0a6c2ec5..ae3e1b65 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -1,8 +1,6 @@ package tconstruct.smeltery.inventory; -import java.util.ArrayList; -import java.util.List; - +import java.util.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java index 8fc4bf45..9dd68115 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; public class ActiveSlot extends Slot { diff --git a/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java index 593c975a..059d4f43 100644 --- a/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/AdaptiveSmelteryContainer.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.inventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.smeltery.logic.AdaptiveSmelteryLogic; diff --git a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index 17941d6f..50121b77 100644 --- a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -1,8 +1,7 @@ package tconstruct.smeltery.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java index dba12320..ff1273cc 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java index f1de7409..ee4896ce 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java index e02f476f..b05fe80a 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index 5f6c6098..02845648 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -1,14 +1,14 @@ package tconstruct.smeltery.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.world.World; +import tconstruct.achievements.TAchievements; public class SmelteryItemBlock extends MultiItemBlock { @@ -43,4 +43,10 @@ public class SmelteryItemBlock extends MultiItemBlock break; } } + + @Override + public void onCreated (ItemStack item, World world, EntityPlayer player) + { + TAchievements.triggerAchievement(player, "tconstruct.smelteryMaker"); + } } diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java index 4e393358..f1577702 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +9,7 @@ import net.minecraft.util.StatCollector; public class SpeedBlockItem extends MultiItemBlock { - public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", - "brownstone.smooth.chiseled" }; + public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", "brownstone.smooth.chiseled" }; public SpeedBlockItem(Block b) { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java index 0f0201d4..a69e3a27 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java @@ -1,7 +1,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +9,7 @@ import net.minecraft.util.StatCollector; public class SpeedSlabItem extends MultiItemBlock { - public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", - "brownstone.smooth.chiseled" }; + public static final String blockTypes[] = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", "brownstone.smooth.brick", "brownstone.smooth.road", "brownstone.smooth.fancy", "brownstone.smooth.chiseled" }; public SpeedSlabItem(Block b) { diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index f2915b7a..2ba78553 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -1,25 +1,19 @@ package tconstruct.smeltery.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBucket; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.item.*; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FilledBucket extends ItemBucket { @@ -186,9 +180,7 @@ public class FilledBucket extends ItemBucket return getUnlocalizedName() + "." + materialNames[arr]; } - public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", - "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" }; + public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" }; - public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", - "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" }; + public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" }; } diff --git a/src/main/java/tconstruct/smeltery/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java index 58247630..3663cfd5 100644 --- a/src/main/java/tconstruct/smeltery/items/MetalPattern.java +++ b/src/main/java/tconstruct/smeltery/items/MetalPattern.java @@ -1,12 +1,9 @@ package tconstruct.smeltery.items; import java.util.List; - -import tconstruct.tools.items.Pattern; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; +import tconstruct.tools.items.Pattern; public class MetalPattern extends Pattern { @@ -27,8 +24,7 @@ public class MetalPattern extends Pattern return names; } - private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" }; + private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" }; @Override public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) diff --git a/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java index d23975d1..d070fc30 100644 --- a/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java @@ -1,20 +1,15 @@ package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; 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 net.minecraftforge.fluids.*; public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic// , ISwitchableMaster { diff --git a/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java index 2e289a29..c62049a0 100644 --- a/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/AdaptiveSmelteryLogic.java @@ -1,39 +1,25 @@ package tconstruct.smeltery.logic; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import java.util.*; import mantle.blocks.abstracts.AdaptiveInventoryLogic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; +import mantle.blocks.iface.*; import mantle.world.CoordTuple; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; 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 net.minecraftforge.fluids.*; import tconstruct.TConstruct; -import tconstruct.library.component.IComponentHolder; -import tconstruct.library.component.LogicComponent; -import tconstruct.library.component.MultiFluidTank; +import tconstruct.library.component.*; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.smeltery.component.SmelteryComponent; -import tconstruct.smeltery.component.SmelteryScan; +import tconstruct.smeltery.component.*; import tconstruct.smeltery.inventory.AdaptiveSmelteryContainer; public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder, IFluidHandler diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java index 2cb26989..06d48921 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java @@ -3,26 +3,18 @@ package tconstruct.smeltery.logic; import cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidEvent; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.library.crafting.CastingRecipe; -import tconstruct.library.event.SmelteryCastEvent; -import tconstruct.library.event.SmelteryCastedEvent; +import tconstruct.library.event.*; import tconstruct.library.util.IPattern; public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory @@ -80,7 +72,8 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (rec > 0) ret = rec; - else { + else + { if (inv != null && inv.getItem() instanceof IPattern) { int cost = ((IPattern) inv.getItem()).getPatternCost(inv); @@ -99,7 +92,8 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (capacity > 0) ret = capacity; - else { + else + { ItemStack inv = inventory[0]; if (inv != null && inv.getItem() instanceof IPattern) @@ -128,7 +122,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl SmelteryCastEvent event = new SmelteryCastEvent.CastingBasin(recipe, resource); MinecraftForge.EVENT_BUS.post(event); - if(event.getResult() == Event.Result.DENY) + if (event.getResult() == Event.Result.DENY) return 0; this.capacity = updateCapacity(recipe.castingMetal.amount); @@ -263,7 +257,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - if(liquid.getFluid() == resource.getFluid()) + if (liquid.getFluid() == resource.getFluid()) this.drain(resource.amount, doDrain); return null; } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index 62b09a1f..0225c421 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -1,24 +1,15 @@ package tconstruct.smeltery.logic; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Set; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; 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.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.*; import tconstruct.TConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * @author BluSunrize @@ -346,7 +337,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler return 0.5f; } - private void markDirtyForRendering() + private void markDirtyForRendering () { this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } diff --git a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java index 20d4ee65..3d7e05f0 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java @@ -3,26 +3,18 @@ package tconstruct.smeltery.logic; import cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidEvent; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.library.crafting.CastingRecipe; -import tconstruct.library.event.SmelteryCastEvent; -import tconstruct.library.event.SmelteryCastedEvent; +import tconstruct.library.event.*; import tconstruct.library.util.IPattern; public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory @@ -80,7 +72,8 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (rec > 0) ret = rec; - else { + else + { if (inv != null && inv.getItem() instanceof IPattern) { int cost = ((IPattern) inv.getItem()).getPatternCost(inv); @@ -99,7 +92,8 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (capacity > 0) ret = capacity; - else { + else + { ItemStack inv = inventory[0]; if (inv != null && inv.getItem() instanceof IPattern) @@ -128,7 +122,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl SmelteryCastEvent event = new SmelteryCastEvent.CastingTable(recipe, resource); MinecraftForge.EVENT_BUS.post(event); - if(event.getResult() == Event.Result.DENY) + if (event.getResult() == Event.Result.DENY) return 0; this.capacity = updateCapacity(recipe.castingMetal.amount); @@ -263,7 +257,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - if(liquid.getFluid() == resource.getFluid()) + if (liquid.getFluid() == resource.getFluid()) this.drain(resource.amount, doDrain); return null; } @@ -350,7 +344,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl inventory[0] = null; // if we just created a cast, move it to the first slot so we can use it directly afterwards - if(event.output != null && event.output.getItem() instanceof IPattern) + if (event.output != null && event.output.getItem() instanceof IPattern) { inventory[1] = inventory[0]; inventory[0] = event.output; diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index f335d134..56f80c84 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -1,18 +1,13 @@ package tconstruct.smeltery.logic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; 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 net.minecraftforge.fluids.*; import tconstruct.TConstruct; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler @@ -201,7 +196,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi if (!active) { active = true; - if(!activateFaucet()) + if (!activateFaucet()) active = false; } else diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index 141eaff2..41f789a1 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -1,19 +1,11 @@ package tconstruct.smeltery.logic; import mantle.blocks.abstracts.MultiServantLogic; -import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.*; public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { @@ -53,9 +45,9 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - if(tank.getFluidAmount() == 0) + if (tank.getFluidAmount() == 0) return null; - if(tank.getFluid().getFluid() != resource.getFluid()) + if (tank.getFluid().getFluid() != resource.getFluid()) return null; // same fluid, k @@ -190,7 +182,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler } } - public int comparatorStrength() + public int comparatorStrength () { return 15 * tank.getFluidAmount() / tank.getCapacity(); } diff --git a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java index 1022cdc6..9a50003b 100644 --- a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java @@ -1,8 +1,7 @@ package tconstruct.smeltery.logic; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 29ccf92e..58bc4f6b 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -5,15 +5,11 @@ import mantle.blocks.iface.IFacingLogic; import mantle.world.CoordTuple; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; 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 net.minecraftforge.fluids.*; public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { @@ -63,7 +59,8 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl if (hasValidMaster() && canDrain(from, resource.getFluid())) { SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); - if(resource.getFluid() == smeltery.getFluid().getFluid()) { + if (resource.getFluid() == smeltery.getFluid().getFluid()) + { return smeltery.drain(resource.amount, doDrain); } } @@ -190,7 +187,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl worldObj.func_147479_m(xCoord, yCoord, zCoord); } - public int comparatorStrength() + public int comparatorStrength () { CoordTuple master = this.getMasterPosition(); SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(master.x, master.y, master.z); diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 86ed4297..69afba8b 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -1,49 +1,29 @@ package tconstruct.smeltery.logic; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import mantle.blocks.abstracts.*; +import mantle.blocks.iface.*; import mantle.world.CoordTuple; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.monster.*; +import net.minecraft.entity.passive.*; +import net.minecraft.entity.player.*; import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.nbt.*; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.*; import tconstruct.library.crafting.Smeltery; -import tconstruct.smeltery.SmelteryDamageSource; -import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.smeltery.*; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.util.config.PHConstruct; @@ -158,8 +138,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(worldObj, (double) ((float) xCoord + jumpX + offsetX), (double) ((float) yCoord + jumpY), - (double) ((float) zCoord + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); + EntityItem entityitem = new EntityItem(worldObj, (double) ((float) xCoord + jumpX + offsetX), (double) ((float) yCoord + jumpY), (double) ((float) zCoord + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { @@ -256,7 +235,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public int getInternalTemperature () { - if(!validStructure) + if (!validStructure) return 20; return internalTemp; @@ -264,12 +243,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public int getTempForSlot (int slot) { - return activeTemps[slot]/10; + return activeTemps[slot] / 10; } public int getMeltingPointForSlot (int slot) { - return meltingTemps[slot]/10; + return meltingTemps[slot] / 10; } /* Updating */ @@ -312,7 +291,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci void detectEntities () { - if(centerPos == null) + if (centerPos == null) return; AxisAlignedBB box = AxisAlignedBB.getBoundingBox(centerPos.x, centerPos.y, centerPos.z, centerPos.x + 1.0D, centerPos.y + 1.0D, centerPos.z + 1.0D).expand(1.0D, 0.0D, 1.0D); @@ -437,8 +416,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { boolean hasUse = false; int temperature = this.getInternalTemperature(); - int speed = temperature/100; - int refTemp = temperature*10; + int speed = temperature / 100; + int refTemp = temperature * 10; for (int i = 0; i < 9 * layers; i++) { if (meltingTemps[i] > 200 && this.isStackInSlot(i)) @@ -529,7 +508,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci inUse = true; for (int i = 0; i < 9 * layers; i++) { - meltingTemps[i] = Smeltery.getLiquifyTemperature(inventory[i])*10; // temperatures are *10 for more progress control + meltingTemps[i] = Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more progress control } } @@ -668,10 +647,10 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } @SideOnly(Side.CLIENT) - public IIcon getFuelIcon() + public IIcon getFuelIcon () { - IIcon defaultLava = Blocks.lava.getIcon(0,0); - if(activeLavaTank == null) + IIcon defaultLava = Blocks.lava.getIcon(0, 0); + if (activeLavaTank == null) return defaultLava; TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); @@ -750,32 +729,27 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci Block eastBlock = worldObj.getBlock(x + 1, y, z); Block westBlock = worldObj.getBlock(x - 1, y, z); - if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) - && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) + if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) { checkValidStructure(x, y, z); } - else if ((northBlock != null && !worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) - && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) + else if ((northBlock != null && !worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) { checkValidStructure(x, y, z - 1); } - else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock != null && !worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) - && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) + else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock != null && !worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) { checkValidStructure(x, y, z + 1); } - else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock != null && !worldObj.isAirBlock(x + 1, y, z)) - && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) + else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock != null && !worldObj.isAirBlock(x + 1, y, z)) && (westBlock == null || worldObj.isAirBlock(x - 1, y, z))) { checkValidStructure(x - 1, y, z); } - else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) - && (westBlock != null && !worldObj.isAirBlock(x - 1, y, z))) + else if ((northBlock == null || worldObj.isAirBlock(x, y, z + 1)) && (southBlock == null || worldObj.isAirBlock(x, y, z - 1)) && (eastBlock == null || worldObj.isAirBlock(x + 1, y, z)) && (westBlock != null && !worldObj.isAirBlock(x - 1, y, z))) { checkValidStructure(x + 1, y, z); } @@ -802,16 +776,16 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { // try to derive temperature from fueltank activeLavaTank = null; - for(CoordTuple tank : lavaTanks) + for (CoordTuple tank : lavaTanks) { TileEntity tankContainer = worldObj.getTileEntity(tank.x, tank.y, tank.z); - if(!(tankContainer instanceof IFluidHandler)) + if (!(tankContainer instanceof IFluidHandler)) continue; FluidStack liquid = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN)[0].fluid; - if(liquid == null) + if (liquid == null) return; - if(!Smeltery.isSmelteryFuel(liquid.getFluid())) + if (!Smeltery.isSmelteryFuel(liquid.getFluid())) continue; internalTemp = Smeltery.getFuelPower(liquid.getFluid()); @@ -820,7 +794,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } // no tank with fuel. we reserve the first found one - if(activeLavaTank == null) + if (activeLavaTank == null) activeLavaTank = lavaTanks.get(0); // update other stuff diff --git a/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java b/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java index c112dd70..099bc4cd 100644 --- a/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/TankAirLogic.java @@ -1,19 +1,14 @@ package tconstruct.smeltery.logic; -import java.util.ArrayList; -import java.util.List; - +import java.util.*; import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; +import mantle.blocks.iface.*; import mantle.world.CoordTuple; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java b/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java index 8ec7faa6..4bcdd316 100644 --- a/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/TowerFurnaceLogic.java @@ -1,9 +1,7 @@ package tconstruct.smeltery.logic; import mantle.blocks.abstracts.AdaptiveInventoryLogic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.*; //Not actually abstract public abstract class TowerFurnaceLogic extends AdaptiveInventoryLogic implements IActiveLogic, IFacingLogic, IMasterLogic diff --git a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index 37fb78fe..3c7d4cae 100644 --- a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -1,22 +1,15 @@ package tconstruct.smeltery.model; +import cpw.mods.fml.client.registry.*; import java.util.Set; - import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; 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.*; import org.lwjgl.opengl.GL11; - import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.CastingChannelLogic; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index 0326db8c..3422cb1f 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -1,19 +1,14 @@ package tconstruct.smeltery.model; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; +import cpw.mods.fml.relauncher.*; +import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; - import org.lwjgl.opengl.GL11; - import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.logic.CastingBasinLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java index 4ae5900b..ef8e327a 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java @@ -1,5 +1,6 @@ package tconstruct.smeltery.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; @@ -9,12 +10,8 @@ import tconstruct.TConstruct; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.CastingRecipe; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.smeltery.logic.CastingBasinLogic; -import tconstruct.smeltery.logic.CastingTableLogic; -import tconstruct.smeltery.logic.FaucetLogic; +import tconstruct.smeltery.logic.*; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class CastingBlockRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index 7558d1eb..d8ac180d 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -1,19 +1,14 @@ package tconstruct.smeltery.model; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; +import cpw.mods.fml.relauncher.*; +import net.minecraft.client.renderer.entity.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; - import org.lwjgl.opengl.GL11; - import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.logic.CastingTableLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index 773010f5..1e574ebd 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -1,16 +1,13 @@ package tconstruct.smeltery.model; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.WEST; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import tconstruct.smeltery.blocks.GlassPaneConnected; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; + +import static net.minecraftforge.common.util.ForgeDirection.*; public class PaneConnectedRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java index 22a47c89..c1395e61 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -1,17 +1,10 @@ package tconstruct.smeltery.model; -import mantle.world.WorldHelper; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.smeltery.blocks.PaneBase; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class PaneRender implements ISimpleBlockRenderingHandler { @@ -33,7 +26,7 @@ public class PaneRender implements ISimpleBlockRenderingHandler if (modelID == model) { //renderer.setOverrideBlockTexture(((PaneBase)block).getIcon(0, world.getBlockMetadata(x,y,z))); - return renderer.renderBlockStainedGlassPane(block, x,y,z); + return renderer.renderBlockStainedGlassPane(block, x, y, z); //return renderPaneInWorld(renderer, world, x, y, z, (PaneBase) block); } diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index 74512141..bd5aa438 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -1,18 +1,16 @@ package tconstruct.smeltery.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.*; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class SmelteryRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/TankAirRender.java b/src/main/java/tconstruct/smeltery/model/TankAirRender.java index 67164738..a4c31aca 100644 --- a/src/main/java/tconstruct/smeltery/model/TankAirRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankAirRender.java @@ -1,17 +1,14 @@ package tconstruct.smeltery.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.TankAirLogic; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class TankAirRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java index 4007e71d..8fa562a4 100644 --- a/src/main/java/tconstruct/smeltery/model/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -1,20 +1,15 @@ package tconstruct.smeltery.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - +import net.minecraftforge.fluids.*; import org.lwjgl.opengl.GL11; - import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class TankRender implements ISimpleBlockRenderingHandler { @@ -41,9 +36,11 @@ public class TankRender implements ISimpleBlockRenderingHandler if (modelID == tankModelID) { //Liquid - if(renderPass == 0) { + if (renderPass == 0) + { LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); - if (logic.containsFluid()) { + if (logic.containsFluid()) + { FluidStack liquid = logic.tank.getFluid(); renderer.setRenderBounds(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); Fluid fluid = liquid.getFluid(); @@ -53,9 +50,11 @@ public class TankRender implements ISimpleBlockRenderingHandler } } //Block - else { + else + { int meta = world.getBlockMetadata(x, y, z); - if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { + if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air) + { renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderer.renderStandardBlock(block, x, y + 1, z); } diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java index 2ba58db2..cbf506a6 100644 --- a/src/main/java/tconstruct/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java @@ -1,26 +1,18 @@ package tconstruct.tools; import java.util.Random; - import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.enchantment.*; +import net.minecraft.entity.*; +import net.minecraft.entity.item.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.library.ActiveToolMod; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; @@ -59,11 +51,11 @@ public class TActiveOmniMod extends ActiveToolMod TinkerTools.modLapis.midStreamModify(stack, tool); if (autoSmelt(tool, tags, stack, x, y, z, entity)) return true; - + return false; } - - private boolean autoSmelt(ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) + + private boolean autoSmelt (ToolCore tool, NBTTagCompound tags, ItemStack stack, int x, int y, int z, EntityLivingBase entity) { World world = entity.worldObj; Block block = world.getBlock(x, y, z); @@ -79,7 +71,7 @@ public class TActiveOmniMod extends ActiveToolMod Item item = block.getItemDropped(meta, random, EnchantmentHelper.getFortuneModifier(entity)); // apparently some things that don't drop blocks (like glass panes without silktouch) return null. - if(item == null) + if (item == null) return false; ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(item, amount, meta)); @@ -90,7 +82,7 @@ public class TActiveOmniMod extends ActiveToolMod tool.onBlockDestroyed(stack, world, block, x, y, z, entity); if (!world.isRemote) { - ItemStack spawnme = new ItemStack(result.getItem(), amount*result.stackSize, result.getItemDamage()); + ItemStack spawnme = new ItemStack(result.getItem(), amount * result.stackSize, result.getItemDamage()); if (result.hasTagCompound()) spawnme.setTagCompound(result.getTagCompound()); if (!(result.getItem() instanceof ItemBlock) && PHConstruct.lavaFortuneInteraction) diff --git a/src/main/java/tconstruct/tools/TDispenserBehaviorArrow.java b/src/main/java/tconstruct/tools/TDispenserBehaviorArrow.java index 9ba981e6..917020e6 100644 --- a/src/main/java/tconstruct/tools/TDispenserBehaviorArrow.java +++ b/src/main/java/tconstruct/tools/TDispenserBehaviorArrow.java @@ -1,9 +1,7 @@ package tconstruct.tools; import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.dispenser.IPosition; +import net.minecraft.dispenser.*; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -25,8 +23,7 @@ public class TDispenserBehaviorArrow extends BehaviorDefaultDispenseItem ArrowEntity projectile = new ArrowEntity(world, iposition.getX(), iposition.getY(), iposition.getZ(), arrowItem); projectile.canBePickedUp = 1; - projectile.setThrowableHeading((double) enumfacing.getFrontOffsetX(), (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), (double) enumfacing.getFrontOffsetZ(), this.func_82500_b(), - this.func_82498_a()); + projectile.setThrowableHeading((double) enumfacing.getFrontOffsetX(), (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), (double) enumfacing.getFrontOffsetZ(), this.func_82500_b(), this.func_82498_a()); world.spawnEntityInWorld(projectile); return stack; diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index 391a647f..ecb5d4e7 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -1,25 +1,19 @@ package tconstruct.tools; -import mantle.blocks.BlockUtils; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import java.util.List; +import net.minecraft.entity.*; +import net.minecraft.entity.monster.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; -import net.minecraft.util.Vec3; -import net.minecraftforge.event.entity.living.LivingAttackEvent; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.oredict.OreDictionary; +import net.minecraft.util.*; +import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.oredict.*; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; @@ -28,11 +22,6 @@ import tconstruct.library.event.*; import tconstruct.library.tools.*; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; - -import java.util.List; public class TinkerToolEvents { @@ -55,18 +44,20 @@ public class TinkerToolEvents } @SubscribeEvent - public void buildTool(ToolBuildEvent event) + public void buildTool (ToolBuildEvent event) { // check if the handle is a bone - if(event.handleStack.getItem() == Items.bone) { + if (event.handleStack.getItem() == Items.bone) + { event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 5); // bone tool rod return; } // check if the handle is a stick List sticks = OreDictionary.getOres("stickWood"); - for(ItemStack stick : sticks) - if (OreDictionary.itemMatches(stick, event.handleStack, false)) { + for (ItemStack stick : sticks) + if (OreDictionary.itemMatches(stick, event.handleStack, false)) + { event.handleStack = new ItemStack(TinkerTools.toolRod, 1, 0); // wooden tool rod return; } @@ -152,7 +143,7 @@ public class TinkerToolEvents } } - private void handlePaper(NBTTagCompound toolTag, ToolCore tool) + private void handlePaper (NBTTagCompound toolTag, ToolCore tool) { int modifiers = toolTag.getInteger("Modifiers"); if (toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) @@ -165,13 +156,13 @@ public class TinkerToolEvents modifiers++; // 2 part tools gain 2 modifiers for the head - if(tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) + if (tool.getPartAmount() == 2 && toolTag.getInteger("Head") == TinkerTools.MaterialID.Paper) modifiers++; toolTag.setInteger("Modifiers", modifiers); } - private void handleThaumium(NBTTagCompound toolTag, ToolCore tool) + private void handleThaumium (NBTTagCompound toolTag, ToolCore tool) { // count thaumic parts int thaum = 0; @@ -185,10 +176,10 @@ public class TinkerToolEvents thaum++; // each part gives 0.5 modifiers, rounded up - int bonusModifiers = (int) Math.ceil((double)thaum/2d); + int bonusModifiers = (int) Math.ceil((double) thaum / 2d); // 2-part tools get 1 modifier per part - if(tool.getPartAmount() == 2) + if (tool.getPartAmount() == 2) bonusModifiers = thaum; int modifiers = toolTag.getInteger("Modifiers"); @@ -244,14 +235,13 @@ public class TinkerToolEvents { FletchingMaterial mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchingMaterial.class); // maybe it's a leaf fletchling - if(mat == null) + if (mat == null) mat = (FletchingMaterial) TConstructRegistry.getCustomMaterial(stack, FletchlingLeafMaterial.class); if (mat != null) return mat.craftingItem.copy(); return null; } - @SubscribeEvent public void onAttack (LivingAttackEvent event) { @@ -300,7 +290,7 @@ public class TinkerToolEvents else { Entity attacker = source.getEntity(); - if(attacker != null) + if (attacker != null) { attacker.attackEntityFrom(DamageSource.causeThornsDamage(player), event.ammount); } @@ -309,7 +299,7 @@ public class TinkerToolEvents } } } - + @SubscribeEvent public void onLivingDrop (LivingDropsEvent event) { @@ -427,7 +417,7 @@ public class TinkerToolEvents } } } - + @SubscribeEvent public void registerOre (OreRegisterEvent evt) { diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 68272339..961455bd 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -1,107 +1,41 @@ package tconstruct.tools; -import cpw.mods.fml.common.SidedProxy; -import mantle.items.abstracts.CraftingItem; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; - -import static net.minecraft.util.EnumChatFormatting.*; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.oredict.*; import tconstruct.TConstruct; +import tconstruct.achievements.items.CraftAchievementItem; import tconstruct.common.itemblocks.MetadataItemBlock; -import tconstruct.items.tools.Arrow; -import tconstruct.items.tools.BattleSign; -import tconstruct.items.tools.Battleaxe; -import tconstruct.items.tools.Broadsword; -import tconstruct.items.tools.Chisel; -import tconstruct.items.tools.Cleaver; -import tconstruct.items.tools.Cutlass; -import tconstruct.items.tools.Dagger; -import tconstruct.items.tools.Excavator; -import tconstruct.items.tools.FryingPan; -import tconstruct.items.tools.Hammer; -import tconstruct.items.tools.Hatchet; -import tconstruct.items.tools.Longsword; -import tconstruct.items.tools.LumberAxe; -import tconstruct.items.tools.Mattock; -import tconstruct.items.tools.Pickaxe; -import tconstruct.items.tools.PotionLauncher; -import tconstruct.items.tools.Rapier; -import tconstruct.items.tools.Scythe; -import tconstruct.items.tools.Shortbow; -import tconstruct.items.tools.Shovel; +import tconstruct.items.tools.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.*; -import tconstruct.library.tools.FletchlingLeafMaterial; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.tools.ModAntiSpider; -import tconstruct.modifiers.tools.ModAttack; -import tconstruct.modifiers.tools.ModAutoSmelt; -import tconstruct.modifiers.tools.ModBlaze; -import tconstruct.modifiers.tools.ModButtertouch; -import tconstruct.modifiers.tools.ModCreativeToolModifier; -import tconstruct.modifiers.tools.ModDurability; -import tconstruct.modifiers.tools.ModExtraModifier; -import tconstruct.modifiers.tools.ModFlux; -import tconstruct.modifiers.tools.ModInteger; -import tconstruct.modifiers.tools.ModLapis; -import tconstruct.modifiers.tools.ModPiston; -import tconstruct.modifiers.tools.ModRedstone; -import tconstruct.modifiers.tools.ModReinforced; -import tconstruct.modifiers.tools.ModSmite; -import tconstruct.modifiers.tools.ModToolRepair; +import tconstruct.modifiers.tools.*; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.blocks.CraftingSlab; -import tconstruct.tools.blocks.CraftingStationBlock; -import tconstruct.tools.blocks.EquipBlock; -import tconstruct.tools.blocks.FurnaceSlab; -import tconstruct.tools.blocks.ToolForgeBlock; -import tconstruct.tools.blocks.ToolStationBlock; -import tconstruct.tools.itemblocks.CraftingSlabItemBlock; -import tconstruct.tools.itemblocks.ToolStationItemBlock; -import tconstruct.tools.items.Bowstring; -import tconstruct.tools.items.CreativeModifier; -import tconstruct.tools.items.Fletching; -import tconstruct.tools.items.Manual; -import tconstruct.tools.items.MaterialItem; -import tconstruct.tools.items.Pattern; -import tconstruct.tools.items.TitleIcon; -import tconstruct.tools.items.ToolPart; -import tconstruct.tools.items.ToolPartHidden; -import tconstruct.tools.items.ToolShard; -import tconstruct.tools.logic.CraftingStationLogic; -import tconstruct.tools.logic.FrypanLogic; -import tconstruct.tools.logic.FurnaceLogic; -import tconstruct.tools.logic.PartBuilderLogic; -import tconstruct.tools.logic.PatternChestLogic; -import tconstruct.tools.logic.StencilTableLogic; -import tconstruct.tools.logic.ToolForgeLogic; -import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.blocks.*; +import tconstruct.tools.itemblocks.*; +import tconstruct.tools.items.*; +import tconstruct.tools.logic.*; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SoilBlock; import tconstruct.world.itemblocks.CraftedSoilItemBlock; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +import static net.minecraft.util.EnumChatFormatting.*; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Tools", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.") @@ -190,12 +124,12 @@ public class TinkerTools // recipe stuff public static boolean thaumcraftAvailable; - + @Handler public void preInit (FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new TinkerToolEvents()); - + //Blocks TinkerTools.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation"); TinkerTools.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge"); @@ -211,7 +145,7 @@ public class TinkerTools TinkerTools.craftedSoil = new SoilBlock().setLightOpacity(0).setBlockName("TConstruct.Soil"); TinkerTools.craftedSoil.stepSound = Block.soundTypeGravel; - + GameRegistry.registerBlock(TinkerTools.toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); @@ -228,12 +162,12 @@ public class TinkerTools GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); GameRegistry.registerBlock(TinkerTools.craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); - + //Items TinkerTools.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TinkerTools.titleIcon, "titleIcon"); String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - TinkerTools.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern"); + TinkerTools.blankPattern = new CraftAchievementItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab, "tconstruct.pattern").setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TinkerTools.blankPattern, "blankPattern"); TinkerTools.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); @@ -245,8 +179,7 @@ public class TinkerTools TConstructRegistry.addItemToDirectory("blankPattern", TinkerTools.blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", TinkerTools.woodPattern); - String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", - "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; for (int i = 1; i < patternTypes.length; i++) { @@ -255,7 +188,6 @@ public class TinkerTools TinkerTools.manualBook = new Manual(); GameRegistry.registerItem(TinkerTools.manualBook, "manualBook"); - TinkerTools.pickaxe = new Pickaxe(); TinkerTools.shovel = new Shovel(); @@ -281,10 +213,8 @@ public class TinkerTools TinkerTools.shortbow = new Shortbow(); TinkerTools.arrow = new Arrow(); - Item[] tools = { TinkerTools.pickaxe, TinkerTools.shovel, TinkerTools.hatchet, TinkerTools.broadsword, TinkerTools.longsword, TinkerTools.rapier, TinkerTools.dagger, TinkerTools.cutlass, TinkerTools.frypan, TinkerTools.battlesign, TinkerTools.mattock, - TinkerTools.chisel, TinkerTools.lumberaxe, TinkerTools.cleaver, TinkerTools.scythe, TinkerTools.excavator, TinkerTools.hammer, TinkerTools.battleaxe, TinkerTools.shortbow, TinkerTools.arrow }; - String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", - "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; + Item[] tools = { TinkerTools.pickaxe, TinkerTools.shovel, TinkerTools.hatchet, TinkerTools.broadsword, TinkerTools.longsword, TinkerTools.rapier, TinkerTools.dagger, TinkerTools.cutlass, TinkerTools.frypan, TinkerTools.battlesign, TinkerTools.mattock, TinkerTools.chisel, TinkerTools.lumberaxe, TinkerTools.cleaver, TinkerTools.scythe, TinkerTools.excavator, TinkerTools.hammer, TinkerTools.battleaxe, TinkerTools.shortbow, TinkerTools.arrow }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; for (int i = 0; i < tools.length; i++) { @@ -324,12 +254,8 @@ public class TinkerTools TinkerTools.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); TinkerTools.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching"); - Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, TinkerTools.toughRod, TinkerTools.largePlate, - TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, - TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.bowstring, TinkerTools.fletching, TinkerTools.arrowhead }; - String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", - "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", - "fletching", "arrowhead" }; + Item[] toolParts = { TinkerTools.toolRod, TinkerTools.toolShard, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.toughBinding, TinkerTools.toughRod, TinkerTools.largePlate, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.fullGuard, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead, TinkerTools.scytheBlade, TinkerTools.broadAxeHead, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.bowstring, TinkerTools.fletching, TinkerTools.arrowhead }; + String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", "fletching", "arrowhead" }; for (int i = 0; i < toolParts.length; i++) { @@ -341,28 +267,21 @@ public class TinkerTools TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); GameRegistry.registerItem(TinkerTools.creativeModifier, "creativeModifier"); - String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", - "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", - "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", - "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; + String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; for (int i = 0; i < materialStrings.length; i++) { TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TinkerTools.materials, 1, i)); } - + registerMaterials(); registerStencils(); - // this array is only used to register the remaining pattern-part-interactions - TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard, - TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod, - TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, - TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null }; - -//Moved temporarily to deal with AE2 Quartz + TinkerTools.patternOutputs = new Item[] { TinkerTools.toolRod, TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.binding, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.knifeBlade, TinkerTools.chiselHead, TinkerTools.toughRod, TinkerTools.toughBinding, TinkerTools.largePlate, TinkerTools.broadAxeHead, TinkerTools.scytheBlade, TinkerTools.excavatorHead, TinkerTools.largeSwordBlade, TinkerTools.hammerHead, TinkerTools.fullGuard, null, null, TinkerTools.arrowhead, null }; + + //Moved temporarily to deal with AE2 Quartz TinkerTools.modFlux = new ModFlux(); ModifyBuilder.registerModifier(TinkerTools.modFlux); @@ -370,11 +289,10 @@ public class TinkerTools ItemStack lapisBlock = new ItemStack(Blocks.lapis_block); TinkerTools.modLapis = new ModLapis(10, new ItemStack[] { lapisItem, lapisBlock }, new int[] { 1, 9 }); ModifyBuilder.registerModifier(TinkerTools.modLapis); - - TinkerTools.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), - new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); + + TinkerTools.modAttack = new ModAttack("Quartz", 11, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }); ModifyBuilder.registerModifier(TinkerTools.modAttack); - } + } void setupToolTabs () { @@ -447,7 +365,7 @@ public class TinkerTools } } } - + registerPatternMaterial("plankWood", 2, "Wood"); registerPatternMaterial("stickWood", 1, "Wood"); registerPatternMaterial("slabWood", 1, "Wood"); @@ -483,23 +401,18 @@ public class TinkerTools ItemStack diamond = new ItemStack(Items.diamond); ModifyBuilder.registerModifier(new ModToolRepair()); - ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7b" - + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); - ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72" - + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); + ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7b" + StatCollector.translateToLocal("modifier.tool.diamond"), "\u00a7b")); + ModifyBuilder.registerModifier(new ModDurability(new ItemStack[] { new ItemStack(Items.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72" + StatCollector.translateToLocal("modifier.tool.emerald"), "\u00a72")); ItemStack redstoneItem = new ItemStack(Items.redstone); ItemStack redstoneBlock = new ItemStack(Blocks.redstone_block); ModifyBuilder.registerModifier(new ModRedstone(2, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", StatCollector - .translateToLocal("modifier.tool.moss"))); + ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 6) }, 4, "Moss", 3, "\u00a72", StatCollector.translateToLocal("modifier.tool.moss"))); ItemStack blazePowder = new ItemStack(Items.blaze_powder); ModifyBuilder.registerModifier(new ModBlaze(7, new ItemStack[] { blazePowder }, new int[] { 1 })); - ModifyBuilder.registerModifier(new ModAutoSmelt(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 7) }, 6, "Lava", "\u00a74", StatCollector - .translateToLocal("modifier.tool.lava"))); - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", StatCollector - .translateToLocal("modifier.tool.necro"))); + ModifyBuilder.registerModifier(new ModAutoSmelt(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 7) }, 6, "Lava", "\u00a74", StatCollector.translateToLocal("modifier.tool.lava"))); + ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(TinkerTools.materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", StatCollector.translateToLocal("modifier.tool.necro"))); ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Blocks.gold_block) }, "Tier1Free")); ModifyBuilder.registerModifier(new ModExtraModifier(new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(Items.golden_apple, 1, 1) }, "Tier1.5Free")); @@ -512,8 +425,7 @@ public class TinkerTools ItemStack piston = new ItemStack(Blocks.piston); ModifyBuilder.registerModifier(new ModPiston(3, new ItemStack[] { piston }, new int[] { 1 })); - ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1, - "\u00a7d", "Beheading")); + ModifyBuilder.registerModifier(new ModInteger(new ItemStack[] { new ItemStack(Blocks.obsidian), new ItemStack(Items.ender_pearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); ItemStack holySoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); ModifyBuilder.registerModifier(new ModSmite("Smite", 14, new ItemStack[] { holySoil }, new int[] { 1 })); @@ -648,7 +560,7 @@ public class TinkerTools Items.golden_sword.setMaxDamage(1); } } - + public static void registerPatternMaterial (String oreName, int value, String materialName) { for (ItemStack ore : OreDictionary.getOres(oreName)) @@ -656,30 +568,26 @@ public class TinkerTools PatternBuilder.instance.registerMaterial(ore, value, materialName); } } - - private void craftingTableRecipes() + + private void craftingTableRecipes () { String[] patBlock = { "###", "###", "###" }; String[] patSurround = { "###", "#m#", "###" }; - Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", - "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; + Object[] toolForgeBlocks = { "blockIron", "blockGold", Blocks.diamond_block, Blocks.emerald_block, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; // ToolForge Recipes (Metal Version) for (int sc = 0; sc < toolForgeBlocks.length; sc++) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack( - TinkerTools.toolStationWood, 1, 0), 'm', toolForgeBlocks[sc])); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack(TinkerTools.toolStationWood, 1, 0), 'm', toolForgeBlocks[sc])); // adding slab version recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack( - TinkerTools.craftingSlabWood, 1, 1), 'm', toolForgeBlocks[sc])); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(TinkerSmeltery.smeltery, 1, 2), 's', new ItemStack(TinkerTools.craftingSlabWood, 1, 1), 'm', toolForgeBlocks[sc])); } // ToolStation Recipes (Wooden Version) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "crafterWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', - new ItemStack(TinkerTools.craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(TinkerTools.craftingStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(TinkerTools.craftingSlabWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 1)); GameRegistry.addRecipe(new ItemStack(TinkerTools.toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(TinkerTools.blankPattern, 1, 0), 'w', new ItemStack(Blocks.log, 1, 2)); @@ -716,12 +624,10 @@ public class TinkerTools GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 1, 7), "xcx", "cbc", "xcx", 'b', Items.lava_bucket, 'x', Items.fire_charge, 'c', Items.blaze_rod); // Slimy sand Recipes GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 0), Items.slime_ball, Items.slime_ball, Items.slime_ball, Items.slime_ball, Blocks.sand, Blocks.dirt); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 2), TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, Blocks.sand, - Blocks.dirt); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 2), TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, TinkerWorld.strangeFood, Blocks.sand, Blocks.dirt); // Grout Recipes GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 1), Items.clay_ball, Blocks.sand, Blocks.gravel); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, - Blocks.gravel, Blocks.gravel, Blocks.gravel, Blocks.gravel); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 8, 1), new ItemStack(Blocks.clay, 1, Short.MAX_VALUE), Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.gravel, Blocks.gravel, Blocks.gravel, Blocks.gravel); GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, Blocks.soul_sand, Blocks.gravel); // Graveyard Soil Recipes GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 1, 3), Blocks.dirt, Items.rotten_flesh, new ItemStack(Items.dye, 1, 15)); @@ -749,12 +655,12 @@ public class TinkerTools GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 12)); GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 3), "b", 'b', new ItemStack(TinkerTools.toolStationWood, 1, 13)); GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "b", 'b', new ItemStack(TinkerTools.toolForge, 1, Short.MAX_VALUE)); - + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt")); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminium", "dustAluminium", "dustAluminium", "dustCopper")); } - - private void modIntegration() + + private void modIntegration () { /* TE3 Flux */ ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); @@ -810,71 +716,71 @@ public class TinkerTools } // No need to handle } } - + void registerMaterials () { // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, color - TConstructRegistry.addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, DARK_GRAY.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0,-1f, DARK_GREEN.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, LIGHT_PURPLE.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Netherrack,"Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, DARK_RED.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, DARK_AQUA.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, DARK_RED.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString()); - TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString()); - TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString()); - TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Wood, "Wood", 1, 97, 350, 0, 1.0F, 0, 0f, YELLOW.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Stone, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, GRAY.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Iron, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, WHITE.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Flint, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, DARK_GRAY.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Cactus, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, DARK_GREEN.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Bone, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, YELLOW.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Obsidian, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, LIGHT_PURPLE.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Netherrack, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, DARK_RED.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Slime, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, GREEN.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Paper, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, WHITE.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Cobalt, "Cobalt", 4, 800, 1400, 3, 1.75F, 2, 0f, DARK_AQUA.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Ardite, "Ardite", 4, 500, 800, 3, 2.0F, 0, 2f, DARK_RED.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString()); + TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString()); + TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString()); + TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString()); // Bow Materials: Material ID, durability, drawspeed, arrow speed - TConstructRegistry.addBowMaterial(MaterialID.Wood, 384, 20, 1.0f); // Wood - TConstructRegistry.addBowMaterial(MaterialID.Stone, 10, 80, 0.2f); // Stone - TConstructRegistry.addBowMaterial(MaterialID.Iron, 576, 30, 1.2f); // Iron - TConstructRegistry.addBowMaterial(MaterialID.Flint, 10, 80, 0.2f); // Flint - TConstructRegistry.addBowMaterial(MaterialID.Cactus, 384, 20, 1.0f); // Cactus - TConstructRegistry.addBowMaterial(MaterialID.Bone, 192, 30, 1.0f); // Bone - TConstructRegistry.addBowMaterial(MaterialID.Obsidian, 10, 80, 0.2f); // Obsidian - TConstructRegistry.addBowMaterial(MaterialID.Netherrack, 10, 80, 0.2f); // Netherrack - TConstructRegistry.addBowMaterial(MaterialID.Slime, 1536, 30, 1.2f); // Slime - TConstructRegistry.addBowMaterial(MaterialID.Paper, 48, 25, 0.5f); // Paper - TConstructRegistry.addBowMaterial(MaterialID.Cobalt, 1152, 30, 1.2f); // Cobalt - TConstructRegistry.addBowMaterial(MaterialID.Ardite, 960, 30, 1.2f); // Ardite + TConstructRegistry.addBowMaterial(MaterialID.Wood, 384, 20, 1.0f); // Wood + TConstructRegistry.addBowMaterial(MaterialID.Stone, 10, 80, 0.2f); // Stone + TConstructRegistry.addBowMaterial(MaterialID.Iron, 576, 30, 1.2f); // Iron + TConstructRegistry.addBowMaterial(MaterialID.Flint, 10, 80, 0.2f); // Flint + TConstructRegistry.addBowMaterial(MaterialID.Cactus, 384, 20, 1.0f); // Cactus + TConstructRegistry.addBowMaterial(MaterialID.Bone, 192, 30, 1.0f); // Bone + TConstructRegistry.addBowMaterial(MaterialID.Obsidian, 10, 80, 0.2f); // Obsidian + TConstructRegistry.addBowMaterial(MaterialID.Netherrack, 10, 80, 0.2f); // Netherrack + TConstructRegistry.addBowMaterial(MaterialID.Slime, 1536, 30, 1.2f); // Slime + TConstructRegistry.addBowMaterial(MaterialID.Paper, 48, 25, 0.5f); // Paper + TConstructRegistry.addBowMaterial(MaterialID.Cobalt, 1152, 30, 1.2f); // Cobalt + TConstructRegistry.addBowMaterial(MaterialID.Ardite, 960, 30, 1.2f); // Ardite TConstructRegistry.addBowMaterial(MaterialID.Manyullyn, 1536, 30, 1.2f); // Manyullyn - TConstructRegistry.addBowMaterial(MaterialID.Copper, 384, 30, 1.2f); // Copper - TConstructRegistry.addBowMaterial(MaterialID.Bronze, 576, 30, 1.2f); // Bronze - TConstructRegistry.addBowMaterial(MaterialID.Alumite, 768, 30, 1.2f); // Alumite - TConstructRegistry.addBowMaterial(MaterialID.Steel, 768, 30, 1.2f); // Steel - TConstructRegistry.addBowMaterial(MaterialID.BlueSlime, 576, 20, 1.2f); // Blue Slime - TConstructRegistry.addBowMaterial(MaterialID.PigIron, 384, 20, 1.2f); // Pig Iron + TConstructRegistry.addBowMaterial(MaterialID.Copper, 384, 30, 1.2f); // Copper + TConstructRegistry.addBowMaterial(MaterialID.Bronze, 576, 30, 1.2f); // Bronze + TConstructRegistry.addBowMaterial(MaterialID.Alumite, 768, 30, 1.2f); // Alumite + TConstructRegistry.addBowMaterial(MaterialID.Steel, 768, 30, 1.2f); // Steel + TConstructRegistry.addBowMaterial(MaterialID.BlueSlime, 576, 20, 1.2f); // Blue Slime + TConstructRegistry.addBowMaterial(MaterialID.PigIron, 384, 20, 1.2f); // Pig Iron // Fletchling Materials: Material ID, mass, fragility - TConstructRegistry.addArrowMaterial(MaterialID.Wood, 0.69F, 1.0F, 100F); //Wood - TConstructRegistry.addArrowMaterial(MaterialID.Stone, 2.05F, 5.0F, 100F); //Stone - TConstructRegistry.addArrowMaterial(MaterialID.Iron, 3.6F, 0.5F, 100F); //Iron - TConstructRegistry.addArrowMaterial(MaterialID.Flint, 1.325F, 1.0F, 100F); //Flint - TConstructRegistry.addArrowMaterial(MaterialID.Cactus, 0.76F, 1.0F, 100F); //Cactus - TConstructRegistry.addArrowMaterial(MaterialID.Bone, 0.69F, 1.0F, 100); //Bone - TConstructRegistry.addArrowMaterial(MaterialID.Obsidian, 2.4F, 1.0F, 100F); //Obsidian - TConstructRegistry.addArrowMaterial(MaterialID.Netherrack, 1.5F, 1.0F, 100F); //Netherrack - TConstructRegistry.addArrowMaterial(MaterialID.Slime, 0.22F, 0.0F, 100F); //Slime - TConstructRegistry.addArrowMaterial(MaterialID.Paper, 0.69F, 3.0F, 90F); //Paper - TConstructRegistry.addArrowMaterial(MaterialID.Cobalt, 3.0F, 0.25F, 100F); //Cobalt - TConstructRegistry.addArrowMaterial(MaterialID.Ardite, 1.25F, 0.25F, 100F); //Ardite - TConstructRegistry.addArrowMaterial(MaterialID.Manyullyn, 2.25F, 0.1F, 100F); //Manyullyn - TConstructRegistry.addArrowMaterial(MaterialID.Copper, 2.7F, 0.5F, 100F); //Copper - TConstructRegistry.addArrowMaterial(MaterialID.Bronze, 3.6F, 0.25F, 100F); //Bronze - TConstructRegistry.addArrowMaterial(MaterialID.Alumite, 1.1F, 0.25F, 100F); //Alumite - TConstructRegistry.addArrowMaterial(MaterialID.Steel, 3.6F, 0.25F, 100F); //Steel - TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F, 100F); //Blue Slime - TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.6F, 0.5F, 100F); //Pigiron + TConstructRegistry.addArrowMaterial(MaterialID.Wood, 0.69F, 1.0F, 100F); //Wood + TConstructRegistry.addArrowMaterial(MaterialID.Stone, 2.05F, 5.0F, 100F); //Stone + TConstructRegistry.addArrowMaterial(MaterialID.Iron, 3.6F, 0.5F, 100F); //Iron + TConstructRegistry.addArrowMaterial(MaterialID.Flint, 1.325F, 1.0F, 100F); //Flint + TConstructRegistry.addArrowMaterial(MaterialID.Cactus, 0.76F, 1.0F, 100F); //Cactus + TConstructRegistry.addArrowMaterial(MaterialID.Bone, 0.69F, 1.0F, 100); //Bone + TConstructRegistry.addArrowMaterial(MaterialID.Obsidian, 2.4F, 1.0F, 100F); //Obsidian + TConstructRegistry.addArrowMaterial(MaterialID.Netherrack, 1.5F, 1.0F, 100F); //Netherrack + TConstructRegistry.addArrowMaterial(MaterialID.Slime, 0.22F, 0.0F, 100F); //Slime + TConstructRegistry.addArrowMaterial(MaterialID.Paper, 0.69F, 3.0F, 90F); //Paper + TConstructRegistry.addArrowMaterial(MaterialID.Cobalt, 3.0F, 0.25F, 100F); //Cobalt + TConstructRegistry.addArrowMaterial(MaterialID.Ardite, 1.25F, 0.25F, 100F); //Ardite + TConstructRegistry.addArrowMaterial(MaterialID.Manyullyn, 2.25F, 0.1F, 100F); //Manyullyn + TConstructRegistry.addArrowMaterial(MaterialID.Copper, 2.7F, 0.5F, 100F); //Copper + TConstructRegistry.addArrowMaterial(MaterialID.Bronze, 3.6F, 0.25F, 100F); //Bronze + TConstructRegistry.addArrowMaterial(MaterialID.Alumite, 1.1F, 0.25F, 100F); //Alumite + TConstructRegistry.addArrowMaterial(MaterialID.Steel, 3.6F, 0.25F, 100F); //Steel + TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F, 100F); //Blue Slime + TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.6F, 0.5F, 100F); //Pigiron TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerTools.bowstring, 1, 0), 1F, 1F, 1f); // String TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerTools.fletching, 1, 0), 100F, 0F, 0.05F); // Feather @@ -937,19 +843,19 @@ public class TinkerTools pb.addToolPattern((IPattern) TinkerTools.woodPattern); } - private void registerStencils() + private void registerStencils () { StencilBuilder.registerBlankStencil(new ItemStack(TinkerTools.blankPattern)); // we register this manually because we want that specific order - StencilBuilder.registerStencil(TinkerTools.woodPattern, 1); // tool rod - StencilBuilder.registerStencil(TinkerTools.woodPattern, 9); // binding + StencilBuilder.registerStencil(TinkerTools.woodPattern, 1); // tool rod + StencilBuilder.registerStencil(TinkerTools.woodPattern, 9); // binding StencilBuilder.registerStencil(TinkerTools.woodPattern, 14); // large tool rod StencilBuilder.registerStencil(TinkerTools.woodPattern, 15); // large binding - StencilBuilder.registerStencil(TinkerTools.woodPattern, 2); // pickaxe head - StencilBuilder.registerStencil(TinkerTools.woodPattern, 3); // shovel head - StencilBuilder.registerStencil(TinkerTools.woodPattern, 4); // hatchet head + StencilBuilder.registerStencil(TinkerTools.woodPattern, 2); // pickaxe head + StencilBuilder.registerStencil(TinkerTools.woodPattern, 3); // shovel head + StencilBuilder.registerStencil(TinkerTools.woodPattern, 4); // hatchet head StencilBuilder.registerStencil(TinkerTools.woodPattern, 18); // scythe StencilBuilder.registerStencil(TinkerTools.woodPattern, 21); // hammer head @@ -962,39 +868,40 @@ public class TinkerTools StencilBuilder.registerStencil(TinkerTools.woodPattern, 13); // chisel StencilBuilder.registerStencil(TinkerTools.woodPattern, 12); // knifeblade - StencilBuilder.registerStencil(TinkerTools.woodPattern, 5); // swordblade + StencilBuilder.registerStencil(TinkerTools.woodPattern, 5); // swordblade StencilBuilder.registerStencil(TinkerTools.woodPattern, 20); // cleaver blade - StencilBuilder.registerStencil(TinkerTools.woodPattern, 8); // crossbar - StencilBuilder.registerStencil(TinkerTools.woodPattern, 7); // small guard - StencilBuilder.registerStencil(TinkerTools.woodPattern, 6); // wide guard + StencilBuilder.registerStencil(TinkerTools.woodPattern, 8); // crossbar + StencilBuilder.registerStencil(TinkerTools.woodPattern, 7); // small guard + StencilBuilder.registerStencil(TinkerTools.woodPattern, 6); // wide guard StencilBuilder.registerStencil(TinkerTools.woodPattern, 25); // arrow head StencilBuilder.registerStencil(TinkerTools.woodPattern, 24); // fletchling StencilBuilder.registerStencil(TinkerTools.woodPattern, 23); // bowstring } - public static final class MaterialID { - public static final int Wood = 0; - public static final int Stone = 1; - public static final int Iron = 2; - public static final int Flint = 3; - public static final int Cactus = 4; - public static final int Bone = 5; - public static final int Obsidian = 6; - public static final int Netherrack = 7; - public static final int Slime = 8; - public static final int Paper = 9; - public static final int Cobalt = 10; - public static final int Ardite = 11; - public static final int Manyullyn = 12; // I'd still call it Manymetal --boni - public static final int Copper = 13; - public static final int Bronze = 14; - public static final int Alumite = 15; - public static final int Steel = 16; - public static final int BlueSlime = 17; - public static final int PigIron = 18; + public static final class MaterialID + { + public static final int Wood = 0; + public static final int Stone = 1; + public static final int Iron = 2; + public static final int Flint = 3; + public static final int Cactus = 4; + public static final int Bone = 5; + public static final int Obsidian = 6; + public static final int Netherrack = 7; + public static final int Slime = 8; + public static final int Paper = 9; + public static final int Cobalt = 10; + public static final int Ardite = 11; + public static final int Manyullyn = 12; // I'd still call it Manymetal --boni + public static final int Copper = 13; + public static final int Bronze = 14; + public static final int Alumite = 15; + public static final int Steel = 16; + public static final int BlueSlime = 17; + public static final int PigIron = 18; - public static final int Thaumium = 31; + public static final int Thaumium = 31; } } diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index 21151481..0be5241b 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -1,58 +1,30 @@ package tconstruct.tools; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.init.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; -import tconstruct.client.CustomBowRenderer; import tconstruct.client.ToolCoreRenderer; -import tconstruct.client.entity.projectile.ArrowRenderCustom; -import tconstruct.client.entity.projectile.DaggerRenderCustom; -import tconstruct.client.entity.projectile.LaunchedItemRender; -import tconstruct.client.pages.MaterialPage; -import tconstruct.client.pages.ModifierPage; -import tconstruct.client.pages.ToolPage; +import tconstruct.client.entity.projectile.*; +import tconstruct.client.pages.*; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; -import tconstruct.library.crafting.StencilBuilder; -import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.client.*; +import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.entity.ArrowEntity; -import tconstruct.tools.entity.DaggerEntity; -import tconstruct.tools.entity.FancyEntityItem; -import tconstruct.tools.entity.LaunchedPotion; -import tconstruct.tools.gui.CraftingStationGui; -import tconstruct.tools.gui.FrypanGui; -import tconstruct.tools.gui.FurnaceGui; -import tconstruct.tools.gui.PartCrafterGui; -import tconstruct.tools.gui.PatternChestGui; -import tconstruct.tools.gui.StencilTableGui; -import tconstruct.tools.gui.ToolForgeGui; -import tconstruct.tools.gui.ToolStationGui; -import tconstruct.tools.logic.CraftingStationLogic; -import tconstruct.tools.logic.FrypanLogic; -import tconstruct.tools.logic.FurnaceLogic; -import tconstruct.tools.logic.PartBuilderLogic; -import tconstruct.tools.logic.PatternChestLogic; -import tconstruct.tools.logic.StencilTableLogic; -import tconstruct.tools.logic.ToolForgeLogic; -import tconstruct.tools.logic.ToolStationLogic; -import tconstruct.tools.model.FancyItemRender; -import tconstruct.tools.model.FrypanRender; -import tconstruct.tools.model.TableRender; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import tconstruct.tools.entity.*; +import tconstruct.tools.gui.*; +import tconstruct.tools.logic.*; +import tconstruct.tools.model.*; public class ToolProxyClient extends ToolProxyCommon { @@ -85,45 +57,31 @@ public class ToolProxyClient extends ToolProxyCommon MinecraftForgeClient.registerItemRenderer(TinkerTools.arrow, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer); } - - public void registerManualIcons() + + public void registerManualIcons () { // ToolIcons - MantleClientRegistry.registerManualIcon("pickicon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.binding, 1, 12), "")); + MantleClientRegistry.registerManualIcon("pickicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.binding, 1, 12), "")); MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.shovelHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("mattockicon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.shovelHead, 1, 12), "")); - MantleClientRegistry.registerManualIcon("swordicon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.wideGuard, 1, 12), "")); - MantleClientRegistry.registerManualIcon("longswordicon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.handGuard, 1, 12), "")); - MantleClientRegistry.registerManualIcon("rapiericon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); - MantleClientRegistry.registerManualIcon("daggerIcon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); + MantleClientRegistry.registerManualIcon("mattockicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.shovelHead, 1, 12), "")); + MantleClientRegistry.registerManualIcon("swordicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.wideGuard, 1, 12), "")); + MantleClientRegistry.registerManualIcon("longswordicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.handGuard, 1, 12), "")); + MantleClientRegistry.registerManualIcon("rapiericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); + MantleClientRegistry.registerManualIcon("daggerIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), "")); MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.frypanHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.signHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.chiselHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, "")); - MantleClientRegistry.registerManualIcon("shortbowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerTools.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), "")); - MantleClientRegistry.registerManualIcon("arrowIcon", - ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.fletching, 1, 0), "")); + MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerTools.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), "")); + MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.fletching, 1, 0), "")); - MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( - TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), "")); - MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( - TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.excavatorHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), - new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); - MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.scytheBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack( - TinkerTools.toughBinding, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.largeSwordBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), - new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); - MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), - new ItemStack(TinkerTools.broadAxeHead, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), "")); + MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.excavatorHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); + MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.scytheBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.toughBinding, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); + MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.largeSwordBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughRod, 8), "")); + MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.broadAxeHead, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), "")); // Tool parts MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TinkerTools.pickaxeHead, 1, 2)); @@ -155,14 +113,14 @@ public class ToolProxyClient extends ToolProxyCommon MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TinkerTools.bowstring, 1, 0)); MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TinkerTools.arrowhead, 1, 2)); MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TinkerTools.fletching, 1, 0)); - + //Tables MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TinkerTools.blankPattern, 1, 0)); MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0)); MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1)); MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5)); MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10)); - + //TODO: Untwine this MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TinkerTools.materials, 1, 17)); MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1)); @@ -178,18 +136,18 @@ public class ToolProxyClient extends ToolProxyCommon MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TinkerTools.materials, 1, 14)); MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TinkerTools.materials, 1, 5)); MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TinkerTools.materials, 1, 15)); - + MProxyClient.registerManualPage("materialstats", MaterialPage.class); MProxyClient.registerManualPage("toolpage", ToolPage.class); MProxyClient.registerManualPage("modifier", ModifierPage.class); } - - void registerManualRecipes() + + void registerManualRecipes () { - + ItemStack pattern = new ItemStack(TinkerTools.blankPattern, 1, 0); ItemStack silkyCloth = new ItemStack(TinkerTools.materials, 1, 25); - + ItemStack stick = new ItemStack(Items.stick, 1, 0); ItemStack paper = new ItemStack(Items.paper); ItemStack string = new ItemStack(Items.string); @@ -216,22 +174,18 @@ public class ToolProxyClient extends ToolProxyCommon MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log); MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest); MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank); - - MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TinkerTools.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( - TinkerTools.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); //TODO: Alternate recipe for Smeltery disabled + + MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TinkerTools.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(TinkerTools.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); //TODO: Alternate recipe for Smeltery disabled MantleClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud); MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper); - MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TinkerTools.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, - mossycobble, mossycobble); - MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge, - blazerod, firecharge, blazerod); + MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TinkerTools.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble); + MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge, blazerod, firecharge, blazerod); MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TinkerTools.materials, 1, 24), string, string, string, string); - MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TinkerTools.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null, - silkyCloth, null); - - // Modifier recipes + MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TinkerTools.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null, silkyCloth, null); + + // Modifier recipes ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), ""); MantleClientRegistry.registerManualIcon("ironpick", ironpick); ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.handGuard, 1, 10), ""); @@ -331,49 +285,45 @@ public class ToolProxyClient extends ToolProxyCommon void addStencilButtons () { - int[][] icons = { - {0,3}, // tool rod - {1,3}, // binding - {8,3}, // large tool rod - {9,3}, // large binding + int[][] icons = { { 0, 3 }, // tool rod + { 1, 3 }, // binding + { 8, 3 }, // large tool rod + { 9, 3 }, // large binding - {0,2}, // pickaxe head - {3,2}, // shovel head - {2,2}, // hatchet head - {8,2}, // scythe + { 0, 2 }, // pickaxe head + { 3, 2 }, // shovel head + { 2, 2 }, // hatchet head + { 8, 2 }, // scythe - {11,2}, // hammer head - {10,2}, // excavator head - {6,2}, // lumberaxe head - {9,2}, // large plate + { 11, 2 }, // hammer head + { 10, 2 }, // excavator head + { 6, 2 }, // lumberaxe head + { 9, 2 }, // large plate - {}, - {4,2}, // frying pan - {5,2}, // battlesign - {7,3}, // chisel + {}, { 4, 2 }, // frying pan + { 5, 2 }, // battlesign + { 7, 3 }, // chisel - {}, - {7,2}, // knifeblade - {1,2}, // swordblade - {6,3}, // cleaver blade + {}, { 7, 2 }, // knifeblade + { 1, 2 }, // swordblade + { 6, 3 }, // cleaver blade - {}, - {4,3}, // crossbar - {3,3}, // small guard - {2,3}, // wide guard + {}, { 4, 3 }, // crossbar + { 3, 3 }, // small guard + { 2, 3 }, // wide guard - {}, - {11,3}, // arrow head - {12,3}, // fletchling - {10,3}, // bowstring + {}, { 11, 3 }, // arrow head + { 12, 3 }, // fletchling + { 10, 3 }, // bowstring }; int i = 0; - for(ItemStack stack : StencilBuilder.getStencils()) { + for (ItemStack stack : StencilBuilder.getStencils()) + { // spacer - while(icons[i].length == 0) + while (icons[i].length == 0) { - addStencilButton(0,0, -1); + addStencilButton(0, 0, -1); i++; } addStencilButton(icons[i][0], icons[i][1], StencilBuilder.getIndex(stack)); @@ -425,22 +375,12 @@ public class ToolProxyClient extends ToolProxyCommon // "Ice Axe", "Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" }; - static String[] toolDescriptions = { - "The main way to repair or change your tools. Place a tool and a material on the left to get started.", - "The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", - "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", - "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", + static String[] toolDescriptions = { "The main way to repair or change your tools. Place a tool and a material on the left to get started.", "The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", // "The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", // "The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", - "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", - "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", - "The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate", - "The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low", - "The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle", - "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", + "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", "The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate", "The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low", "The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle", "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", // "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle" - "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability:\nDamage Reflector\n\nNatural Ability: Writable\n\nDamage: Low\nDurability: Average", - "The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle" }; + "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability:\nDamage Reflector\n\nNatural Ability: Writable\n\nDamage: Low\nDurability: Average", "The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle" }; void addToolButtons () { @@ -449,23 +389,14 @@ public class ToolProxyClient extends ToolProxyCommon addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); } - addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", - "The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod"); - addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow", - "Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching"); - addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", - "The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High"); - addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", - "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average"); - addTierTwoButton(5, 12, 0, new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Excavator", - "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average"); - addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", - "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE"); - addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver", - "The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average"); - addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe", - "The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:" - + "\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average"); + addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", "The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod"); + addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow", "Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching"); + addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", "The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High"); + addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average"); + addTierTwoButton(5, 12, 0, new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Excavator", "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average"); + addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE"); + addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver", "The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average"); + addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe", "The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:" + "\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average"); } void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) @@ -480,10 +411,8 @@ public class ToolProxyClient extends ToolProxyCommon void addToolRenderMappings () { - String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", - "blueslime", "pigiron" }; - String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", - "reinforced", "flux" }; + String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "pigiron" }; + String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced", "flux" }; int[] universalEffects = { 0, 1, 4, 9, 16 }; int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; int[] harvestEffects = { 2 }; diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java index 709a559a..5d091381 100644 --- a/src/main/java/tconstruct/tools/ToolProxyCommon.java +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -1,11 +1,11 @@ package tconstruct.tools; +import cpw.mods.fml.common.network.IGuiHandler; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tconstruct.common.TProxyCommon; -import cpw.mods.fml.common.network.IGuiHandler; public class ToolProxyCommon implements IGuiHandler { @@ -24,10 +24,10 @@ public class ToolProxyCommon implements IGuiHandler public void initialize () { - registerGuiHandler(); + registerGuiHandler(); } - - protected void registerGuiHandler() + + protected void registerGuiHandler () { TProxyCommon.registerServerGuiHandler(toolStationID, this); TProxyCommon.registerServerGuiHandler(partBuilderID, this); @@ -38,7 +38,7 @@ public class ToolProxyCommon implements IGuiHandler TProxyCommon.registerServerGuiHandler(furnaceID, this); TProxyCommon.registerServerGuiHandler(craftingStationID, this); } - + @Override public Object getServerGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { @@ -49,6 +49,7 @@ public class ToolProxyCommon implements IGuiHandler } return null; } + @Override public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index c598224e..5089df15 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -1,32 +1,22 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventorySlab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.tools.TinkerTools; -import tconstruct.tools.ToolProxyCommon; -import tconstruct.tools.logic.CraftingStationLogic; -import tconstruct.tools.logic.PartBuilderLogic; -import tconstruct.tools.logic.PatternChestLogic; -import tconstruct.tools.logic.StencilTableLogic; -import tconstruct.tools.logic.ToolForgeLogic; -import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.*; +import tconstruct.tools.logic.*; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CraftingSlab extends InventorySlab { @@ -42,9 +32,7 @@ public class CraftingSlab extends InventorySlab @Override public String[] getTextureNames () { - String[] textureNames = { "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", "toolstation_top", "toolstation_slab_side", "toolstation_bottom", - "partbuilder_oak_top", "partbuilder_slab_side", "partbuilder_oak_bottom", "stenciltable_oak_top", "stenciltable_slab_side", "stenciltable_oak_bottom", "patternchest_top", - "patternchest_slab_side", "patternchest_bottom", "toolforge_top", "toolforge_slab_side", "toolforge_top" }; + String[] textureNames = { "craftingstation_top", "craftingstation_slab_side", "craftingstation_bottom", "toolstation_top", "toolstation_slab_side", "toolstation_bottom", "partbuilder_oak_top", "partbuilder_slab_side", "partbuilder_oak_bottom", "stenciltable_oak_top", "stenciltable_slab_side", "stenciltable_oak_bottom", "patternchest_top", "patternchest_slab_side", "patternchest_bottom", "toolforge_top", "toolforge_slab_side", "toolforge_top" }; return textureNames; } @@ -77,8 +65,7 @@ public class CraftingSlab extends InventorySlab { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, - (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index e4ee8c41..a50b5e4a 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -1,25 +1,21 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; 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.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.CraftingStationLogic; import tconstruct.tools.model.TableRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CraftingStationBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index e1126aaa..18b8f747 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -1,7 +1,7 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,21 +10,15 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.TConstruct; import tconstruct.tools.ToolProxyCommon; -import tconstruct.tools.logic.EquipLogic; -import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.logic.*; import tconstruct.tools.model.FrypanRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EquipBlock extends InventoryBlock { @@ -162,8 +156,7 @@ public class EquipBlock extends InventoryBlock } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(par1World, (double) ((float) x + jumpX), (double) ((float) y + jumpY), (double) ((float) z + jumpZ), new ItemStack(stack.getItem(), - itemSize, stack.getItemDamage())); + EntityItem entityitem = new EntityItem(par1World, (double) ((float) x + jumpX), (double) ((float) y + jumpY), (double) ((float) z + jumpZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { diff --git a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index 22951fc2..925e45e5 100644 --- a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -1,23 +1,19 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.abstracts.InventorySlab; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.FurnaceLogic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FurnaceSlab extends InventorySlab { @@ -151,12 +147,12 @@ public class FurnaceSlab extends InventorySlab { float offset = random.nextFloat() * 0.6F - 0.3F; float offsetY = random.nextFloat() * 6.0F / 16.0F; - + if (metaPos == 1) { offsetY += 0.5F; } - + if (direction == 4) { world.spawnParticle("smoke", x - 0.02F, y + offsetY, z + offset + 0.5F, 0.0D, 0.0D, 0.0D); @@ -176,7 +172,7 @@ public class FurnaceSlab extends InventorySlab { world.spawnParticle("smoke", x + offset + 0.5F, y + offsetY, z + 1.02F, 0.0D, 0.0D, 0.0D); world.spawnParticle("flame", x + offset + 0.5F, y + offsetY, z + 1.02F, 0.0D, 0.0D, 0.0D); - } + } } } } diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index fb4ebbbd..3ff71c12 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -1,21 +1,17 @@ package tconstruct.tools.blocks; -import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.*; +import net.minecraft.world.*; +import tconstruct.blocks.TConstructBlock; public class MultiBrick extends TConstructBlock { - static String blockTextures[] = { "brick_obsidian", "brick_sandstone", "brick_netherrack", "brick_stone_refined", "brick_iron", "brick_gold", "brick_lapis", "brick_diamond", "brick_redstone", - "brick_bone", "brick_slime", "brick_blueslime", "brick_endstone", "brick_obsidian_ingot" }; + static String blockTextures[] = { "brick_obsidian", "brick_sandstone", "brick_netherrack", "brick_stone_refined", "brick_iron", "brick_gold", "brick_lapis", "brick_diamond", "brick_redstone", "brick_bone", "brick_slime", "brick_blueslime", "brick_endstone", "brick_obsidian_ingot" }; public MultiBrick() { @@ -153,7 +149,7 @@ public class MultiBrick extends TConstructBlock } @Override - public boolean isNormalCube(IBlockAccess world, int x, int y, int z) + public boolean isNormalCube (IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta != 8) diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index cddd8db3..a432cbce 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -1,22 +1,17 @@ package tconstruct.tools.blocks; -import tconstruct.blocks.TConstructBlock; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.*; +import net.minecraft.world.*; +import tconstruct.blocks.TConstructBlock; public class MultiBrickFancy extends TConstructBlock { - static String blockTextures[] = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", - "fancybrick_diamond", "fancybrick_redstone", "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "fancybrick_stone", - "road_stone" }; + static String blockTextures[] = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", "fancybrick_diamond", "fancybrick_redstone", "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "fancybrick_stone", "road_stone" }; public MultiBrickFancy() { @@ -137,6 +132,7 @@ public class MultiBrickFancy extends TConstructBlock { return true; } + @Override public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) { @@ -158,7 +154,7 @@ public class MultiBrickFancy extends TConstructBlock } @Override - public boolean isNormalCube(IBlockAccess world, int x, int y, int z) + public boolean isNormalCube (IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta != 8) diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index 6859d7a1..e07c985c 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -1,7 +1,7 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -9,12 +9,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; @@ -22,8 +20,6 @@ import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.ToolForgeLogic; import tconstruct.tools.model.TableRender; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ToolForgeBlock extends InventoryBlock { @@ -36,8 +32,7 @@ public class ToolForgeBlock extends InventoryBlock this.setStepSound(Block.soundTypeMetal); } - String[] textureNames = { "toolforge_iron", "toolforge_gold", "toolforge_diamond", "toolforge_emerald", "toolforge_cobalt", "toolforge_ardite", "toolforge_manyullyn", "toolforge_copper", - "toolforge_bronze", "toolforge_tin", "toolforge_aluminum", "toolforge_alubrass", "toolforge_alumite", "toolforge_steel" }; + String[] textureNames = { "toolforge_iron", "toolforge_gold", "toolforge_diamond", "toolforge_emerald", "toolforge_cobalt", "toolforge_ardite", "toolforge_manyullyn", "toolforge_copper", "toolforge_bronze", "toolforge_tin", "toolforge_aluminum", "toolforge_alubrass", "toolforge_alumite", "toolforge_steel" }; /* Rendering */ @Override diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index 7ab73a3d..45044bbb 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -1,7 +1,7 @@ package tconstruct.tools.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -9,26 +9,18 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; 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.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.PartBuilderLogic; -import tconstruct.tools.logic.PatternChestLogic; -import tconstruct.tools.logic.StencilTableLogic; -import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.logic.*; import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ToolStationBlock extends InventoryBlock { @@ -46,11 +38,7 @@ public class ToolStationBlock extends InventoryBlock @Override public String[] getTextureNames () { - String[] textureNames = { "toolstation_top", "toolstation_side", "toolstation_bottom", "partbuilder_oak_top", "partbuilder_oak_side", "partbuilder_oak_bottom", "partbuilder_spruce_top", - "partbuilder_spruce_side", "partbuilder_spruce_bottom", "partbuilder_birch_top", "partbuilder_birch_side", "partbuilder_birch_bottom", "partbuilder_jungle_top", - "partbuilder_jungle_side", "partbuilder_jungle_bottom", "patternchest_top", "patternchest_side", "patternchest_bottom", "stenciltable_oak_top", "stenciltable_oak_side", - "stenciltable_oak_bottom", "stenciltable_spruce_top", "stenciltable_spruce_side", "stenciltable_spruce_bottom", "stenciltable_birch_top", "stenciltable_birch_side", - "stenciltable_birch_bottom", "stenciltable_jungle_top", "stenciltable_jungle_side", "stenciltable_jungle_bottom" }; + String[] textureNames = { "toolstation_top", "toolstation_side", "toolstation_bottom", "partbuilder_oak_top", "partbuilder_oak_side", "partbuilder_oak_bottom", "partbuilder_spruce_top", "partbuilder_spruce_side", "partbuilder_spruce_bottom", "partbuilder_birch_top", "partbuilder_birch_side", "partbuilder_birch_bottom", "partbuilder_jungle_top", "partbuilder_jungle_side", "partbuilder_jungle_bottom", "patternchest_top", "patternchest_side", "patternchest_bottom", "stenciltable_oak_top", "stenciltable_oak_side", "stenciltable_oak_bottom", "stenciltable_spruce_top", "stenciltable_spruce_side", "stenciltable_spruce_bottom", "stenciltable_birch_top", "stenciltable_birch_side", "stenciltable_birch_bottom", "stenciltable_jungle_top", "stenciltable_jungle_side", "stenciltable_jungle_bottom" }; return textureNames; } @@ -118,8 +106,7 @@ public class ToolStationBlock extends InventoryBlock { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, - (double) z + this.maxZ); + return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); return AxisAlignedBB.getBoundingBox((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } @@ -223,7 +210,7 @@ public class ToolStationBlock extends InventoryBlock { return "tinker"; } - + /* Keep pattern chest inventory */ @Override public void breakBlock (World par1World, int x, int y, int z, Block blockID, int meta) @@ -235,7 +222,7 @@ public class ToolStationBlock extends InventoryBlock par1World.removeTileEntity(x, y, z); } } - + @Override public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { @@ -274,7 +261,7 @@ public class ToolStationBlock extends InventoryBlock public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) { if (meta < 5 || meta > 9) - super.harvestBlock(world, player, x, y, z, meta); + super.harvestBlock(world, player, x, y, z, meta); //Do nothing } diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index 6a5ef8ab..787d3023 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -1,34 +1,21 @@ package tconstruct.tools.entity; -import io.netty.buffer.ByteBuf; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; +import java.util.*; +import net.minecraft.block.Block; +import net.minecraft.crash.*; +import net.minecraft.entity.*; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.player.*; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Blocks; +import net.minecraft.item.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.S2BPacketChangeGameState; +import net.minecraft.util.*; +import net.minecraft.world.World; public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData { @@ -273,8 +260,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (f3 > 0.0F) { float knockback = knockbackStrength + knockbackStrengthMod; - movingobjectposition.entityHit.addVelocity(this.motionX * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3, 0.1D, this.motionZ - * (double) knockback * 0.6000000238418579D / (double) f3); + movingobjectposition.entityHit.addVelocity(this.motionX * (double) this.knockbackStrength * 0.6000000238418579D / (double) f3, 0.1D, this.motionZ * (double) knockback * 0.6000000238418579D / (double) f3); } } @@ -287,8 +273,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); } - if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer - && this.shootingEntity instanceof EntityPlayerMP) + if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0)); // TConstruct.packetPipeline.sendTo(new @@ -357,8 +342,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa { for (l = 0; l < 4; ++l) { - this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double) l / 4.0D, this.posY + this.motionY * (double) l / 4.0D, this.posZ + this.motionZ * (double) l / 4.0D, - -this.motionX, -this.motionY + 0.2D, -this.motionZ); + this.worldObj.spawnParticle("crit", this.posX + this.motionX * (double) l / 4.0D, this.posY + this.motionY * (double) l / 4.0D, this.posZ + this.motionZ * (double) l / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); } } @@ -399,8 +383,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa for (int j1 = 0; j1 < 4; ++j1) { f3 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, - this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, this.motionY, this.motionZ); } dropSpeed = 0.8F; diff --git a/src/main/java/tconstruct/tools/entity/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java index 79986a4d..94668b40 100644 --- a/src/main/java/tconstruct/tools/entity/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -3,13 +3,10 @@ package tconstruct.tools.entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.items.tools.Dagger; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; public class DaggerEntity extends RotatingBase { diff --git a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java index 614afd4e..0ac7ee67 100644 --- a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -1,20 +1,15 @@ package tconstruct.tools.entity; -import java.util.Iterator; -import java.util.List; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.potion.*; +import net.minecraft.util.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LaunchedPotion extends EntityThrowable { diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index 303f05ad..c3e3fae3 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -1,23 +1,18 @@ package tconstruct.tools.entity; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; - import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.library.tools.AbilityHelper; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index 15c5e3cd..0eda0116 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -2,24 +2,17 @@ package tconstruct.tools.gui; import java.math.RoundingMode; import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.List; - +import java.util.*; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - import tconstruct.library.armor.ArmorCore; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.*; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.logic.CraftingStationLogic; @@ -310,8 +303,7 @@ public class CraftingStationGui extends GuiContainer offset++; fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), offsetX + 8, base + offset * 10, 0xffffff); offset++; - fontRendererObj.drawString("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2")), offsetX + 8, base + offset * 10, - 0xffffff); + fontRendererObj.drawString("- " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + HarvestLevels.getHarvestLevelName(tags.getInteger("HarvestLevel2")), offsetX + 8, base + offset * 10, 0xffffff); offset++; offset++; } diff --git a/src/main/java/tconstruct/tools/gui/FrypanGui.java b/src/main/java/tconstruct/tools/gui/FrypanGui.java index 00de8ff5..687ecf6d 100644 --- a/src/main/java/tconstruct/tools/gui/FrypanGui.java +++ b/src/main/java/tconstruct/tools/gui/FrypanGui.java @@ -2,12 +2,9 @@ package tconstruct.tools.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - import tconstruct.tools.logic.FrypanLogic; public class FrypanGui extends GuiContainer diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index 7eb1ae74..bf7e0efc 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -1,16 +1,13 @@ package tconstruct.tools.gui; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import tconstruct.tools.inventory.FurnaceContainer; import tconstruct.tools.logic.FurnaceLogic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class FurnaceGui extends GuiContainer diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java index a59dc7ad..eadf1915 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonStencil.java @@ -5,9 +5,9 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tconstruct.library.client.StencilGuiElement; -import tconstruct.library.client.ToolGuiElement; -public class GuiButtonStencil extends GuiButton{ +public class GuiButtonStencil extends GuiButton +{ /** * True for pointing right (next page), false for pointing left (previous * page). diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index 60cbe1a0..091e7ca2 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -1,14 +1,11 @@ package tconstruct.tools.gui; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import tconstruct.library.client.ToolGuiElement; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiButtonTool extends GuiButton diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 60c6034a..a623408c 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -5,13 +5,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import tconstruct.client.gui.NewContainerGui; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; diff --git a/src/main/java/tconstruct/tools/gui/PatternChestGui.java b/src/main/java/tconstruct/tools/gui/PatternChestGui.java index 920bd6b9..9ec63fd5 100644 --- a/src/main/java/tconstruct/tools/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/tools/gui/PatternChestGui.java @@ -2,12 +2,9 @@ package tconstruct.tools.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - import tconstruct.tools.logic.PatternChestLogic; public class PatternChestGui extends GuiContainer diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index eeee93cf..31b4384a 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -4,18 +4,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - import tconstruct.TConstruct; -import tconstruct.library.client.StencilGuiElement; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; +import tconstruct.library.client.*; import tconstruct.library.crafting.StencilBuilder; -import tconstruct.tools.TinkerTools; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; import tconstruct.util.network.PatternTablePacket; @@ -67,7 +61,7 @@ public class StencilTableGui extends GuiContainer super.initGui(); int bpr = 4; // buttons per row! - int cornerX = this.guiLeft - 22*bpr; + int cornerX = this.guiLeft - 22 * bpr; int cornerY = this.guiTop + 2; this.buttonList.clear(); @@ -76,10 +70,9 @@ public class StencilTableGui extends GuiContainer for (int iter = 0; iter < TConstructClientRegistry.stencilButtons.size(); iter++) { StencilGuiElement element = TConstructClientRegistry.stencilButtons.get(iter); - if(element.stencilIndex == -1) + if (element.stencilIndex == -1) continue; - GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, - element); + GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); this.buttonList.add(button); } @@ -89,16 +82,16 @@ public class StencilTableGui extends GuiContainer for (int iter = 0; iter < TConstructClientRegistry.stencilButtons2.size(); iter++) { StencilGuiElement element = TConstructClientRegistry.stencilButtons2.get(iter); - if(element.stencilIndex == -1) + if (element.stencilIndex == -1) continue; - GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, - element); + GuiButtonStencil button = new GuiButtonStencil(id++, cornerX + 22 * (iter % bpr), cornerY + 22 * (iter / bpr), element.buttonIconX, element.buttonIconY, element.domain, element.texture, element); this.buttonList.add(button); } // get the correct setting :I ItemStack stack; - if(logic.getStackInSlot(1) != null) { + if (logic.getStackInSlot(1) != null) + { activeButton = StencilBuilder.getIndex(logic.getStackInSlot(1)); setActiveButton(activeButton); stack = StencilBuilder.getStencil(((GuiButtonStencil) this.buttonList.get(activeButton)).element.stencilIndex); @@ -116,9 +109,9 @@ public class StencilTableGui extends GuiContainer ItemStack pattern = logic.getStackInSlot(0); if (pattern != null && StencilBuilder.isBlank(pattern)) { - int id = ((GuiButtonStencil)button).element.stencilIndex; + int id = ((GuiButtonStencil) button).element.stencilIndex; ItemStack stack = StencilBuilder.getStencil(id); - if(stack != null) + if (stack != null) { logic.setSelectedPattern(stack); updateServer(stack); @@ -128,14 +121,14 @@ public class StencilTableGui extends GuiContainer setActiveButton(button.id); } - private void setActiveButton(int id) + private void setActiveButton (int id) { // deactivate old button - ((GuiButton)this.buttonList.get(activeButton)).enabled = true; + ((GuiButton) this.buttonList.get(activeButton)).enabled = true; // update active button activeButton = id; // activate the button - ((GuiButton)this.buttonList.get(activeButton)).enabled = false; + ((GuiButton) this.buttonList.get(activeButton)).enabled = false; } void updateServer (ItemStack stack) diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index d10d59ed..8229f140 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -1,14 +1,12 @@ package tconstruct.tools.gui; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; +import tconstruct.library.client.*; import tconstruct.tools.logic.ToolForgeLogic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ToolForgeGui extends ToolStationGui @@ -35,16 +33,14 @@ public class ToolForgeGui extends ToolStationGui for (int iter = 0; iter < TConstructClientRegistry.tierTwoButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.tierTwoButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + 1, this.guiLeft + 22 * ((iter + 1) % 5), this.guiTop + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, repair.domain, - element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter + 1, this.guiLeft + 22 * ((iter + 1) % 5), this.guiTop + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); this.buttonList.add(button); } for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter + offset, this.guiLeft + 22 * ((iter + offset) % 5), this.guiTop + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, - repair.domain, element.texture, element); + GuiButtonTool button = new GuiButtonTool(iter + offset, this.guiLeft + 22 * ((iter + offset) % 5), this.guiTop + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); this.buttonList.add(button); } } diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index a2cb693e..aebaf49a 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -1,36 +1,26 @@ package tconstruct.tools.gui; +import cpw.mods.fml.relauncher.*; import java.math.RoundingMode; import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; +import java.util.*; +import net.minecraft.client.gui.*; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import tconstruct.TConstruct; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.client.*; +import tconstruct.library.tools.*; import tconstruct.library.util.HarvestLevels; import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.tools.inventory.ToolStationContainer; import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.network.ToolStationPacket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ToolStationGui extends GuiContainer @@ -102,8 +92,7 @@ public class ToolStationGui extends GuiContainer for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter, this.guiLeft + 22 * (iter % 5), this.guiTop + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, - element); + GuiButtonTool button = new GuiButtonTool(iter, this.guiLeft + 22 * (iter % 5), this.guiTop + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); this.buttonList.add(button); } } @@ -335,7 +324,7 @@ public class ToolStationGui extends GuiContainer trueSpeed = 0; fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), 294, base + offset * 10, 0xffffff); offset++; - if (stoneboundSpeed != 0 && !Float.isNaN(stoneboundSpeed)) + if (stoneboundSpeed != 0 && !Float.isNaN(stoneboundSpeed)) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), 294, base + offset * 10, 0xffffff); diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index 9ba3c6b3..ca186bff 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -1,14 +1,9 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index 780cfc59..c9ff9c9e 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -1,11 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.FrypanLogic; @@ -90,7 +87,7 @@ public class FrypanContainer extends Container Block block = logic.getWorldObj().getBlock(logic.xCoord, logic.yCoord, logic.zCoord); if (block != TinkerTools.heldItemBlock) return false; - + return logic.isUseableByPlayer(entityplayer); } diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 31646478..bbe39ad1 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -1,17 +1,12 @@ package tconstruct.tools.inventory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotFurnace; +import cpw.mods.fml.relauncher.*; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; import tconstruct.tools.logic.FurnaceLogic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FurnaceContainer extends Container { diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 964b185b..f301336d 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -2,8 +2,7 @@ package tconstruct.tools.inventory; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class InventoryCraftingStation extends InventoryCrafting diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java index 9c81d262..a9d4599c 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java @@ -1,16 +1,14 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.library.util.IPattern; import tconstruct.smeltery.inventory.ActiveContainer; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.PartBuilderLogic; -import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.*; public class PartCrafterChestContainer extends ActiveContainer { @@ -27,8 +25,7 @@ public class PartCrafterChestContainer extends ActiveContainer patternLogic = pLogic; largeInventory = true; - inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), - new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; + inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; for (int iter = 0; iter < inventory.length; iter++) this.addSlotToContainer(inventory[iter]); diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index 3cd8379f..9f622c75 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -1,8 +1,7 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.armor.inventory.SlotOnlyTake; @@ -25,8 +24,7 @@ public class PartCrafterContainer extends ActiveContainer logic = partLogic; largeInventory = false; - inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), - new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; + inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; for (int iter = 0; iter < inventory.length; iter++) this.addSlotToContainer(inventory[iter]); diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 6a9ef38a..2a5dfa4a 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -1,10 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.library.util.IPattern; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index ad0dca20..04b071ca 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -1,10 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.entity.player.*; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.armor.inventory.SlotOnlyTake; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index 7e57fec0..cdf9cd34 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -1,8 +1,7 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.SlotCrafting; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.AbilityHelper; @@ -11,6 +10,7 @@ public class SlotCraftingStation extends SlotCrafting { private final IInventory matrix; private EntityPlayer player; + public SlotCraftingStation(EntityPlayer par1EntityPlayer, IInventory par2IInventory, IInventory par3iInventory, int par4, int par5, int par6) { super(par1EntityPlayer, par2IInventory, par3iInventory, par4, par5, par6); diff --git a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java index 53558847..ae73acb5 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java @@ -1,8 +1,10 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; +import net.minecraft.item.*; +import net.minecraft.nbt.NBTTagCompound; +import tconstruct.achievements.TAchievements; public class SlotFrypan extends Slot { @@ -15,7 +17,7 @@ public class SlotFrypan extends Slot this.player = player; } - /*@Override + @Override public void putStack (ItemStack par1ItemStack) { super.putStack(par1ItemStack); @@ -26,8 +28,9 @@ public class SlotFrypan extends Slot { return; } - player.addStat(TAchievements.achievements.get("tconstruct:dualConvenience"), 1); + + TAchievements.triggerAchievement(player, "tconstruct.dualConvenience"); } - }*/ + } } diff --git a/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java index 8430b477..662d10e8 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java @@ -1,7 +1,6 @@ package tconstruct.tools.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; public class SlotPartBuilder extends Slot diff --git a/src/main/java/tconstruct/tools/inventory/SlotPattern.java b/src/main/java/tconstruct/tools/inventory/SlotPattern.java index a980b72f..607c7a01 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPattern.java @@ -1,7 +1,6 @@ package tconstruct.tools.inventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import tconstruct.library.util.IPattern; diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java index 7b4547e8..6d1203f9 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -1,10 +1,8 @@ package tconstruct.tools.inventory; import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; @@ -67,7 +65,8 @@ public class SlotTool extends Slot player.worldObj.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } - else //Simply naming items + else + //Simply naming items { int amount = inventory.getStackInSlot(1).stackSize; inventory.decrStackSize(1, amount); diff --git a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java index cb3bb467..e42cdcb8 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java @@ -1,7 +1,6 @@ package tconstruct.tools.inventory; import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -35,7 +34,8 @@ public class SlotToolForge extends SlotTool player.worldObj.playAuxSFX(1021, (int) player.posX, (int) player.posY, (int) player.posZ, 0); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } - else //Simply naming items + else + //Simply naming items { int amount = inventory.getStackInSlot(1).stackSize; inventory.decrStackSize(1, amount); diff --git a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index f2276d3c..3adc528c 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -1,8 +1,7 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,8 +9,7 @@ import net.minecraftforge.common.MinecraftForge; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.ToolForgeLogic; -import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.logic.*; public class ToolForgeContainer extends ToolStationContainer { @@ -94,13 +92,14 @@ public class ToolForgeContainer extends ToolStationContainer player.worldObj.playAuxSFX(1021, (int) player.posX, (int) player.posY, (int) player.posZ, 0); MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.logic, player, stack)); } - else //Simply naming items + else + //Simply naming items { int amount = logic.getStackInSlot(1).stackSize; logic.decrStackSize(1, amount); } } - + @Override public boolean canInteractWith (EntityPlayer entityplayer) { diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index 6b7de625..1c86005e 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -1,10 +1,8 @@ package tconstruct.tools.inventory; import java.util.Random; - import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.*; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 20aef4a7..6a85687e 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -1,19 +1,16 @@ package tconstruct.tools.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class MultiBrickFancyItem extends MultiItemBlock { - static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", - "stone", "stone.road" }; + static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone", "stone.road" }; public MultiBrickFancyItem(Block b) { diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 713360e2..c41264e0 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -1,19 +1,16 @@ package tconstruct.tools.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class MultiBrickItem extends MultiItemBlock { - static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", - "stone.road", "stone.refined.road" }; + static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot", "stone.road", "stone.refined.road" }; public MultiBrickItem(Block b) { diff --git a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java index be14bbfa..2c22eb32 100644 --- a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java @@ -5,8 +5,7 @@ import net.minecraft.block.Block; public class ToolStationItemBlock extends MultiItemBlock { - public static final String blockTypes[] = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternShaper", - "PatternShaper", "PatternShaper", "PatternShaper", "CastingTable" }; + public static final String blockTypes[] = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternChest", "PatternShaper", "PatternShaper", "PatternShaper", "PatternShaper", "CastingTable" }; public ToolStationItemBlock(Block b) { diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index edbcf99a..8ea51e2b 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -1,15 +1,13 @@ package tconstruct.tools.items; +import cpw.mods.fml.common.Loader; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.Loader; public class Bowstring extends CraftingItem implements IToolPart { @@ -40,7 +38,7 @@ public class Bowstring extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { - if(stack.getItemDamage() >= toolMaterialNames.length) + if (stack.getItemDamage() >= toolMaterialNames.length) return -1; return stack.getItemDamage(); } diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index 400d31a0..012b64fd 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -1,20 +1,16 @@ package tconstruct.tools.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; 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.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.crafting.ToolRecipe; +import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class CreativeModifier extends Item { diff --git a/src/main/java/tconstruct/tools/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java index 5e71f4cb..c063f27f 100644 --- a/src/main/java/tconstruct/tools/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -34,7 +34,7 @@ public class Fletching extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { - if(stack.getItemDamage() >= toolMaterialNames.length) + if (stack.getItemDamage() >= toolMaterialNames.length) return -1; return stack.getItemDamage(); } diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index fab7891a..1b8edc01 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -1,7 +1,9 @@ package tconstruct.tools.items; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.books.BookData; import mantle.client.gui.GuiManual; import mantle.items.abstracts.CraftingItem; @@ -10,12 +12,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Manual extends CraftingItem { @@ -33,6 +32,8 @@ public class Manual extends CraftingItem @SideOnly(Side.CLIENT) public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) { + TAchievements.triggerAchievement(player, "tconstruct.beginner"); + Side side = FMLCommonHandler.instance().getEffectiveSide(); player.openGui(TConstruct.instance, mantle.client.MProxyClient.manualGuiID, world, 0, 0, 0); FMLClientHandler.instance().displayGuiScreen(player, new GuiManual(stack, getData(stack))); diff --git a/src/main/java/tconstruct/tools/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java index 2a27a489..5c68e0f4 100644 --- a/src/main/java/tconstruct/tools/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -1,15 +1,11 @@ package tconstruct.tools.items; -import mantle.books.BookData; -import mantle.books.BookDataStore; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.w3c.dom.Document; - -import tconstruct.client.TProxyClient; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import mantle.books.*; +import net.minecraft.util.*; +import org.w3c.dom.Document; +import tconstruct.client.TProxyClient; public class ManualInfo { @@ -29,12 +25,9 @@ public class ManualInfo public ManualInfo() { Side side = FMLCommonHandler.instance().getEffectiveSide(); - beginner = initManual(beginner, "tconstruct.manual.beginner", "\u00a7o" + StatCollector.translateToLocal("manual1.tooltip"), side == Side.CLIENT ? TProxyClient.volume1 : null, - "tinker:tinkerbook_diary"); - toolStation = initManual(toolStation, "tconstruct.manual.toolstation", "\u00a7o" + StatCollector.translateToLocal("manual2.tooltip"), side == Side.CLIENT ? TProxyClient.volume2 : null, - "tinker:tinkerbook_toolstation"); - smeltery = initManual(smeltery, "tconstruct.manual.smeltery", "\u00a7o" + StatCollector.translateToLocal("manual3.tooltip"), side == Side.CLIENT ? TProxyClient.smelter : null, - "tinker:tinkerbook_smeltery"); + beginner = initManual(beginner, "tconstruct.manual.beginner", "\u00a7o" + StatCollector.translateToLocal("manual1.tooltip"), side == Side.CLIENT ? TProxyClient.volume1 : null, "tinker:tinkerbook_diary"); + toolStation = initManual(toolStation, "tconstruct.manual.toolstation", "\u00a7o" + StatCollector.translateToLocal("manual2.tooltip"), side == Side.CLIENT ? TProxyClient.volume2 : null, "tinker:tinkerbook_toolstation"); + smeltery = initManual(smeltery, "tconstruct.manual.smeltery", "\u00a7o" + StatCollector.translateToLocal("manual3.tooltip"), side == Side.CLIENT ? TProxyClient.smelter : null, "tinker:tinkerbook_smeltery"); diary = initManual(diary, "tconstruct.manual.diary", "\u00a7o" + StatCollector.translateToLocal("manual4.tooltip"), side == Side.CLIENT ? TProxyClient.diary : null, "tinker:tinkerbook_blue"); } diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index 0b676c5f..fc82c963 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -24,14 +24,7 @@ public class MaterialItem extends CraftingItem return names; } - static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", - "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", - "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", - "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick", "ArditeDust", "CobaltDust", "AluminumDust", "ManyullynDust", "AluBrassDust" }; + static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick", "ArditeDust", "CobaltDust", "AluminumDust", "ManyullynDust", "AluBrassDust" }; - static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", - "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", - "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", - "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball", "searedbrick_nether", "ardite_dust", "cobalt_dust", "aluminum_dust", "manyullyn_dust", - "alubrass_dust" }; + static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball", "searedbrick_nether", "ardite_dust", "cobalt_dust", "aluminum_dust", "manyullyn_dust", "alubrass_dust" }; } diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index f688c8d5..eca2b9c9 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -1,18 +1,15 @@ package tconstruct.tools.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.items.abstracts.CraftingItem; 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.*; import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Pattern extends CraftingItem implements IPattern { @@ -38,8 +35,7 @@ public class Pattern extends CraftingItem implements IPattern return names; } - private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; + private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; @Override public void getSubItems (Item b, CreativeTabs tab, List list) diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index 80080566..238eb8a0 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -1,27 +1,20 @@ package tconstruct.tools.items; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Facing; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; +import net.minecraft.item.*; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.client.TProxyClient; import tconstruct.library.tools.ToolCore; import tconstruct.world.entity.BlueSlime; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TitleIcon extends Item { diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 587b0379..f4246f26 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -1,11 +1,9 @@ package tconstruct.tools.items; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; @@ -62,11 +60,9 @@ public class ToolPart extends CraftingItem implements IToolPart return names; } - public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", - "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "Pig Iron", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; + public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "Pig Iron", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; - public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", - "copper", "bronze", "alumite", "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; + public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; @Override public void getSubItems (Item b, CreativeTabs tab, List list) @@ -81,7 +77,7 @@ public class ToolPart extends CraftingItem implements IToolPart @Override public int getMaterialID (ItemStack stack) { - if(TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) + if (TConstructRegistry.toolMaterials.keySet().contains(stack.getItemDamage())) return stack.getItemDamage(); return -1; diff --git a/src/main/java/tconstruct/tools/items/ToolPartHidden.java b/src/main/java/tconstruct/tools/items/ToolPartHidden.java index d9b657f3..f674e727 100644 --- a/src/main/java/tconstruct/tools/items/ToolPartHidden.java +++ b/src/main/java/tconstruct/tools/items/ToolPartHidden.java @@ -1,7 +1,6 @@ package tconstruct.tools.items; import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/tools/items/ToolShard.java b/src/main/java/tconstruct/tools/items/ToolShard.java index 8c4a1efd..02af9f94 100644 --- a/src/main/java/tconstruct/tools/items/ToolShard.java +++ b/src/main/java/tconstruct/tools/items/ToolShard.java @@ -1,15 +1,12 @@ package tconstruct.tools.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ToolShard extends ToolPart { diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index dfa0ec09..0f85685f 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -1,16 +1,11 @@ package tconstruct.tools.logic; import java.lang.ref.WeakReference; - import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.tileentity.*; import net.minecraft.world.World; import tconstruct.tools.inventory.CraftingStationContainer; @@ -38,7 +33,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent patternChest = null; furnace = null; tinkerTable = false; - int[] ys = {y, y - 1, y + 1}; + int[] ys = { y, y - 1, y + 1 }; for (byte iy = 0; iy < 3; iy++) { int yPos = ys[iy]; @@ -103,7 +98,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent { return i != 0; } - + @Override public ItemStack decrStackSize (int slot, int quantity) { diff --git a/src/main/java/tconstruct/tools/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java index a96c5e74..cdf6f234 100644 --- a/src/main/java/tconstruct/tools/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -1,25 +1,18 @@ package tconstruct.tools.logic; -import tconstruct.tools.inventory.FrypanContainer; +import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.iface.IActiveLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.init.*; import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; +import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; +import tconstruct.tools.inventory.FrypanContainer; /* Slots * 0: Frying pan item diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index 78c25501..cc48e4d0 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -1,33 +1,24 @@ package tconstruct.tools.logic; +import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; +import net.minecraft.init.*; +import net.minecraft.inventory.*; +import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; +import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.tools.inventory.FurnaceContainer; -import cpw.mods.fml.common.registry.GameRegistry; /* Slots * 0: Input @@ -44,9 +35,9 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public int progress; public int fuelScale = 200; byte direction; - private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {2, 1}; - private static final int[] slots_sides = new int[] {1}; + private static final int[] slots_top = new int[] { 0 }; + private static final int[] slots_bottom = new int[] { 2, 1 }; + private static final int[] slots_sides = new int[] { 1 }; public FurnaceLogic() { @@ -280,13 +271,13 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public void readNetworkNBT (NBTTagCompound tags) { - active = tags.getBoolean("Active"); + active = tags.getBoolean("Active"); direction = tags.getByte("Direction"); } public void writeNetworkNBT (NBTTagCompound tags) { - tags.setBoolean("Active", active); + tags.setBoolean("Active", active); tags.setByte("Direction", direction); } @@ -378,31 +369,31 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin { } - public static boolean isItemFuel(ItemStack par0ItemStack) + public static boolean isItemFuel (ItemStack par0ItemStack) { return getItemBurnTime(par0ItemStack) > 0; } @Override - public boolean isItemValidForSlot(int par1, ItemStack par2ItemStack) + public boolean isItemValidForSlot (int par1, ItemStack par2ItemStack) { return par1 == 2 ? false : (par1 == 1 ? isItemFuel(par2ItemStack) : true); } @Override - public int[] getAccessibleSlotsFromSide(int par1) + public int[] getAccessibleSlotsFromSide (int par1) { return par1 == 0 ? slots_bottom : (par1 == 1 ? slots_top : slots_sides); } - + @Override - public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) + public boolean canInsertItem (int par1, ItemStack par2ItemStack, int par3) { return this.isItemValidForSlot(par1, par2ItemStack); } @Override - public boolean canExtractItem(int par1, ItemStack par2ItemStack, int par3) + public boolean canExtractItem (int par1, ItemStack par2ItemStack, int par3) { return par3 != 0 || par1 != 1 || par2ItemStack.getItem() == Items.bucket; } diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index 15995af2..70d1fe94 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -2,16 +2,14 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; -import tconstruct.tools.inventory.PartCrafterChestContainer; -import tconstruct.tools.inventory.PartCrafterContainer; +import tconstruct.tools.inventory.*; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { @@ -50,8 +48,9 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory } @Override - public boolean canDropInventorySlot(int slot) { - return slot <= 3 ; // 0-3 = only drop input slots + public boolean canDropInventorySlot (int slot) + { + return slot <= 3; // 0-3 = only drop input slots } //Called when emptying a slot, not when another item is placed in it diff --git a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java index 29a5ac29..5b7cb4c7 100644 --- a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -2,13 +2,11 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.library.crafting.StencilBuilder; -import tconstruct.tools.TinkerTools; import tconstruct.tools.inventory.PatternShaperContainer; public class StencilTableLogic extends InventoryLogic implements ISidedInventory @@ -46,7 +44,7 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory super.onInventoryChanged(); }*/ - public void setSelectedPattern(ItemStack stack) + public void setSelectedPattern (ItemStack stack) { selectedStack = stack; this.setInventorySlotContents(1, stack); diff --git a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index 6388445f..2d47b371 100644 --- a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -1,13 +1,10 @@ package tconstruct.tools.logic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.library.crafting.ModifyBuilder; -import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.crafting.*; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolForgeContainer; @@ -64,7 +61,7 @@ public class ToolForgeLogic extends ToolStationLogic implements ISidedInventory //NBTTagCompound tags = tool.getTagCompound(); //if (!tags.getCompoundTag(((IModifyable) tool.getItem()).getBaseTagName()).hasKey("Built")) //{ - output = tool; + output = tool; //} } } diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 0e94ce87..ec4d7b1c 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -2,13 +2,11 @@ package tconstruct.tools.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.library.crafting.ModifyBuilder; -import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.crafting.*; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolStationContainer; @@ -111,7 +109,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory buildTool(name); } - protected ItemStack tryRenameTool(ItemStack output, String name) + protected ItemStack tryRenameTool (ItemStack output, String name) { ItemStack temp; if (output != null) @@ -132,12 +130,12 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory NBTTagCompound display = null; if (!(tags.hasKey("display"))) display = new NBTTagCompound(); - else if(tags.getCompoundTag("display").hasKey("Name")) + else if (tags.getCompoundTag("display").hasKey("Name")) display = tags.getCompoundTag("display"); - if(display == null) + if (display == null) return output; - if(display.hasKey("Name") && !display.getString("Name").equals("\u00A7f" + ToolBuilder.defaultToolName(temp))) + if (display.hasKey("Name") && !display.getString("Name").equals("\u00A7f" + ToolBuilder.defaultToolName(temp))) // no default name anymore return output; @@ -147,7 +145,6 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory temp.setRepairCost(2); output = temp; - return output; } diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index 19387c8a..1f193087 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -1,30 +1,19 @@ package tconstruct.tools.model; +import cpw.mods.fml.relauncher.*; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.texture.*; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; +import net.minecraft.item.*; +import net.minecraft.util.*; import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.*; @SideOnly(Side.CLIENT) public class FancyItemRender extends Render @@ -488,8 +477,7 @@ public class FancyItemRender extends Render tessellator.startDrawingQuads(); tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); - tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + par5), (double) this.zLevel, (double) ((f2 + (float) par4 + (float) par5 * f4) * f), (double) ((f3 + (float) par5) * f1)); tessellator.addVertexWithUV((double) (par2 + par4), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + (float) par4) * f), (double) ((f3 + 0.0F) * f1)); tessellator.addVertexWithUV((double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) ((f3 + 0.0F) * f1)); tessellator.draw(); diff --git a/src/main/java/tconstruct/tools/model/FrypanRender.java b/src/main/java/tconstruct/tools/model/FrypanRender.java index a38822b0..b8e33644 100644 --- a/src/main/java/tconstruct/tools/model/FrypanRender.java +++ b/src/main/java/tconstruct/tools/model/FrypanRender.java @@ -1,10 +1,9 @@ package tconstruct.tools.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class FrypanRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index 16c53fba..56caa839 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -1,15 +1,11 @@ package tconstruct.tools.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class TableRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java index aa19f8ee..9cd9d795 100644 --- a/src/main/java/tconstruct/util/CraftingRecipeHelper.java +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -1,15 +1,9 @@ package tconstruct.util; -import java.util.HashMap; -import java.util.List; - +import java.util.*; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.item.*; +import net.minecraft.item.crafting.*; public class CraftingRecipeHelper { @@ -70,7 +64,6 @@ public class CraftingRecipeHelper } } } - public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray) { diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java index 36d58701..d8ac3e73 100644 --- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java +++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java @@ -1,9 +1,7 @@ package tconstruct.util; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.*; public class DamageSourceFireworkExplode extends DamageSource { @@ -17,7 +15,7 @@ public class DamageSourceFireworkExplode extends DamageSource @Override public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase) { - return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_()); + return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_()); } } diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java index eae39313..4bd52e9c 100644 --- a/src/main/java/tconstruct/util/DamageSourceLandmine.java +++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java @@ -1,9 +1,7 @@ package tconstruct.util; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.*; public class DamageSourceLandmine extends DamageSource { diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index 96b185c6..257b6047 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -1,16 +1,11 @@ package tconstruct.util; -import java.util.ArrayList; -import java.util.List; - -import mantle.crash.CallableSuppConfig; -import mantle.crash.CallableUnsuppConfig; +import cpw.mods.fml.common.*; +import cpw.mods.fml.relauncher.Side; +import java.util.*; +import mantle.crash.*; import net.minecraftforge.common.MinecraftForge; import tconstruct.TConstruct; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ICrashCallable; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; public class EnvironmentChecks { @@ -64,9 +59,7 @@ public class EnvironmentChecks String n = consoleFormat ? System.getProperty("line.separator") : "\n"; if (type.equals("GregTech")) { - return "- GregTech is a meta-mod that changes how a lot of mods interact with the base game and with each other." + n - + "- The mod restructures the registration of various ores within the Ore Dictionary. This may alter or break the original design intention of various other mods." + n - + "- This mod alters various fundamental recipes from vanilla Minecraft."; + return "- GregTech is a meta-mod that changes how a lot of mods interact with the base game and with each other." + n + "- The mod restructures the registration of various ores within the Ore Dictionary. This may alter or break the original design intention of various other mods." + n + "- This mod alters various fundamental recipes from vanilla Minecraft."; } return ""; } diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index ba55f09f..f8c860f0 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -1,20 +1,15 @@ package tconstruct.util; import java.lang.reflect.Field; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraftforge.event.entity.living.LivingDropsEvent; - import org.lwjgl.opengl.GL11; - import tconstruct.TConstruct; public class ItemHelper diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index 09b0da61..a0c55c86 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -1,11 +1,10 @@ package tconstruct.util.config; +import cpw.mods.fml.common.Loader; import java.io.File; import java.util.ArrayList; - import net.minecraftforge.common.config.Configuration; import tconstruct.TConstruct; -import cpw.mods.fml.common.Loader; public class DimensionBlacklist { diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 314b2e1f..6a90f823 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -1,12 +1,9 @@ package tconstruct.util.config; import java.io.File; - -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; +import net.minecraftforge.common.config.*; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; -import tconstruct.tools.TinkerTools; public class PHConstruct { @@ -77,6 +74,8 @@ public class PHConstruct capesEnabled = config.get("Superfun", "Enable-TCon-Capes", true).getBoolean(true); + achievementsEnabled = config.get("Achievements", "Enable Achievements", true).getBoolean(true); + boolean ic2 = true; boolean xycraft = true; try @@ -177,8 +176,7 @@ public class PHConstruct // dimension blacklist cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist", new int[] {}, "Add dimension ID's to prevent slime islands from generating in them").getIntList(); - slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false, - "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false); + slimeIslGenDim0Only = config.get("DimBlackList", "GenerateSlimeIslandInDim0Only", false, "True: slime islands wont generate in any ages other than overworld(if enabled); False: will generate in all non-blackisted ages").getBoolean(false); slimeIslGenDim0 = config.get("DimBlackList", "slimeIslGenDim0", true, "True: slime islands generate in overworld; False they do not generate").getBoolean(true); genIslandsFlat = config.get("DimBlacklist", "genIslandsFlat", false, "Generate slime islands in flat worlds").getBoolean(false); @@ -212,6 +210,9 @@ public class PHConstruct public static boolean capesEnabled; + // Achievements + public static boolean achievementsEnabled; + // Ore values public static boolean generateCopper; public static boolean generateTin; diff --git a/src/main/java/tconstruct/util/network/BeltPacket.java b/src/main/java/tconstruct/util/network/BeltPacket.java index 8e05f589..d6ee0da0 100644 --- a/src/main/java/tconstruct/util/network/BeltPacket.java +++ b/src/main/java/tconstruct/util/network/BeltPacket.java @@ -9,7 +9,9 @@ import tconstruct.armor.player.TPlayerStats; public class BeltPacket extends AbstractPacket { - public BeltPacket() {} + public BeltPacket() + { + } @Override public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java index 59b163f3..45925faf 100644 --- a/src/main/java/tconstruct/util/network/GogglePacket.java +++ b/src/main/java/tconstruct/util/network/GogglePacket.java @@ -10,7 +10,9 @@ public class GogglePacket extends AbstractPacket { boolean active; - public GogglePacket() {} + public GogglePacket() + { + } public GogglePacket(boolean active) { diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index c11492db..f41d97da 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -1,31 +1,17 @@ package tconstruct.util.network; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageCodec; - -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.LinkedList; -import java.util.List; - -import mantle.common.network.AbstractPacket; -import mantle.common.network.PacketUpdateTE; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.INetHandler; -import net.minecraft.network.NetHandlerPlayServer; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.*; import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import cpw.mods.fml.relauncher.*; +import io.netty.buffer.*; +import io.netty.channel.*; +import io.netty.handler.codec.MessageToMessageCodec; +import java.util.*; +import mantle.common.network.*; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.*; +import net.minecraft.network.*; /** * Packet pipeline class. Directs all registered packet data to be handled by diff --git a/src/main/java/tconstruct/util/network/PatternTablePacket.java b/src/main/java/tconstruct/util/network/PatternTablePacket.java index 6cc2cf24..60b83b61 100644 --- a/src/main/java/tconstruct/util/network/PatternTablePacket.java +++ b/src/main/java/tconstruct/util/network/PatternTablePacket.java @@ -1,5 +1,6 @@ package tconstruct.util.network; +import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.blocks.abstracts.InventoryLogic; @@ -8,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.network.ByteBufUtils; public class PatternTablePacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java index 185051c7..0282df2b 100644 --- a/src/main/java/tconstruct/util/network/SmelteryPacket.java +++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java @@ -2,8 +2,7 @@ package tconstruct.util.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import mantle.common.network.AbstractPacket; -import mantle.common.network.PacketUpdateTE; +import mantle.common.network.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/util/network/ToolStationPacket.java b/src/main/java/tconstruct/util/network/ToolStationPacket.java index e4ff96b1..a10225f3 100644 --- a/src/main/java/tconstruct/util/network/ToolStationPacket.java +++ b/src/main/java/tconstruct/util/network/ToolStationPacket.java @@ -1,14 +1,13 @@ package tconstruct.util.network; +import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.common.network.AbstractPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.tools.logic.ToolForgeLogic; -import tconstruct.tools.logic.ToolStationLogic; -import cpw.mods.fml.common.network.ByteBufUtils; +import tconstruct.tools.logic.*; public class ToolStationPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index 0632c9d8..9b2f222d 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -1,25 +1,14 @@ package tconstruct.world; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; - +import java.util.*; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; public class MiningExplosion extends Explosion { @@ -76,8 +65,7 @@ public class MiningExplosion extends Explosion if (k1 != Blocks.air) { Block block = k1; - float f3 = this.exploder != null ? this.exploder.func_145772_a(this, this.world, l, i1, j1, block) : block.getExplosionResistance(this.exploder, world, l, i1, j1, - explosionX, explosionY, explosionZ); + float f3 = this.exploder != null ? this.exploder.func_145772_a(this, this.world, l, i1, j1, block) : block.getExplosionResistance(this.exploder, world, l, i1, j1, explosionX, explosionY, explosionZ); f1 -= (f3 + 0.8F) * f2 * 0.25f; } diff --git a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java index e586874d..5b241896 100644 --- a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java @@ -1,8 +1,7 @@ package tconstruct.world; import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.IBlockSource; +import net.minecraft.dispenser.*; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index fd535e3e..99dd7631 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -1,41 +1,30 @@ package tconstruct.world; -import cpw.mods.fml.common.SidedProxy; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; -import net.minecraft.block.Block; +import net.minecraft.block.*; import net.minecraft.block.Block.SoundType; -import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.init.*; +import net.minecraft.item.*; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.potion.Potion; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.common.*; +import net.minecraftforge.fluids.*; +import net.minecraftforge.oredict.*; import tconstruct.TConstruct; import tconstruct.armor.TinkerArmor; import tconstruct.blocks.SlabBase; -import tconstruct.blocks.slime.SlimeFluid; -import tconstruct.blocks.slime.SlimeGel; -import tconstruct.blocks.slime.SlimeGrass; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.blocks.slime.SlimeTallGrass; -import tconstruct.blocks.traps.BarricadeBlock; -import tconstruct.blocks.traps.Punji; +import tconstruct.blocks.slime.*; +import tconstruct.blocks.traps.*; import tconstruct.client.StepSoundSlime; import tconstruct.common.itemblocks.MetadataItemBlock; import tconstruct.library.TConstructRegistry; @@ -43,55 +32,16 @@ import tconstruct.library.crafting.FluidType; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.blocks.MetalOre; import tconstruct.smeltery.itemblocks.MetalItemBlock; -import tconstruct.tools.TDispenserBehaviorArrow; -import tconstruct.tools.TinkerTools; -import tconstruct.tools.blocks.MultiBrick; -import tconstruct.tools.blocks.MultiBrickFancy; -import tconstruct.tools.entity.ArrowEntity; -import tconstruct.tools.entity.DaggerEntity; -import tconstruct.tools.entity.FancyEntityItem; -import tconstruct.tools.entity.LaunchedPotion; -import tconstruct.tools.itemblocks.MultiBrickFancyItem; -import tconstruct.tools.itemblocks.MultiBrickItem; +import tconstruct.tools.*; +import tconstruct.tools.blocks.*; +import tconstruct.tools.entity.*; +import tconstruct.tools.itemblocks.*; import tconstruct.util.config.PHConstruct; -import tconstruct.world.blocks.ConveyorBase; -import tconstruct.world.blocks.GravelOre; -import tconstruct.world.blocks.MeatBlock; -import tconstruct.world.blocks.OreberryBush; -import tconstruct.world.blocks.OreberryBushEssence; -import tconstruct.world.blocks.SlimeExplosive; -import tconstruct.world.blocks.SlimePad; -import tconstruct.world.blocks.StoneLadder; -import tconstruct.world.blocks.StoneTorch; -import tconstruct.world.blocks.TMetalBlock; -import tconstruct.world.blocks.WoodRail; -import tconstruct.world.entity.BlueSlime; -import tconstruct.world.entity.Crystal; -import tconstruct.world.gen.TBaseWorldGenerator; -import tconstruct.world.gen.TerrainGenEventHandler; -import tconstruct.world.itemblocks.BarricadeItem; -import tconstruct.world.itemblocks.GravelOreItem; -import tconstruct.world.itemblocks.HamboneItemBlock; -import tconstruct.world.itemblocks.MetalOreItemBlock; -import tconstruct.world.itemblocks.OreberryBushItem; -import tconstruct.world.itemblocks.OreberryBushSecondItem; -import tconstruct.world.itemblocks.SlimeGelItemBlock; -import tconstruct.world.itemblocks.SlimeGrassItemBlock; -import tconstruct.world.itemblocks.SlimeLeavesItemBlock; -import tconstruct.world.itemblocks.SlimeSaplingItemBlock; -import tconstruct.world.itemblocks.SlimeTallGrassItem; -import tconstruct.world.itemblocks.WoolSlab1Item; -import tconstruct.world.itemblocks.WoolSlab2Item; -import tconstruct.world.items.GoldenHead; -import tconstruct.world.items.OreBerries; -import tconstruct.world.items.StrangeFood; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import tconstruct.world.blocks.*; +import tconstruct.world.entity.*; +import tconstruct.world.gen.*; +import tconstruct.world.itemblocks.*; +import tconstruct.world.items.*; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' World", description = "Ores, slime islands, essence berries, and the like.") @@ -101,7 +51,7 @@ public class TinkerWorld public static TinkerWorld instance; @SidedProxy(clientSide = "tconstruct.world.TinkerWorldProxyClient", serverSide = "tconstruct.world.TinkerWorldProxyCommon") public static TinkerWorldProxyCommon proxy; - + public static Item strangeFood; // Decoration public static Block stoneTorch; @@ -141,12 +91,12 @@ public class TinkerWorld public static Block metalBlock; // Morbid public static Item goldHead; - + @Handler public void preInit (FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new TinkerWorldEvents()); - + //Blocks TinkerWorld.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); TinkerWorld.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth"); @@ -160,7 +110,7 @@ public class TinkerWorld TinkerWorld.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); TinkerWorld.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); TinkerWorld.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime"); - + // Slime TinkerWorld.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); @@ -172,8 +122,8 @@ public class TinkerWorld TinkerWorld.blueSlimeFluid.setBlock(TinkerWorld.slimePool); //TODO: Add a new bucket for blue slime //FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerWorld.blueSlimeFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 24), new ItemStack(Items.bucket))); - - // Slime Islands + + // Slime Islands TinkerWorld.slimeGel = new SlimeGel().setStepSound(TinkerWorld.slimeStep).setLightOpacity(0).setBlockName("slime.gel"); TinkerWorld.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass"); TinkerWorld.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); @@ -216,7 +166,7 @@ public class TinkerWorld GameRegistry.registerBlock(TinkerWorld.meatBlock, HamboneItemBlock.class, "MeatBlock"); GameRegistry.registerBlock(TinkerWorld.woolSlab1, WoolSlab1Item.class, "WoolSlab1"); GameRegistry.registerBlock(TinkerWorld.woolSlab2, WoolSlab2Item.class, "WoolSlab2"); - + // Traps GameRegistry.registerBlock(TinkerWorld.punji, "trap.punji"); GameRegistry.registerBlock(TinkerWorld.barricadeOak, BarricadeItem.class, "trap.barricade.oak"); @@ -256,12 +206,11 @@ public class TinkerWorld // Rail GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood"); - + //Items goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); GameRegistry.registerItem(goldHead, "goldHead"); - TinkerWorld.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood"); TinkerWorld.oreBerries = new OreBerries().setUnlocalizedName("oreberry"); GameRegistry.registerItem(TinkerWorld.strangeFood, "strangeFood"); @@ -284,13 +233,13 @@ public class TinkerWorld // Items.minecartPowered.setMaxStackSize(3); Items.cake.setMaxStackSize(16); // Block.torchWood.setTickRandomly(false); - + TinkerWorld.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock"); TinkerWorld.metalBlock.stepSound = Block.soundTypeMetal; GameRegistry.registerBlock(TinkerWorld.metalBlock, MetalItemBlock.class, "MetalBlock"); FluidType.registerFluidType("Slime", TinkerWorld.slimeGel, 0, 250, TinkerWorld.blueSlimeFluid, false); } - + @Handler public void init (FMLInitializationEvent event) { @@ -300,7 +249,7 @@ public class TinkerWorld addLoot(); createEntities(); proxy.initialize(); - + GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0); MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler()); } @@ -308,10 +257,11 @@ public class TinkerWorld @Handler public void postInit (FMLPostInitializationEvent evt) { - + } - public void createEntities () { + public void createEntities () + { EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); @@ -324,7 +274,8 @@ public class TinkerWorld // EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, // TConstruct.instance, 64, 5, true); - if (PHConstruct.naturalSlimeSpawn > 0) { + if (PHConstruct.naturalSlimeSpawn > 0) + { EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.FOREST)); EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.PLAINS)); EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.MOUNTAIN)); @@ -334,8 +285,8 @@ public class TinkerWorld EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.naturalSlimeSpawn, 4, 20, EnumCreatureType.monster, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.WASTELAND)); } } - - private void craftingTableRecipes() + + private void craftingTableRecipes () { String[] patBlock = { "###", "###", "###" }; String[] patSurround = { "###", "#m#", "###" }; @@ -394,17 +345,14 @@ public class TinkerWorld GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 31), "m", 'm', new ItemStack(TinkerTools.materials, 1, 13)); // Bronze GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 32), "m", 'm', new ItemStack(TinkerTools.materials, 1, 15)); // Alumite GameRegistry.addRecipe(new ItemStack(TinkerTools.materials, 9, 33), "m", 'm', new ItemStack(TinkerTools.materials, 1, 16)); // Steel - - String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", - "dyeMagenta", "dyeOrange", "dyeWhite" }; + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; String color = ""; for (int i = 0; i < 16; i++) { color = dyeTypes[15 - i]; GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Blocks.wool, 8, i), patSurround, 'm', color, '#', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE))); } - // Jack o'Latern Recipe - Stone Torch GameRegistry.addRecipe(new ItemStack(Blocks.lit_pumpkin, 1, 0), "p", "s", 'p', new ItemStack(Blocks.pumpkin), 's', new ItemStack(TinkerWorld.stoneTorch)); @@ -428,7 +376,6 @@ public class TinkerWorld // Ultra hardcore recipes GameRegistry.addRecipe(new ItemStack(goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3)); - // Wool Slab Recipes for (int sc = 0; sc <= 7; sc++) { @@ -445,7 +392,7 @@ public class TinkerWorld GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 2)); GameRegistry.addRecipe(new ItemStack(TinkerWorld.barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 3)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerWorld.barricadeOak, 1, 0), "b", "b", 'b', "logWood")); - + // Slime Recipes GameRegistry.addRecipe(new ItemStack(TinkerWorld.slimeGel, 1, 0), "##", "##", '#', TinkerWorld.strangeFood); GameRegistry.addRecipe(new ItemStack(TinkerWorld.strangeFood, 4, 0), "#", '#', new ItemStack(TinkerWorld.slimeGel, 1, 0)); @@ -457,25 +404,24 @@ public class TinkerWorld GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeExplosive, 1, 0), "slimeball", Blocks.tnt)); GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, Short.MAX_VALUE), new ItemStack(Items.redstone)); - GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.bloodChannel, 1, 0), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack( - TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(Items.redstone)); + GameRegistry.addShapelessRecipe(new ItemStack(TinkerWorld.bloodChannel, 1, 0), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(TinkerWorld.strangeFood, 1, 1), new ItemStack(Items.redstone)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimeChannel, 1, 0), "slimeball", "slimeball", "slimeball", "slimeball", new ItemStack(Items.redstone))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerWorld.slimePad, 1, 0), TinkerWorld.slimeChannel, "slimeball")); - + OreDictionary.registerOre("hambone", new ItemStack(TinkerWorld.meatBlock)); GameRegistry.addRecipe(new ItemStack(TinkerWorld.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Items.bone), 'm', new ItemStack(Items.porkchop)); } - + private void addRecipesForFurnace () { FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 3), new ItemStack(TinkerTools.craftedSoil, 1, 4), 0.2f); // Concecrated - // Soil + // Soil FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 0), new ItemStack(TinkerTools.materials, 1, 1), 2f); // Slime FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 1), new ItemStack(TinkerTools.materials, 1, 2), 2f); // Seared brick item FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 2), new ItemStack(TinkerTools.materials, 1, 17), 2f); // Blue Slime FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.craftedSoil, 1, 6), new ItemStack(TinkerTools.materials, 1, 37), 2f); // Nether seared - // brick + // brick // FurnaceRecipes.smelting().func_151394_a(new ItemStack(TRepo.oreSlag, // 1, new ItemStack(TRepo.materials, 1, 3), 3f); @@ -508,7 +454,7 @@ public class TinkerWorld FurnaceRecipes.smelting().func_151394_a(new ItemStack(TinkerTools.materials, 1, 42), new ItemStack(TinkerTools.materials, 1, 14), 0.2f); } - + public void oreRegistry () { OreDictionary.registerOre("oreCobalt", new ItemStack(TinkerWorld.oreSlag, 1, 1)); @@ -602,8 +548,7 @@ public class TinkerWorld OreDictionary.registerOre("torchStone", new ItemStack(TinkerWorld.stoneTorch)); - String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", - "Blueslime" }; + String[] matNames = { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blueslime" }; for (int i = 0; i < matNames.length; i++) { //TODO 1.8 remove this ore dict entry as it's outdated(use materialRod instead) @@ -612,8 +557,7 @@ public class TinkerWorld } OreDictionary.registerOre("thaumiumRod", new ItemStack(TinkerTools.toolRod, 1, 31)); - String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", - "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++) { OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TinkerSmeltery.stainedGlassClear, 1, i)); @@ -637,7 +581,7 @@ public class TinkerWorld GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.magma_cream), "slimeball", Items.blaze_powder)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.lead, 2), "ss ", "sS ", " s", 's', Items.string, 'S', "slimeball")); } - + private static void ensureOreIsRegistered (String oreName, ItemStack is) { int oreId = OreDictionary.getOreID(is); @@ -647,7 +591,6 @@ public class TinkerWorld } } - public void addLoot () { // Item, min, max, weight @@ -658,8 +601,7 @@ public class TinkerWorld TinkerWorld.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); TinkerWorld.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(TinkerArmor.heartCanister, 1, 1), 1, 1, 1)); int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; - Item[] partTypes = { TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, - TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead }; + Item[] partTypes = { TinkerTools.pickaxeHead, TinkerTools.shovelHead, TinkerTools.hatchetHead, TinkerTools.binding, TinkerTools.swordBlade, TinkerTools.wideGuard, TinkerTools.handGuard, TinkerTools.crossbar, TinkerTools.knifeBlade, TinkerTools.frypanHead, TinkerTools.signHead, TinkerTools.chiselHead }; for (int partIter = 0; partIter < partTypes.length; partIter++) { diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index b9b6dd8d..a5b5f4d0 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -1,31 +1,20 @@ package tconstruct.world; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IEntityLivingData; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntitySpider; +import cpw.mods.fml.common.eventhandler.*; +import net.minecraft.entity.*; +import net.minecraft.entity.item.*; +import net.minecraft.entity.monster.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.*; +import net.minecraft.potion.*; import net.minecraft.world.World; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.living.LivingSpawnEvent; +import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.BonemealEvent; import tconstruct.TConstruct; import tconstruct.tools.TinkerTools; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TinkerWorldEvents { @@ -70,7 +59,7 @@ public class TinkerWorldEvents } } } - + /* Damage */ @SubscribeEvent public void onHurt (LivingHurtEvent event) @@ -112,7 +101,7 @@ public class TinkerWorldEvents } } } - + @SubscribeEvent public void onLivingDrop (LivingDropsEvent event) { diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 20910a4d..ff41b15e 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -1,55 +1,24 @@ package tconstruct.world; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; import mantle.lib.client.MantleClientRegistry; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.EntityAuraFX; -import net.minecraft.client.particle.EntityBreakingFX; -import net.minecraft.client.particle.EntityBubbleFX; -import net.minecraft.client.particle.EntityCloudFX; -import net.minecraft.client.particle.EntityCritFX; -import net.minecraft.client.particle.EntityDropParticleFX; -import net.minecraft.client.particle.EntityEnchantmentTableParticleFX; -import net.minecraft.client.particle.EntityExplodeFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.particle.EntityFireworkSparkFX; -import net.minecraft.client.particle.EntityFlameFX; -import net.minecraft.client.particle.EntityFootStepFX; -import net.minecraft.client.particle.EntityHeartFX; -import net.minecraft.client.particle.EntityHugeExplodeFX; -import net.minecraft.client.particle.EntityLargeExplodeFX; -import net.minecraft.client.particle.EntityLavaFX; -import net.minecraft.client.particle.EntityNoteFX; -import net.minecraft.client.particle.EntityPortalFX; -import net.minecraft.client.particle.EntityReddustFX; -import net.minecraft.client.particle.EntitySmokeFX; -import net.minecraft.client.particle.EntitySnowShovelFX; -import net.minecraft.client.particle.EntitySpellParticleFX; -import net.minecraft.client.particle.EntitySplashFX; -import net.minecraft.client.particle.EntitySuspendFX; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.client.particle.*; +import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import tconstruct.mechworks.model.CartRender; import tconstruct.tools.TinkerTools; -import tconstruct.world.entity.BlueSlime; -import tconstruct.world.entity.CartEntity; -import tconstruct.world.model.BarricadeRender; -import tconstruct.world.model.OreberryRender; -import tconstruct.world.model.PunjiRender; -import tconstruct.world.model.RenderLandmine; -import tconstruct.world.model.SlimeChannelRender; -import tconstruct.world.model.SlimePadRender; -import tconstruct.world.model.SlimeRender; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; +import tconstruct.world.entity.*; +import tconstruct.world.model.*; public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { @Override - public void initialize() + public void initialize () { registerRenderer(); registerManualIcons(); @@ -57,7 +26,7 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon } void registerRenderer () - { + { RenderingRegistry.registerBlockHandler(new OreberryRender()); RenderingRegistry.registerBlockHandler(new BarricadeRender()); RenderingRegistry.registerBlockHandler(new RenderLandmine()); @@ -74,9 +43,9 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon void registerManualIcons () { - + } - + void registerManualRecipes () { ItemStack netherrack = new ItemStack(Blocks.netherrack); @@ -87,7 +56,7 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon ItemStack consecratedsoil = new ItemStack(TinkerTools.craftedSoil, 1, 4); MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null); - MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimeChannel), new ItemStack(Items.slime_ball), null, null); + MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimeChannel), new ItemStack(Items.slime_ball), null, null); MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Blocks.dirt), new ItemStack(Items.rotten_flesh), new ItemStack(Items.dye, 1, 15), null); MantleClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); @@ -96,7 +65,7 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon ItemStack reed = new ItemStack(Items.sugar); MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji), reed, null, reed, null, reed, null, reed, null, reed); MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); - + } Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java index 48c14a42..cef7476b 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyCommon.java @@ -5,12 +5,12 @@ public class TinkerWorldProxyCommon public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) { - + } public void initialize () { - + } } diff --git a/src/main/java/tconstruct/world/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java index 86806008..ad04790d 100644 --- a/src/main/java/tconstruct/world/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -1,21 +1,16 @@ package tconstruct.world.blocks; +import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.SlimeChannelRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ConveyorBase extends MantleBlock { diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 3a829a21..37937fb4 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -1,20 +1,16 @@ package tconstruct.world.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.*; +import java.util.*; import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class GravelOre extends BlockSand { diff --git a/src/main/java/tconstruct/world/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java index 61f8b1b2..b950d182 100644 --- a/src/main/java/tconstruct/world/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -1,20 +1,14 @@ package tconstruct.world.blocks; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockWood; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class MeatBlock extends BlockWood { diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index 2499e519..0dc8a5cc 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -1,10 +1,8 @@ package tconstruct.world.blocks; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockLeavesBase; +import cpw.mods.fml.relauncher.*; +import java.util.*; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,22 +10,15 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; 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.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.IPlantable; +import net.minecraft.item.*; +import net.minecraft.util.*; +import net.minecraft.world.*; +import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.model.OreberryRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class OreberryBush extends BlockLeavesBase implements IPlantable { diff --git a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java index 9cf99687..20d10cfd 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java @@ -1,7 +1,6 @@ package tconstruct.world.blocks; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index 89a6f40e..e55617a0 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -1,25 +1,20 @@ package tconstruct.world.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; +import net.minecraft.world.*; import tconstruct.blocks.TConstructBlock; import tconstruct.mechworks.entity.item.ExplosivePrimed; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeExplosive extends TConstructBlock { @@ -85,8 +80,7 @@ public class SlimeExplosive extends TConstructBlock { if (!par1World.isRemote) { - ExplosivePrimed entitytntprimed = new ExplosivePrimed(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 0.5F), (double) ((float) par4 + 0.5F), - par5Explosion.getExplosivePlacedBy()); + ExplosivePrimed entitytntprimed = new ExplosivePrimed(par1World, (double) ((float) par2 + 0.5F), (double) ((float) par3 + 0.5F), (double) ((float) par4 + 0.5F), par5Explosion.getExplosivePlacedBy()); entitytntprimed.fuse = par1World.rand.nextInt(entitytntprimed.fuse / 4) + entitytntprimed.fuse / 8; par1World.spawnEntityInWorld(entitytntprimed); } diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index 30fcca82..7bec1fbc 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -1,21 +1,17 @@ package tconstruct.world.blocks; +import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; +import net.minecraft.util.*; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.SlimePadRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimePad extends MantleBlock { diff --git a/src/main/java/tconstruct/world/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java index 4e93a6f0..28da025a 100644 --- a/src/main/java/tconstruct/world/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -1,16 +1,12 @@ package tconstruct.world.blocks; -import tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.*; import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; +import net.minecraft.potion.*; +import net.minecraft.util.*; import net.minecraft.world.World; +import tconstruct.blocks.TConstructBlock; public class SoilBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index cb63a63c..630022d6 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -1,21 +1,17 @@ package tconstruct.world.blocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.IIcon; -import net.minecraft.world.ColorizerGrass; -import net.minecraft.world.IBlockAccess; +import net.minecraft.world.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SoilSlab extends SlabBase { diff --git a/src/main/java/tconstruct/world/blocks/StoneLadder.java b/src/main/java/tconstruct/world/blocks/StoneLadder.java index 0d41d34b..c0ddcb28 100644 --- a/src/main/java/tconstruct/world/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/world/blocks/StoneLadder.java @@ -1,12 +1,11 @@ package tconstruct.world.blocks; +import cpw.mods.fml.relauncher.*; import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class StoneLadder extends BlockLadder { diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index 4fd992b5..94ea961e 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -1,23 +1,16 @@ package tconstruct.world.blocks; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - +import cpw.mods.fml.relauncher.*; import java.util.Random; - import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import static net.minecraftforge.common.util.ForgeDirection.*; public class StoneTorch extends MantleBlock { @@ -91,8 +84,7 @@ public class StoneTorch extends MantleBlock @Override public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) - || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4); + return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4); } /** diff --git a/src/main/java/tconstruct/world/blocks/TMetalBlock.java b/src/main/java/tconstruct/world/blocks/TMetalBlock.java index 70b8a996..62120c87 100644 --- a/src/main/java/tconstruct/world/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/world/blocks/TMetalBlock.java @@ -8,8 +8,7 @@ import tconstruct.blocks.TConstructBlock; public class TMetalBlock extends TConstructBlock { - static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", - "compressed_alubrass", "compressed_alumite", "compressed_steel", "compressed_ender" }; + static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", "compressed_alubrass", "compressed_alumite", "compressed_steel", "compressed_ender" }; public TMetalBlock(Material material, float hardness) { diff --git a/src/main/java/tconstruct/world/blocks/WoodRail.java b/src/main/java/tconstruct/world/blocks/WoodRail.java index c8d23d8e..5ff66187 100644 --- a/src/main/java/tconstruct/world/blocks/WoodRail.java +++ b/src/main/java/tconstruct/world/blocks/WoodRail.java @@ -1,14 +1,12 @@ package tconstruct.world.blocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRailBase; +import cpw.mods.fml.relauncher.*; +import net.minecraft.block.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class WoodRail extends BlockRailBase { diff --git a/src/main/java/tconstruct/world/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java index 0d63c670..e4b6d64a 100644 --- a/src/main/java/tconstruct/world/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -1,24 +1,14 @@ package tconstruct.world.entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.IEntityLivingData; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.*; import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.monster.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; +import net.minecraft.util.*; +import net.minecraft.world.*; import net.minecraftforge.common.ForgeHooks; import tconstruct.armor.TinkerArmor; import tconstruct.library.TConstructRegistry; @@ -149,8 +139,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.motionZ += (double) (MathHelper.cos(f) * 0.2F); } - if (this.getBrightness(1.0F) > 0.9F && rand.nextInt(5) == 0 - && this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ))) + if (this.getBrightness(1.0F) > 0.9F && rand.nextInt(5) == 0 && this.worldObj.canBlockSeeTheSky(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ))) { int size = this.getSlimeSize() - 1; if (size < 7) @@ -179,8 +168,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData @Override public boolean getCanSpawnHere () { - return isValidLightLevel() && this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() - && !this.worldObj.isAnyLiquid(this.boundingBox); + return isValidLightLevel() && this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); } protected boolean isValidLightLevel () @@ -478,11 +466,12 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData final ItemStack headStack = new ItemStack(tool.getHeadItem(), 1, 17); final ItemStack handleStack = new ItemStack(tool.getHandleItem(), 1, 17); - final ItemStack accessoryStack = tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; - final ItemStack extraStack = tool.getExtraItem() != null ? new ItemStack(tool.getExtraItem(), 1, 17) : null; + final ItemStack accessoryStack = tool.getAccessoryItem() != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; + final ItemStack extraStack = tool.getExtraItem() != null ? new ItemStack(tool.getExtraItem(), 1, 17) : null; ItemStack toolStack = ToolBuilder.instance.buildTool(headStack, handleStack, accessoryStack, extraStack, "King Slime " + tool.getLocalizedToolName()); - if(toolStack != null) { + if (toolStack != null) + { NBTTagCompound tags = toolStack.getTagCompound().getCompoundTag("InfiTool"); tags.setInteger("Attack", 5 + tool.getDamageVsEntity(null)); tags.setInteger("TotalDurability", 2500); @@ -490,7 +479,8 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData tags.setInteger("MiningSpeed", 1400); this.entityDropItem(toolStack, 0f); - if (rand.nextInt(5) == 0) { + if (rand.nextInt(5) == 0) + { ItemStack dropStack = new ItemStack(TinkerArmor.heartCanister, 1, 1); this.entityDropItem(dropStack, 0f); } @@ -516,8 +506,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { int i = this.getSlimeSize(); - if (this.canEntityBeSeen(par1EntityPlayer) && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (double) i * 0.6D * (double) i - && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) + if (this.canEntityBeSeen(par1EntityPlayer) && this.getDistanceSqToEntity(par1EntityPlayer) < 0.6D * (double) i * 0.6D * (double) i && par1EntityPlayer.attackEntityFrom(DamageSource.causeMobDamage(this), this.getAttackStrength())) { this.playSound("mob.attack", 1.0F, (this.rand.nextFloat() - this.rand.nextFloat()) * 0.2F + 1.0F); } diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index db114e3e..cb1d1a80 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -1,32 +1,21 @@ package tconstruct.world.entity; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.*; import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRail; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; +import java.util.*; +import net.minecraft.block.*; +import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.*; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.*; +import net.minecraft.world.*; public class CartEntity extends Entity implements IInventory, IEntityAdditionalSpawnData { @@ -42,8 +31,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS protected boolean field_82345_h; /** Minecart rotational logic matrix */ - protected static final int[][][] matrix = new int[][][] { { { 0, 0, -1 }, { 0, 0, 1 } }, { { -1, 0, 0 }, { 1, 0, 0 } }, { { -1, -1, 0 }, { 1, 0, 0 } }, { { -1, 0, 0 }, { 1, -1, 0 } }, - { { 0, 0, -1 }, { 0, -1, 1 } }, { { 0, -1, -1 }, { 0, 0, 1 } }, { { 0, 0, 1 }, { 1, 0, 0 } }, { { 0, 0, 1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { 1, 0, 0 } } }; + protected static final int[][][] matrix = new int[][][] { { { 0, 0, -1 }, { 0, 0, 1 } }, { { -1, 0, 0 }, { 1, 0, 0 } }, { { -1, -1, 0 }, { 1, 0, 0 } }, { { -1, 0, 0 }, { 1, -1, 0 } }, { { 0, 0, -1 }, { 0, -1, 1 } }, { { 0, -1, -1 }, { 0, 0, 1 } }, { { 0, 0, 1 }, { 1, 0, 0 } }, { { 0, 0, 1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { -1, 0, 0 } }, { { 0, 0, -1 }, { 1, 0, 0 } } }; /** appears to be the progress of the turn */ protected int turnProgress; @@ -270,8 +258,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } var2.stackSize -= var6; - EntityItem entityitem = new EntityItem(this.worldObj, this.posX + (double) var3, this.posY + (double) var4, this.posZ + (double) var5, new ItemStack(var2.getItem(), var6, - var2.getItemDamage())); + EntityItem entityitem = new EntityItem(this.worldObj, this.posX + (double) var3, this.posY + (double) var4, this.posZ + (double) var5, new ItemStack(var2.getItem(), var6, var2.getItemDamage())); if (var2.hasTagCompound()) { @@ -732,8 +719,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS { if (par1Entity != this.riddenByEntity) { - if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() - && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) + if (par1Entity instanceof EntityLiving && !(par1Entity instanceof EntityPlayer) && !(par1Entity instanceof EntityIronGolem) && canBeRidden() && this.motionX * this.motionX + this.motionZ * this.motionZ > 0.01D && this.riddenByEntity == null && par1Entity.ridingEntity == null) { par1Entity.mountEntity(this); } @@ -768,9 +754,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS double var10 = par1Entity.posX - this.posX; double var12 = par1Entity.posZ - this.posZ; Vec3 var14 = Vec3.createVectorHelper(var10, 0.0D, var12).normalize(); - Vec3 var15 = Vec3.createVectorHelper - ((double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) - .normalize(); + Vec3 var15 = Vec3.createVectorHelper((double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)).normalize(); double var16 = Math.abs(var14.dotProduct(var15)); if (var16 < 0.8D) diff --git a/src/main/java/tconstruct/world/gen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java index fc18cdd4..a9786888 100644 --- a/src/main/java/tconstruct/world/gen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -1,7 +1,6 @@ package tconstruct.world.gen; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/world/gen/PlantGen.java b/src/main/java/tconstruct/world/gen/PlantGen.java index dbdc0837..6ae313ae 100644 --- a/src/main/java/tconstruct/world/gen/PlantGen.java +++ b/src/main/java/tconstruct/world/gen/PlantGen.java @@ -1,7 +1,6 @@ package tconstruct.world.gen; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index 343c37cf..d9e4486b 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -1,22 +1,18 @@ package tconstruct.world.gen; +import cpw.mods.fml.common.IWorldGenerator; import java.awt.geom.Ellipse2D; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; -import net.minecraft.world.WorldType; +import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; import tconstruct.tools.TinkerTools; -import tconstruct.util.config.DimensionBlacklist; -import tconstruct.util.config.PHConstruct; +import tconstruct.util.config.*; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.IWorldGenerator; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { @@ -85,8 +81,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + height; int zPos = z + zChunk; - if (world.getBlock(xPos - 1, yPos + 1, zPos) == base && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base - && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base && random.nextInt(100) > randomness) + if (world.getBlock(xPos - 1, yPos + 1, zPos) == base && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base && random.nextInt(100) > randomness) { ; } @@ -110,8 +105,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height + 1; int zPos = z + zChunk; - if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base - && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) + if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) { ; } @@ -217,10 +211,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { for (yPos = 0; yPos < 8; ++yPos) { - var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] - && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 - && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 - && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); if (var33) { @@ -260,8 +251,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { for (yPos = 4; yPos < 8; ++yPos) { - if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base - && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) + if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) { world.setBlock(x + xPos, y + yPos - 1, z + zPos, top, 0, 0); } @@ -278,13 +268,9 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { for (yPos = 0; yPos < 8; ++yPos) { - var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] - && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 - && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 - && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); + var33 = !validLocations[(xPos * 16 + zPos) * 8 + yPos] && (xPos < 15 && validLocations[((xPos + 1) * 16 + zPos) * 8 + yPos] || xPos > 0 && validLocations[((xPos - 1) * 16 + zPos) * 8 + yPos] || zPos < 15 && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); - if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() - && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) + if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) { world.setBlock(x + xPos, y + yPos, z + zPos, TinkerWorld.slimeGel, gelMeta, 2); } diff --git a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java index 23e52366..e504115d 100644 --- a/src/main/java/tconstruct/world/gen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeTreeGen.java @@ -1,7 +1,6 @@ package tconstruct.world.gen; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java index fc787eb4..9cd2a054 100644 --- a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -1,7 +1,6 @@ package tconstruct.world.gen; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; diff --git a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index 1291549c..ff5c017a 100644 --- a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -1,17 +1,15 @@ package tconstruct.world.gen; +import cpw.mods.fml.common.IWorldGenerator; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.WorldType; +import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.IWorldGenerator; public class TBaseWorldGenerator implements IWorldGenerator { diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index e77ef2e8..ac7d753b 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -1,21 +1,16 @@ package tconstruct.world.gen; -import static net.minecraft.world.biome.BiomeGenBase.extremeHills; -import static net.minecraft.world.biome.BiomeGenBase.extremeHillsEdge; -import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; - +import com.google.common.collect.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.Random; - import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import com.google.common.collect.ImmutableCollection; -import com.google.common.collect.ImmutableList; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import static net.minecraft.world.biome.BiomeGenBase.*; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; public class TerrainGenEventHandler { diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 184b18d7..b93619e2 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -1,17 +1,13 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; +import net.minecraft.item.*; +import net.minecraft.util.*; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BarricadeItem extends ItemBlock { @@ -94,8 +90,7 @@ public class BarricadeItem extends ItemBlock if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F, - block.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); --stack.stackSize; } diff --git a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index a2c26bd9..f9e52f0b 100644 --- a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -1,15 +1,12 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.*; public class CraftedSoilItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java index 3c80c4b9..6e2ef0c7 100644 --- a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java @@ -1,18 +1,14 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class HamboneItemBlock extends ItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java index 5a2bab3b..7313ddf4 100644 --- a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java @@ -1,7 +1,6 @@ package tconstruct.world.itemblocks; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index 112d3d86..882ba49a 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -1,7 +1,7 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import net.minecraft.block.Block; @@ -12,8 +12,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class OreberryBushItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index 1811b6c3..30c3707b 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -1,7 +1,7 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import net.minecraft.block.Block; @@ -12,8 +12,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class OreberryBushSecondItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index 6c6beba9..33ea64b3 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -1,12 +1,10 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; +import net.minecraft.util.*; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SlimeTallGrassItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index e5c383a5..b9643764 100644 --- a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -1,14 +1,12 @@ package tconstruct.world.itemblocks; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SoilSlabItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index c7f0e6a1..7bb4de01 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -1,13 +1,12 @@ package tconstruct.world.itemblocks; +import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemDye; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import mantle.blocks.abstracts.MultiItemBlock; public class WoolSlab1Item extends MultiItemBlock { @@ -21,7 +20,7 @@ public class WoolSlab1Item extends MultiItemBlock setMaxDamage(0); setHasSubtypes(true); } - + @Override public String getUnlocalizedName (ItemStack par1ItemStack) { @@ -41,8 +40,7 @@ public class WoolSlab1Item extends MultiItemBlock { if (world.setBlock(x, y, z, Blocks.wool, trueMeta, 3)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, - (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index 4994fd46..1b4ae075 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -1,13 +1,12 @@ package tconstruct.world.itemblocks; +import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemDye; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import mantle.blocks.abstracts.MultiItemBlock; public class WoolSlab2Item extends MultiItemBlock { @@ -21,13 +20,13 @@ public class WoolSlab2Item extends MultiItemBlock setMaxDamage(0); setHasSubtypes(true); } - + @Override public int getMetadata (int meta) { return meta; } - + @Override public String getUnlocalizedName (ItemStack par1ItemStack) { @@ -47,8 +46,7 @@ public class WoolSlab2Item extends MultiItemBlock { if (world.setBlock(x, y, z, Blocks.wool, trueMeta + 8, 3)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, - (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/world/items/GoldenHead.java b/src/main/java/tconstruct/world/items/GoldenHead.java index 7e06b8ef..3aa1451b 100644 --- a/src/main/java/tconstruct/world/items/GoldenHead.java +++ b/src/main/java/tconstruct/world/items/GoldenHead.java @@ -1,20 +1,14 @@ package tconstruct.world.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.item.*; +import net.minecraft.potion.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class GoldenHead extends ItemFood { diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index 615aa33d..dd2a52e6 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -1,7 +1,7 @@ package tconstruct.world.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; @@ -10,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class OreBerries extends CraftingItem { diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java index 0e9a3bde..2fcafd95 100644 --- a/src/main/java/tconstruct/world/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -1,16 +1,11 @@ package tconstruct.world.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.*; +import net.minecraft.util.*; public class SpecialFood extends ItemFood { @@ -30,13 +25,13 @@ public class SpecialFood extends ItemFood } @Override - public int func_150905_g(ItemStack stack) + public int func_150905_g (ItemStack stack) { return hunger[stack.getItemDamage()]; } @Override - public float func_150906_h(ItemStack stack) + public float func_150906_h (ItemStack stack) { return saturation[stack.getItemDamage()]; } @@ -46,7 +41,7 @@ public class SpecialFood extends ItemFood public IIcon getIconFromDamage (int meta) { if (meta >= icons.length) - return icons[0]; + return icons[0]; return icons[meta]; } diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index d2736044..03ae6ed4 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -1,15 +1,12 @@ package tconstruct.world.items; +import cpw.mods.fml.relauncher.*; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class StrangeFood extends SpecialFood { diff --git a/src/main/java/tconstruct/world/model/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java index 0d142eaa..b2ca186f 100644 --- a/src/main/java/tconstruct/world/model/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -1,11 +1,10 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class BarricadeRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index 45ff6bda..43b547ac 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -1,13 +1,11 @@ package tconstruct.world.model; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.*; import net.minecraft.util.ResourceLocation; import tconstruct.world.entity.Crystal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class CrystalRender extends RenderLiving diff --git a/src/main/java/tconstruct/world/model/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java index 50435c79..32e7a143 100644 --- a/src/main/java/tconstruct/world/model/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -1,11 +1,10 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class OreberryRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/PunjiRender.java b/src/main/java/tconstruct/world/model/PunjiRender.java index 806b6bb1..3d60c5d4 100644 --- a/src/main/java/tconstruct/world/model/PunjiRender.java +++ b/src/main/java/tconstruct/world/model/PunjiRender.java @@ -1,15 +1,11 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - public class PunjiRender implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); diff --git a/src/main/java/tconstruct/world/model/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java index a6f7db1f..fdf6d50b 100644 --- a/src/main/java/tconstruct/world/model/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -1,15 +1,12 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; - import tconstruct.mechworks.landmine.Helper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; /** * diff --git a/src/main/java/tconstruct/world/model/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java index e393323c..33c61017 100644 --- a/src/main/java/tconstruct/world/model/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -1,14 +1,11 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; +import net.minecraft.client.renderer.*; +import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class SlimeChannelRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/SlimeModel.java b/src/main/java/tconstruct/world/model/SlimeModel.java index 4fc5482e..712bc495 100644 --- a/src/main/java/tconstruct/world/model/SlimeModel.java +++ b/src/main/java/tconstruct/world/model/SlimeModel.java @@ -1,10 +1,8 @@ package tconstruct.world.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.*; +import net.minecraft.client.model.*; import net.minecraft.entity.Entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class SlimeModel extends ModelBase diff --git a/src/main/java/tconstruct/world/model/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java index 1298844e..a04f3e2d 100644 --- a/src/main/java/tconstruct/world/model/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -1,5 +1,6 @@ package tconstruct.world.model; +import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -7,8 +8,6 @@ import tconstruct.client.BlockSkinRenderHelper; import tconstruct.util.ItemHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SlimePad; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class SlimePadRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index e3cb9801..ab97696c 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -1,18 +1,13 @@ package tconstruct.world.model; +import cpw.mods.fml.relauncher.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.*; import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import tconstruct.world.entity.BlueSlime; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class SlimeRender extends RenderLiving diff --git a/src/main/java/tconstruct/world/village/ComponentSmeltery.java b/src/main/java/tconstruct/world/village/ComponentSmeltery.java index 317b1ebc..2e1d2a9e 100644 --- a/src/main/java/tconstruct/world/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/world/village/ComponentSmeltery.java @@ -1,14 +1,10 @@ package tconstruct.world.village; -import java.util.List; -import java.util.Random; - +import java.util.*; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; -import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraft.world.gen.structure.*; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import tconstruct.smeltery.TinkerSmeltery; @@ -30,8 +26,7 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 public static ComponentSmeltery buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); - return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentSmeltery(villagePiece, p5, random, - structureboundingbox, p4) : null; + return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) : null; } /** @@ -91,8 +86,7 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 return true; } - protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID, - int placeBlockMeta, Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace) + protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID, int placeBlockMeta, Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace) { Block i2 = this.func_151558_b(placeBlockID, placeBlockMeta); int j2 = this.func_151557_c(placeBlockID, placeBlockMeta); diff --git a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java index 705126f1..e872a444 100644 --- a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java @@ -1,18 +1,13 @@ package tconstruct.world.village; -import java.util.List; -import java.util.Random; - +import java.util.*; import net.minecraft.init.Blocks; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; -import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraft.world.gen.structure.*; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.CraftingStationLogic; -import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.*; import tconstruct.world.TinkerWorld; public class ComponentToolWorkshop extends StructureVillagePieces.House1 @@ -33,8 +28,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 public static ComponentToolWorkshop buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); - return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentToolWorkshop(villagePiece, p5, random, - structureboundingbox, p4) : null; + return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentToolWorkshop(villagePiece, p5, random, structureboundingbox, p4) : null; } /** @@ -155,8 +149,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 return true; } - protected boolean generateStructureCraftingStationContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, - int par8) + protected boolean generateStructureCraftingStationContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); @@ -180,8 +173,7 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 } } - protected boolean generateStructurePatternChestContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, - int par8) + protected boolean generateStructurePatternChestContents (World world, StructureBoundingBox par2StructureBoundingBox, Random random, int x, int y, int z, WeightedRandomChestContent[] content, int par8) { int posX = this.getXWithOffset(x, z); int posY = this.getYWithOffset(y); diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index 6af1866b..9e20fc02 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -1,18 +1,14 @@ package tconstruct.world.village; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; +import java.util.*; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.village.MerchantRecipe; -import net.minecraft.village.MerchantRecipeList; +import net.minecraft.village.*; import tconstruct.mechworks.TinkerMechworks; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class TVillageTrades implements IVillageTradeHandler { diff --git a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java index f1caa76c..288849b9 100644 --- a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java @@ -1,11 +1,9 @@ package tconstruct.world.village; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; +import java.util.*; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; public class VillageSmelteryHandler implements IVillageCreationHandler { diff --git a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java index 89f62954..761d8060 100644 --- a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java @@ -1,11 +1,9 @@ package tconstruct.world.village; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; +import java.util.*; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; public class VillageToolStationHandler implements IVillageCreationHandler {