From 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 16:03:42 -0400 Subject: Formatting pass --- .../jewelrycraft/item/ItemBaseJewelry.java | 112 ++- .../darkknight/jewelrycraft/item/ItemBracelet.java | 8 +- .../jewelrycraft/item/ItemClayMolds.java | 35 +- .../darkknight/jewelrycraft/item/ItemEarrings.java | 8 +- .../darkknight/jewelrycraft/item/ItemGoldObj.java | 34 +- .../darkknight/jewelrycraft/item/ItemGuide.java | 4 +- .../jewelrycraft/item/ItemJewelryModifier.java | 3 +- .../darkknight/jewelrycraft/item/ItemList.java | 102 ++- .../darkknight/jewelrycraft/item/ItemMolds.java | 31 +- .../jewelrycraft/item/ItemMoltenMetal.java | 7 +- .../jewelrycraft/item/ItemMoltenMetalBucket.java | 108 ++- .../darkknight/jewelrycraft/item/ItemNecklace.java | 8 +- .../darkknight/jewelrycraft/item/ItemRing.java | 6 +- .../darkknight/jewelrycraft/item/ItemSpawnEgg.java | 75 +- .../jewelrycraft/item/ItemStructureGen.java | 21 +- .../darkknight/jewelrycraft/item/ItemTest.java | 12 +- .../jewelrycraft/item/ItemThiefGloves.java | 304 ++++--- .../jewelrycraft/item/render/BraceletRender.java | 22 +- .../jewelrycraft/item/render/EarringsRender.java | 4 +- .../jewelrycraft/item/render/ItemRender.java | 901 ++++++++++++++------- .../jewelrycraft/item/render/MaskRender.java | 6 +- .../jewelrycraft/item/render/NecklaceRender.java | 5 +- .../jewelrycraft/item/render/RingRender.java | 7 +- 23 files changed, 1158 insertions(+), 665 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/item') diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java index 93328c8..2c2311c 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java @@ -36,13 +36,16 @@ public abstract class ItemBaseJewelry extends Item { @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if (pass == 0 && JewelryNBT.ingot(stack) != null) { - return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil + .getColor(JewelryNBT.ingot(stack)); } if (pass == 1 && JewelryNBT.gem(stack) != null) { - return JewelrycraftUtil.getColor(JewelryNBT.gem(stack)); + return JewelrycraftUtil + .getColor(JewelryNBT.gem(stack)); } else if (JewelryNBT.ingot(stack) != null) { - return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil + .getColor(JewelryNBT.ingot(stack)); } return 16777215; @@ -54,16 +57,19 @@ public abstract class ItemBaseJewelry extends Item { */ @Override public String getItemStackDisplayName(ItemStack stack) { - if (JewelryNBT.ingot(stack) != null && Item - .getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) + if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem( + JewelryNBT.ingot(stack).getItem()) > 0) return JewelryNBT.ingot(stack).getDisplayName() .replace("Ingot", " ").trim() + " " - + ("" + StatCollector.translateToLocal( - getUnlocalizedNameInefficiently(stack) - + ".name")).trim(); + + ("" + StatCollector + .translateToLocal( + getUnlocalizedNameInefficiently( + stack) + + ".name")).trim(); return ("" + StatCollector.translateToLocal( - getUnlocalizedNameInefficiently(stack) + ".name")).trim(); + getUnlocalizedNameInefficiently(stack) + + ".name")).trim(); } /** @@ -80,33 +86,45 @@ public abstract class ItemBaseJewelry extends Item { List list, boolean par4) { if (stack.hasTagCompound() && ConfigHandler.JEWELRY_INFO) { ItemStack ingot = JewelryNBT.ingot(stack); - if (ingot != null && Item.getIdFromItem( - JewelryNBT.ingot(stack).getItem()) > 0) { + if (ingot != null && Item.getIdFromItem(JewelryNBT + .ingot(stack).getItem()) > 0) { list.add(StatCollector.translateToLocal( - "info." + Variables.MODID + ".metal") + ": " + "info." + Variables.MODID + + ".metal") + + ": " + EnumChatFormatting.YELLOW - + ingot.getDisplayName().replace( - StatCollector.translateToLocal("info." - + Variables.MODID + ".ingot"), - " ")); + + ingot.getDisplayName() + .replace(StatCollector + .translateToLocal( + "info." + Variables.MODID + + ".ingot"), + " ")); } ItemStack gem = JewelryNBT.gem(stack); if (gem != null) { list.add(StatCollector.translateToLocal( - "info." + Variables.MODID + ".gem") + ": " - + EnumChatFormatting.BLUE + gem.getDisplayName()); + "info." + Variables.MODID + + ".gem") + + ": " + + EnumChatFormatting.BLUE + + gem.getDisplayName()); } - ArrayList modifier = JewelryNBT.modifier(stack); + ArrayList modifier = JewelryNBT + .modifier(stack); if (!modifier.isEmpty()) list.add(StatCollector.translateToLocal( - "info." + Variables.MODID + ".modifiers") + ": "); + "info." + Variables.MODID + + ".modifiers") + + ": "); for (int i = 0; i < modifier.size(); i++) list.add(EnumChatFormatting.DARK_PURPLE - + modifier.get(i).getDisplayName() + " x" + + modifier.get(i) + .getDisplayName() + + " x" + modifier.get(i).stackSize); } } @@ -117,7 +135,8 @@ public abstract class ItemBaseJewelry extends Item { */ public void action(ItemStack item, EntityPlayer player) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) mod.action(item, player, this); } @@ -128,11 +147,14 @@ public abstract class ItemBaseJewelry extends Item { * @return */ public boolean onPlayerAttackedCacellable(ItemStack item, - EntityPlayer player, DamageSource source, float amount) { + EntityPlayer player, DamageSource source, + float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) - return mod.onPlayerAttackedCancellable(item, player, - source, this, amount); + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) + return mod.onPlayerAttackedCancellable( + item, player, source, this, + amount); return false; } @@ -145,9 +167,11 @@ public abstract class ItemBaseJewelry extends Item { public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) - return mod.onEntityAttackedCancellable(item, player, - target, this, amount); + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) + return mod.onEntityAttackedCancellable( + item, player, target, this, + amount); return false; } @@ -160,8 +184,10 @@ public abstract class ItemBaseJewelry extends Item { public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) - mod.onPlayerAttacked(item, player, source, this, amount); + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) + mod.onPlayerAttacked(item, player, source, + this, amount); } /** @@ -173,32 +199,40 @@ public abstract class ItemBaseJewelry extends Item { public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) - mod.onEntityAttacked(item, player, target, this, amount); + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) + mod.onEntityAttacked(item, player, target, + this, amount); } public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) - mod.onPlayerDead(item, player, source, this); + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) + mod.onPlayerDead(item, player, source, + this); } - public void onPlayerRespawn(ItemStack item, PlayerEvent.Clone event) { + public void onPlayerRespawn(ItemStack item, + PlayerEvent.Clone event) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) mod.onPlayerRespawn(item, event, this); } public void onJewelryEquipped(ItemStack item) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) mod.onJewelryEquipped(item, this); } public void onJewelryUnequipped(ItemStack item) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, + mod.getModifier())) mod.onJewelryUnequipped(item, this); } } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java index 5508b9c..2de324a 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java @@ -20,10 +20,10 @@ public class ItemBracelet extends ItemBaseJewelry { */ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = - iconRegister.registerIcon(Variables.MODID + ":bracelet"); - gem = iconRegister - .registerIcon(Variables.MODID + ":jewelBracelet"); + itemIcon = iconRegister.registerIcon( + Variables.MODID + ":bracelet"); + gem = iconRegister.registerIcon( + Variables.MODID + ":jewelBracelet"); } /** diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java index 9bc630a..10929bd 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java @@ -14,11 +14,12 @@ import net.minecraft.util.MathHelper; public class ItemClayMolds extends Item { /** List of molds color names */ - public static final String[] moldsItemNames = - new String[] { "clayIngot", "clayRing", "clayNecklace", - "clayBracelet", "clayEarrings" }; + public static final String[] moldsItemNames = new String[] { + "clayIngot", "clayRing", "clayNecklace", + "clayBracelet", "clayEarrings" + }; @SideOnly(Side.CLIENT) - private IIcon[] moldsIcons; + private IIcon[] moldsIcons; /** * @@ -40,23 +41,25 @@ public class ItemClayMolds extends Item { * Gets an icon index based on an item's damage value */ public IIcon getIconFromDamage(int par1) { - int j = MathHelper.clamp_int(par1, 0, moldsItemNames.length - 1); + int j = MathHelper.clamp_int(par1, 0, + moldsItemNames.length - 1); return moldsIcons[j]; } /** - * Returns the unlocalized name of this item. This version accepts an - * ItemStack so different stacks can have different names based on - * their damage or NBT. + * Returns the unlocalized name of this item. This version accepts + * an ItemStack so different stacks can have different names based + * on their damage or NBT. * * @param par1ItemStack * @return */ @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, - moldsItemNames.length - 1); - return super.getUnlocalizedName() + "." + moldsItemNames[i]; + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), + 0, moldsItemNames.length - 1); + return super.getUnlocalizedName() + "." + + moldsItemNames[i]; } /** @@ -67,8 +70,8 @@ public class ItemClayMolds extends Item { @Override @SideOnly(Side.CLIENT) /** - * returns a list of items with the same ID, but different meta (eg: - * molds returns 16 items) + * returns a list of items with the same ID, but different meta + * (eg: molds returns 16 items) */ public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { @@ -84,7 +87,9 @@ public class ItemClayMolds extends Item { public void registerIcons(IIconRegister par1IconRegister) { moldsIcons = new IIcon[moldsItemNames.length]; for (int i = 0; i < moldsItemNames.length; ++i) - moldsIcons[i] = par1IconRegister.registerIcon(Variables.MODID - + ":" + moldsItemNames[i] + getIconString()); + moldsIcons[i] = par1IconRegister + .registerIcon(Variables.MODID + ":" + + moldsItemNames[i] + + getIconString()); } } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java index 0081342..c9e84f4 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java @@ -20,10 +20,10 @@ public class ItemEarrings extends ItemBaseJewelry { */ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = - iconRegister.registerIcon(Variables.MODID + ":earrings"); - gem = iconRegister - .registerIcon(Variables.MODID + ":jewelEarrings"); + itemIcon = iconRegister.registerIcon( + Variables.MODID + ":earrings"); + gem = iconRegister.registerIcon( + Variables.MODID + ":jewelEarrings"); } /** diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java index 86f864d..331fd65 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java @@ -58,15 +58,19 @@ public class ItemGoldObj extends Item { public String getItemStackDisplayName(ItemStack stack) { if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("target") - && Item.getItemById(Integer.valueOf(stack.getTagCompound() - .getTag("target").toString().split(",")[0] - .substring(4).replace("s", ""))) != null + && Item.getItemById(Integer.valueOf(stack + .getTagCompound() + .getTag("target") + .toString().split(",")[0] + .substring(4) + .replace("s", ""))) != null && JewelryNBT.item(stack) != null) - return StatCollector.translateToLocal( - "info." + Variables.MODID + ".golden") + " " - + JewelryNBT.item(stack).getDisplayName(); - return StatCollector.translateToLocal( - "item." + Variables.MODID + ".goldObject.name"); + return StatCollector.translateToLocal("info." + + Variables.MODID + ".golden") + + " " + JewelryNBT.item(stack) + .getDisplayName(); + return StatCollector.translateToLocal("item." + + Variables.MODID + ".goldObject.name"); } @Override @@ -76,12 +80,14 @@ public class ItemGoldObj extends Item { if (stack != null && JewelryNBT.item(stack) != null && JewelryNBT.item(stack) .getItem() instanceof ItemFood) - list.add(EnumChatFormatting.DARK_PURPLE + StatCollector - .translateToLocal("item." + Variables.MODID - + ".goldObject.info.food")); + list.add(EnumChatFormatting.DARK_PURPLE + + StatCollector.translateToLocal( + "item." + Variables.MODID + + ".goldObject.info.food")); else - list.add(EnumChatFormatting.DARK_PURPLE + StatCollector - .translateToLocal("item." + Variables.MODID - + ".goldObject.info.standard")); + list.add(EnumChatFormatting.DARK_PURPLE + + StatCollector.translateToLocal( + "item." + Variables.MODID + + ".goldObject.info.standard")); } } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java index 6780714..83f8531 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java @@ -16,8 +16,8 @@ public class ItemGuide extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (world.isRemote) - player.openGui(JewelrycraftMod.instance, 1, player.worldObj, 0, - 0, 0); + player.openGui(JewelrycraftMod.instance, 1, + player.worldObj, 0, 0, 0); player.addStat(AchievementsList.openGuide, 1); return stack; } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java index b295ebe..481126f 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java @@ -18,7 +18,8 @@ public class ItemJewelryModifier extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (!world.isRemote && player.capabilities.isCreativeMode) - player.openGui(JewelrycraftMod.instance, 3, world, 0, 0, 0); + player.openGui(JewelrycraftMod.instance, 3, world, + 0, 0, 0); return stack; } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java index f83983e..63bc7a4 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java @@ -9,82 +9,103 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class ItemList { - public static Item thiefGloves; - public static Item shadowIngot; - public static Item molds; - public static Item clayMolds; - public static ItemRing ring; - public static ItemNecklace necklace; - public static ItemBracelet bracelet; - public static ItemEarrings earrings; - public static Item guide; - public static Item jewelryModifier; + public static Item thiefGloves; + public static Item shadowIngot; + public static Item molds; + public static Item clayMolds; + public static ItemRing ring; + public static ItemNecklace necklace; + public static ItemBracelet bracelet; + public static ItemEarrings earrings; + public static Item guide; + public static Item jewelryModifier; public static ItemMoltenMetalBucket bucket; public static ItemMoltenMetal metal; - public static Item goldObj; - public static Item structureGen; - public static Item spawnEgg; - public static Item testItem; + public static Item goldObj; + public static Item structureGen; + public static Item spawnEgg; + public static Item testItem; /** * @param e */ public static void preInit(FMLPreInitializationEvent e) { thiefGloves = new ItemThiefGloves() - .setUnlocalizedName(Variables.MODID + ".thiefGloves") - .setTextureName(Variables.MODID + ":thiefGloves") + .setUnlocalizedName(Variables.MODID + + ".thiefGloves") + .setTextureName(Variables.MODID + + ":thiefGloves") .setCreativeTab(JewelrycraftMod.jewelrycraft); shadowIngot = new Item() - .setUnlocalizedName(Variables.MODID + ".ingotShadow") - .setTextureName(Variables.MODID + ":ingotShadow") + .setUnlocalizedName(Variables.MODID + + ".ingotShadow") + .setTextureName(Variables.MODID + + ":ingotShadow") .setCreativeTab(JewelrycraftMod.jewelrycraft); molds = new ItemMolds() - .setUnlocalizedName(Variables.MODID + ".mold") + .setUnlocalizedName( + Variables.MODID + ".mold") .setTextureName("Mold") .setCreativeTab(JewelrycraftMod.jewelrycraft); clayMolds = new ItemClayMolds() - .setUnlocalizedName(Variables.MODID + ".mold") + .setUnlocalizedName( + Variables.MODID + ".mold") .setTextureName("Mold") .setCreativeTab(JewelrycraftMod.jewelrycraft); ring = (ItemRing) new ItemRing() - .setUnlocalizedName(Variables.MODID + ".ring") + .setUnlocalizedName( + Variables.MODID + ".ring") .setTextureName(Variables.MODID + ":ring") .setCreativeTab(JewelrycraftMod.jewelrycraft); necklace = (ItemNecklace) new ItemNecklace() - .setUnlocalizedName(Variables.MODID + ".necklace") - .setTextureName(Variables.MODID + ":necklace") + .setUnlocalizedName(Variables.MODID + + ".necklace") + .setTextureName(Variables.MODID + + ":necklace") .setCreativeTab(JewelrycraftMod.jewelrycraft); bracelet = (ItemBracelet) new ItemBracelet() - .setUnlocalizedName(Variables.MODID + ".bracelet") - .setTextureName(Variables.MODID + ":bracelet") + .setUnlocalizedName(Variables.MODID + + ".bracelet") + .setTextureName(Variables.MODID + + ":bracelet") .setCreativeTab(JewelrycraftMod.jewelrycraft); earrings = (ItemEarrings) new ItemEarrings() - .setUnlocalizedName(Variables.MODID + ".earrings") - .setTextureName(Variables.MODID + ":earrings") + .setUnlocalizedName(Variables.MODID + + ".earrings") + .setTextureName(Variables.MODID + + ":earrings") .setCreativeTab(JewelrycraftMod.jewelrycraft); guide = new ItemGuide() - .setUnlocalizedName(Variables.MODID + ".guide") + .setUnlocalizedName( + Variables.MODID + ".guide") .setTextureName(Variables.MODID + ":guide") .setCreativeTab(JewelrycraftMod.jewelrycraft); bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket() - .setUnlocalizedName(Variables.MODID + ".bucket"); + .setUnlocalizedName(Variables.MODID + + ".bucket"); metal = (ItemMoltenMetal) new ItemMoltenMetal() - .setUnlocalizedName(Variables.MODID + ".bucket"); + .setUnlocalizedName(Variables.MODID + + ".bucket"); jewelryModifier = new ItemJewelryModifier() - .setUnlocalizedName(Variables.MODID + ".jewelryModifier") - .setTextureName(Variables.MODID + ":jewelryModifier") + .setUnlocalizedName(Variables.MODID + + ".jewelryModifier") + .setTextureName(Variables.MODID + + ":jewelryModifier") .setCreativeTab(JewelrycraftMod.jewelrycraft); - goldObj = new ItemGoldObj() - .setUnlocalizedName(Variables.MODID + ".goldObject"); + goldObj = new ItemGoldObj().setUnlocalizedName( + Variables.MODID + ".goldObject"); structureGen = new ItemStructureGen() - .setUnlocalizedName(Variables.MODID + ".structureGen") - .setTextureName(Variables.MODID + ":structureGen") + .setUnlocalizedName(Variables.MODID + + ".structureGen") + .setTextureName(Variables.MODID + + ":structureGen") .setCreativeTab(JewelrycraftMod.jewelrycraft); spawnEgg = new ItemSpawnEgg() - .setUnlocalizedName(Variables.MODID + ".monsterPlacer") + .setUnlocalizedName(Variables.MODID + + ".monsterPlacer") .setTextureName("spawn_egg"); - testItem = new ItemTest() - .setUnlocalizedName(Variables.MODID + ".test"); + testItem = new ItemTest().setUnlocalizedName( + Variables.MODID + ".test"); GameRegistry.registerItem(thiefGloves, "thiefGloves"); GameRegistry.registerItem(shadowIngot, "shadowIngot"); @@ -97,7 +118,8 @@ public class ItemList { GameRegistry.registerItem(guide, "guide"); GameRegistry.registerItem(bucket, "moltenMetalBucket"); GameRegistry.registerItem(metal, "moltenMetal"); - GameRegistry.registerItem(jewelryModifier, "jewelryModifier"); + GameRegistry.registerItem(jewelryModifier, + "jewelryModifier"); GameRegistry.registerItem(goldObj, "goldObject"); GameRegistry.registerItem(structureGen, "structureGen"); GameRegistry.registerItem(spawnEgg, "spawnEgg"); diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java index cc817de..b2acd18 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java @@ -15,9 +15,10 @@ import net.minecraft.util.MathHelper; public class ItemMolds extends Item { /** List of molds color names */ public static final String[] moldsItemNames = new String[] { - "ingot", "ring", "necklace", "bracelet", "earrings" }; + "ingot", "ring", "necklace", "bracelet", "earrings" + }; @SideOnly(Side.CLIENT) - private IIcon[] moldsIcons; + private IIcon[] moldsIcons; /** * @@ -39,23 +40,25 @@ public class ItemMolds extends Item { * Gets an icon index based on an item's damage value */ public IIcon getIconFromDamage(int par1) { - int j = MathHelper.clamp_int(par1, 0, moldsItemNames.length - 1); + int j = MathHelper.clamp_int(par1, 0, + moldsItemNames.length - 1); return moldsIcons[j]; } /** - * Returns the unlocalized name of this item. This version accepts an - * ItemStack so different stacks can have different names based on - * their damage or NBT. + * Returns the unlocalized name of this item. This version accepts + * an ItemStack so different stacks can have different names based + * on their damage or NBT. * * @param par1ItemStack * @return */ @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, - moldsItemNames.length - 1); - return super.getUnlocalizedName() + "." + moldsItemNames[i]; + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), + 0, moldsItemNames.length - 1); + return super.getUnlocalizedName() + "." + + moldsItemNames[i]; } /** @@ -66,8 +69,8 @@ public class ItemMolds extends Item { @Override @SideOnly(Side.CLIENT) /** - * returns a list of items with the same ID, but different meta (eg: - * molds returns 16 items) + * returns a list of items with the same ID, but different meta + * (eg: molds returns 16 items) */ public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { @@ -83,7 +86,9 @@ public class ItemMolds extends Item { public void registerIcons(IIconRegister par1IconRegister) { moldsIcons = new IIcon[moldsItemNames.length]; for (int i = 0; i < moldsItemNames.length; ++i) - moldsIcons[i] = par1IconRegister.registerIcon(Variables.MODID - + ":" + moldsItemNames[i] + getIconString()); + moldsIcons[i] = par1IconRegister + .registerIcon(Variables.MODID + ":" + + moldsItemNames[i] + + getIconString()); } } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java index dc5fbae..9b5b8a3 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java @@ -23,8 +23,8 @@ public class ItemMoltenMetal extends Item { */ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister - .registerIcon(Variables.MODID + ":moltenMetalStill"); + itemIcon = iconRegister.registerIcon( + Variables.MODID + ":moltenMetalStill"); } /** @@ -36,7 +36,8 @@ public class ItemMoltenMetal extends Item { @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if (JewelryNBT.ingot(stack) != null) - return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil + .getColor(JewelryNBT.ingot(stack)); else return 0xFFFFFF; } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java index 6e36412..72f1228 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java @@ -34,14 +34,14 @@ public class ItemMoltenMetalBucket extends Item { public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) { boolean flag = BlockList.moltenMetal == Blocks.air; - MovingObjectPosition movingobjectposition = - getMovingObjectPositionFromPlayer(par2World, - par3EntityPlayer, flag); + MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer( + par2World, par3EntityPlayer, flag); if (movingobjectposition == null) return stack; else { - FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, - stack, par2World, movingobjectposition); + FillBucketEvent event = new FillBucketEvent( + par3EntityPlayer, stack, par2World, + movingobjectposition); if (MinecraftForge.EVENT_BUS.post(event)) return stack; if (event.getResult() == Event.Result.ALLOW) { @@ -50,29 +50,40 @@ public class ItemMoltenMetalBucket extends Item { if (--stack.stackSize <= 0) return event.result; if (!par3EntityPlayer.inventory - .addItemStackToInventory(event.result)) + .addItemStackToInventory( + event.result)) par3EntityPlayer.dropPlayerItemWithRandomChoice( - event.result, false); + event.result, + false); return stack; } if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { int i = movingobjectposition.blockX; int j = movingobjectposition.blockY; int k = movingobjectposition.blockZ; - if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) + if (!par2World.canMineBlock( + par3EntityPlayer, i, j, k)) return stack; if (flag) { - if (!par3EntityPlayer.canPlayerEdit(i, j, k, - movingobjectposition.sideHit, stack)) + if (!par3EntityPlayer + .canPlayerEdit(i, + j, + k, + movingobjectposition.sideHit, + stack)) return stack; - par2World.getBlock(i, j, k).getMaterial(); - par2World.getBlockMetadata(i, j, k); + par2World.getBlock(i, j, k) + .getMaterial(); + par2World.getBlockMetadata(i, j, + k); par2World.setBlockToAir(i, j, k); - return func_150910_a(stack, par3EntityPlayer, + return func_150910_a(stack, + par3EntityPlayer, ItemList.bucket); } else { if (BlockList.moltenMetal == Blocks.air) - return new ItemStack(Items.bucket); + return new ItemStack( + Items.bucket); if (movingobjectposition.sideHit == 0) --j; else if (movingobjectposition.sideHit == 1) @@ -85,12 +96,19 @@ public class ItemMoltenMetalBucket extends Item { --i; else if (movingobjectposition.sideHit == 5) ++i; - if (!par3EntityPlayer.canPlayerEdit(i, j, k, - movingobjectposition.sideHit, stack)) + if (!par3EntityPlayer + .canPlayerEdit(i, + j, + k, + movingobjectposition.sideHit, + stack)) return stack; - if (tryPlaceContainedLiquid(par2World, i, j, k, stack) + if (tryPlaceContainedLiquid( + par2World, i, j, k, + stack) && !par3EntityPlayer.capabilities.isCreativeMode) - return new ItemStack(Items.bucket); + return new ItemStack( + Items.bucket); } } return stack; @@ -104,10 +122,12 @@ public class ItemMoltenMetalBucket extends Item { else if (--p_150910_1_.stackSize <= 0) return new ItemStack(p_150910_3_); else { - if (!p_150910_2_.inventory - .addItemStackToInventory(new ItemStack(p_150910_3_))) + if (!p_150910_2_.inventory.addItemStackToInventory( + new ItemStack(p_150910_3_))) p_150910_2_.dropPlayerItemWithRandomChoice( - new ItemStack(p_150910_3_, 1, 0), false); + new ItemStack(p_150910_3_, + 1, 0), + false); return p_150910_1_; } } @@ -117,18 +137,25 @@ public class ItemMoltenMetalBucket extends Item { if (BlockList.moltenMetal == Blocks.air) return false; else { - Material material = world.getBlock(x, y, z).getMaterial(); + Material material = world.getBlock(x, y, z) + .getMaterial(); boolean flag = !material.isSolid(); if (!world.isAirBlock(x, y, z) && !flag) return false; - else if (stack != null && JewelryNBT.ingot(stack) != null) { - if (!world.isRemote && flag && !material.isLiquid()) + else if (stack != null && JewelryNBT + .ingot(stack) != null) { + if (!world.isRemote && flag + && !material.isLiquid()) world.func_147480_a(x, y, z, true); - world.setBlock(x, y, z, BlockList.moltenMetal, 0, 3); - TileEntity moltenLiquid = world.getTileEntity(x, y, z); + world.setBlock(x, y, z, + BlockList.moltenMetal, 0, + 3); + TileEntity moltenLiquid = world + .getTileEntity(x, y, z); if (moltenLiquid instanceof TileEntityMoltenMetal) ((TileEntityMoltenMetal) moltenLiquid) - .setMetal(JewelryNBT.ingot(stack)); + .setMetal(JewelryNBT + .ingot(stack)); return true; } else return false; @@ -138,15 +165,16 @@ public class ItemMoltenMetalBucket extends Item { @Override public void registerIcons(IIconRegister iconRegister) { itemIcon = iconRegister.registerIcon("bucket_empty"); - liquid = iconRegister - .registerIcon(Variables.MODID + ":bucketOverlay"); + liquid = iconRegister.registerIcon( + Variables.MODID + ":bucketOverlay"); } @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if (pass == 1 && JewelryNBT.ingot(stack) != null) - return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil + .getColor(JewelryNBT.ingot(stack)); return 16777215; } @@ -178,21 +206,27 @@ public class ItemMoltenMetalBucket extends Item { if (ingot != null) { return StatCollector .translateToLocal( - getUnlocalizedNameInefficiently(stack) + getUnlocalizedNameInefficiently( + stack) + ".name") - .trim() + " " - + ingot.getDisplayName().replace("Ingot", " ") + .trim() + + " " + + ingot.getDisplayName() + .replace("Ingot", + " ") .trim(); } else return StatCollector - .translateToLocal("bucket.unknown"); + .translateToLocal( + "bucket.unknown"); } } catch (Exception e) { System.out.println("Error: " + e); } return ("" + StatCollector.translateToLocal( - getUnlocalizedNameInefficiently(stack) + ".name")).trim() - + " " + StatCollector - .translateToLocal("info.jewelrycraft2.metal"); + getUnlocalizedNameInefficiently(stack) + + ".name")).trim() + + " " + StatCollector.translateToLocal( + "info.jewelrycraft2.metal"); } } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java index d14230a..3a71d0b 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java @@ -20,10 +20,10 @@ public class ItemNecklace extends ItemBaseJewelry { */ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = - iconRegister.registerIcon(Variables.MODID + ":necklace"); - gem = iconRegister - .registerIcon(Variables.MODID + ":jewelNecklace"); + itemIcon = iconRegister.registerIcon( + Variables.MODID + ":necklace"); + gem = iconRegister.registerIcon( + Variables.MODID + ":jewelNecklace"); } /** diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java index 87ca8d8..4df83d0 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java @@ -20,8 +20,10 @@ public class ItemRing extends ItemBaseJewelry { */ @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon(Variables.MODID + ":ring"); - gem = iconRegister.registerIcon(Variables.MODID + ":jewelRing"); + itemIcon = iconRegister + .registerIcon(Variables.MODID + ":ring"); + gem = iconRegister.registerIcon( + Variables.MODID + ":jewelRing"); } /** diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java index cceab12..bb57f9a 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java @@ -28,14 +28,16 @@ import net.minecraft.world.World; * @author Betweenlands */ public class ItemSpawnEgg extends ItemMonsterPlacer { - private static final Map eggTypes = - new LinkedHashMap(); + private static final Map eggTypes = new LinkedHashMap(); public static void registerSpawnEgg( - Class entity, String entityName, - int id, int eggBackgroundColor, int eggForegroundColor) { - eggTypes.put((short) id, new EggData(id, entityName, entity, - eggBackgroundColor, eggForegroundColor)); + Class entity, + String entityName, int id, int eggBackgroundColor, + int eggForegroundColor) { + eggTypes.put((short) id, + new EggData(id, entityName, entity, + eggBackgroundColor, + eggForegroundColor)); } private static EggData getEggData(ItemStack is) { @@ -49,22 +51,23 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { @Override public String getItemStackDisplayName(ItemStack is) { - String s = StatCollector - .translateToLocal(getUnlocalizedName() + ".name").trim(); + String s = StatCollector.translateToLocal( + getUnlocalizedName() + ".name").trim(); String mob = ""; EggData egg = getEggData(is); if (egg != null) mob = StatCollector.translateToLocal("entity." - + Variables.MODID + "." + egg.entityName + ".name"); + + Variables.MODID + "." + + egg.entityName + ".name"); return String.format(s, mob); } @Override public boolean onItemUse(ItemStack is, EntityPlayer player, - World world, int x, int y, int z, int side, float hitX, - float hitY, float hitZ) { + World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { if (world.isRemote) return true; @@ -75,9 +78,11 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { EggData egg = getEggData(is); if (egg != null) { - egg.spawnMob(world, x + 0.5D, - y + (side == 1 && block != null - && block.getRenderType() == 11 ? 0.5D : 0D), + egg.spawnMob(world, x + 0.5D, y + (side == 1 + && block != null + && block.getRenderType() == 11 + ? 0.5D + : 0D), z + 0.5D, is); if (!player.capabilities.isCreativeMode) @@ -93,17 +98,19 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { if (world.isRemote) return is; - MovingObjectPosition mop = - getMovingObjectPositionFromPlayer(world, player, true); + MovingObjectPosition mop = getMovingObjectPositionFromPlayer( + world, player, true); if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) { int x = mop.blockX, y = mop.blockY, z = mop.blockZ; if (!world.canMineBlock(player, x, y, z) - || !player.canPlayerEdit(x, y, z, mop.sideHit, is)) + || !player.canPlayerEdit(x, y, z, + mop.sideHit, is)) return is; - if (world.getBlock(x, y, z).getMaterial() == Material.water) { + if (world.getBlock(x, y, z) + .getMaterial() == Material.water) { EggData egg = getEggData(is); if (egg != null) { egg.spawnMob(world, x, y, z, is); @@ -117,8 +124,8 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { return is; } - public static EntityLiving getEntity(World world, double x, double y, - double z, ItemStack is) { + public static EntityLiving getEntity(World world, double x, + double y, double z, ItemStack is) { EggData egg = getEggData(is); return egg.spawnMob(world, x, y, z, is); } @@ -128,7 +135,8 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { public int getColorFromItemStack(ItemStack is, int pass) { EggData egg = getEggData(is); return egg != null - ? pass == 0 ? egg.primaryColor : egg.secondaryColor + ? pass == 0 ? egg.primaryColor + : egg.secondaryColor : 16777215; } @@ -140,19 +148,22 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { } static class EggData { - private final short id; - String entityName; + private final short id; + String entityName; private final Class entityClass; - int primaryColor; - int secondaryColor; + int primaryColor; + int secondaryColor; EggData(int id, String entityName, Class entityClass, - int[] rgbPrimaryColor, int[] rgbSecondaryColor) { + int[] rgbPrimaryColor, + int[] rgbSecondaryColor) { this(id, entityName, entityClass, - rgbPrimaryColor[0] << 16 | rgbPrimaryColor[1] << 8 + rgbPrimaryColor[0] << 16 + | rgbPrimaryColor[1] << 8 | rgbPrimaryColor[2], - rgbSecondaryColor[0] << 16 | rgbSecondaryColor[1] << 8 + rgbSecondaryColor[0] << 16 + | rgbSecondaryColor[1] << 8 | rgbSecondaryColor[2]); } @@ -166,8 +177,8 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { this.secondaryColor = secondaryColor; } - public EntityLiving spawnMob(World world, double x, double y, - double z, ItemStack is) { + public EntityLiving spawnMob(World world, double x, + double y, double z, ItemStack is) { EntityLiving e = null; try { @@ -198,7 +209,9 @@ public class ItemSpawnEgg extends ItemMonsterPlacer { ((EntityHeart) e).setType("Red"); } e.setLocationAndAngles(x, y, z, MathHelper - .wrapAngleTo180_float(world.rand.nextFloat() * 360F), + .wrapAngleTo180_float(world.rand + .nextFloat() + * 360F), 0F); e.rotationYawHead = e.rotationYaw; e.renderYawOffset = e.rotationYaw; diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java index 4ff91df..a929430 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java @@ -20,9 +20,11 @@ public class ItemStructureGen extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (!world.isRemote && player.capabilities.isCreativeMode) { + if (!world.isRemote + && player.capabilities.isCreativeMode) { if (!player.isSneaking()) { - if (no < JewelrycraftUtil.structures.size() - 1) + if (no < JewelrycraftUtil.structures.size() + - 1) no++; else no = 0; @@ -30,22 +32,23 @@ public class ItemStructureGen extends Item { if (no > 0) no--; else - no = JewelrycraftUtil.structures.size() - 1; + no = JewelrycraftUtil.structures + .size() - 1; } - player.addChatMessage( - new ChatComponentText("Structure no. " + (no + 1))); + player.addChatMessage(new ChatComponentText( + "Structure no. " + (no + 1))); } return stack; } @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, - World world, int x, int y, int z, int par1, float par2, - float par3, float par4) { + World world, int x, int y, int z, int par1, + float par2, float par3, float par4) { if (player.capabilities.isCreativeMode) JewelrycraftUtil.structures.get(no).generate(world, - world.getBiomeGenForCoords(x, z), itemRand, x, y + 1, - z); + world.getBiomeGenForCoords(x, z), + itemRand, x, y + 1, z); return true; } diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java index 4b16a86..312c38c 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; public class ItemTest extends Item { @SideOnly(Side.CLIENT) - private IIcon[] icons; + private IIcon[] icons; private NBTTagCompound nbt = new NBTTagCompound(); public ItemTest() { @@ -49,14 +49,15 @@ public class ItemTest extends Item { icons = new IIcon[Curse.getCurseList().size()]; for (int i = 0; i < Curse.getCurseList().size(); ++i) icons[i] = par1IconRegister - .registerIcon(Variables.MODID + ":" + "testItem_" + i); + .registerIcon(Variables.MODID + ":" + + "testItem_" + i); } @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - MovingObjectPosition mop = - getMovingObjectPositionFromPlayer(world, player, true); + MovingObjectPosition mop = getMovingObjectPositionFromPlayer( + world, player, true); if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) { int x = mop.blockX, y = mop.blockY, z = mop.blockZ; TileEntity tile = world.getTileEntity(x, y, z); @@ -66,7 +67,8 @@ public class ItemTest extends Item { else { NBTTagCompound block = new NBTTagCompound(); tile.writeToNBT(block); - nbt.setString("id", block.getString("id")); + nbt.setString("id", block + .getString("id")); nbt.setInteger("x", tile.xCoord); nbt.setInteger("y", tile.yCoord); nbt.setInteger("z", tile.zCoord); diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java index 4ca3c0f..76d056d 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java @@ -45,27 +45,35 @@ public class ItemThiefGloves extends Item { @Override public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) { - String villagerString = StatCollector - .translateToLocal("info." + Variables.MODID + ".villager"); + String villagerString = StatCollector.translateToLocal( + "info." + Variables.MODID + ".villager"); if (entity instanceof EntityVillager) { EntityVillager villager = (EntityVillager) entity; - int wealth = (Integer) ReflectionHelper.getPrivateValue( - EntityVillager.class, villager, "wealth", - "field_70956_bz"); - MerchantRecipeList buyingList = - (MerchantRecipeList) ReflectionHelper.getPrivateValue( - EntityVillager.class, villager, "buyingList", + int wealth = (Integer) ReflectionHelper + .getPrivateValue( + EntityVillager.class, + villager, "wealth", + "field_70956_bz"); + MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper + .getPrivateValue( + EntityVillager.class, + villager, + "buyingList", "field_70963_i"); int chance = 1; - boolean areOtherVillagersAround = false, canTheySeeYou = false; - AxisAlignedBB axisalignedbb = - villager.boundingBox.expand(2.0D, 0.0D, 2.0D); - List entities = - villager.worldObj.getEntitiesWithinAABBExcludingEntity( - villager, axisalignedbb); + boolean areOtherVillagersAround = false, + canTheySeeYou = false; + AxisAlignedBB axisalignedbb = villager.boundingBox + .expand(2.0D, 0.0D, 2.0D); + List entities = villager.worldObj + .getEntitiesWithinAABBExcludingEntity( + villager, + axisalignedbb); for (Object s : entities) if (s instanceof EntityVillager - && ((EntityVillager) s).canEntityBeSeen(player)) { + && ((EntityVillager) s) + .canEntityBeSeen( + player)) { chance += 1; canTheySeeYou = true; areOtherVillagersAround = true; @@ -79,152 +87,178 @@ public class ItemThiefGloves extends Item { int steal = rand.nextInt(chance); if (steal == 0) { villager.dropItem(Items.emerald, wealth); - ReflectionHelper.setPrivateValue(EntityVillager.class, - villager, 0, "wealth", "field_70956_bz"); + ReflectionHelper.setPrivateValue( + EntityVillager.class, + villager, 0, "wealth", + "field_70956_bz"); } if (buyingList != null) { - Iterator iterator = buyingList.iterator(); + Iterator iterator = buyingList + .iterator(); if (steal == 0) { while (iterator.hasNext()) { - MerchantRecipe recipe = - (MerchantRecipe) iterator.next(); - int toolUses = - (Integer) ReflectionHelper.getPrivateValue( - MerchantRecipe.class, recipe, - "toolUses", "field_77400_d"); + MerchantRecipe recipe = (MerchantRecipe) iterator + .next(); + int toolUses = (Integer) ReflectionHelper + .getPrivateValue( + MerchantRecipe.class, + recipe, + "toolUses", + "field_77400_d"); int quantity; - if (recipe.getItemToSell().isStackable()) - quantity = recipe.getItemToSell().stackSize + if (recipe.getItemToSell() + .isStackable()) + quantity = recipe + .getItemToSell().stackSize * (7 - toolUses); else - quantity = recipe.getItemToSell().stackSize; + quantity = recipe + .getItemToSell().stackSize; ItemStack s = new ItemStack( - recipe.getItemToSell().getItem(), quantity, - recipe.getItemToSell().getItemDamage()); - s.setTagCompound( - recipe.getItemToSell().getTagCompound()); - if (player.inventory.addItemStackToInventory(s)) + recipe.getItemToSell() + .getItem(), + quantity, + recipe.getItemToSell() + .getItemDamage()); + s.setTagCompound(recipe + .getItemToSell() + .getTagCompound()); + if (player.inventory + .addItemStackToInventory( + s)) ; else - villager.entityDropItem(s, 0); + villager.entityDropItem( + s, + 0); if (!player.capabilities.isCreativeMode) - JewelrycraftUtil.addCursePoints(player, 5); + JewelrycraftUtil.addCursePoints( + player, + 5); player.addChatMessage( - new ChatComponentText(villagerString + " #" - + villager.getProfession() + ": " - + StatCollector.translateToLocal( - "chatmessage." - + Variables.MODID - + ".villager.confusion") - + " " + s.getDisplayName() + "!")); - stack.damageItem(1, player); + new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + ": " + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".villager.confusion") + + " " + + s.getDisplayName() + + "!")); + stack.damageItem(1, + player); } buyingList.clear(); - ReflectionHelper.setPrivateValue(EntityVillager.class, - villager, 300, "timeUntilReset", + ReflectionHelper.setPrivateValue( + EntityVillager.class, + villager, 300, + "timeUntilReset", "field_70961_j"); - ReflectionHelper.setPrivateValue(EntityVillager.class, - villager, true, "needsInitilization", + ReflectionHelper.setPrivateValue( + EntityVillager.class, + villager, true, + "needsInitilization", "field_70959_by"); player.addChatMessage( - new ChatComponentText(StatCollector - .translateToLocal("chatmessage." - + Variables.MODID + ".whisper") - + ": ")); - player.addChatMessage(new ChatComponentText( - EnumChatFormatting.DARK_PURPLE + StatCollector - .translateToLocal("chatmessage." - + Variables.MODID - + ".stealSuccess1"))); - player.addChatMessage(new ChatComponentText( - EnumChatFormatting.DARK_PURPLE + StatCollector - .translateToLocal("chatmessage." - + Variables.MODID - + ".stealSuccess2"))); - player.addChatMessage(new ChatComponentText( - EnumChatFormatting.DARK_PURPLE + StatCollector - .translateToLocal("chatmessage." - + Variables.MODID - + ".stealSuccess3"))); + new ChatComponentText( + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".whisper") + + ": ")); + player.addChatMessage( + new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".stealSuccess1"))); + player.addChatMessage( + new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".stealSuccess2"))); + player.addChatMessage( + new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".stealSuccess3"))); } else { stack.damageItem(1, player); if (!player.capabilities.isCreativeMode) - JewelrycraftUtil.addCursePoints(player, 25); - if (player.isPotionActive(Potion.invisibility)) { + JewelrycraftUtil.addCursePoints( + player, + 25); + if (player.isPotionActive( + Potion.invisibility)) { player.addChatMessage( - new ChatComponentText(villagerString + " #" - + villager.getProfession() + " " - + StatCollector.translateToLocal( - "chatmessage." - + Variables.MODID - + ".steal.fail"))); + new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + " " + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".steal.fail"))); } else { if (areOtherVillagersAround) { if (!canTheySeeYou) { player.addChatMessage( - new ChatComponentText(StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID + new ChatComponentText( + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + ".steal.caught1") - + " " + villagerString - + " #" - + villager.getProfession() - + ".")); + + " " + + villagerString + + " #" + + villager.getProfession() + + ".")); player.addChatMessage( new ChatComponentText( villagerString + " #" - + villager - .getProfession() + + villager.getProfession() + " " - + StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID - + ".steal2"))); + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".steal2"))); return true; } else { player.addChatMessage( - new ChatComponentText(StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID + new ChatComponentText( + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + ".steal.caught2") - + " " + villagerString - + " #" - + villager.getProfession() - + ".")); + + " " + + villagerString + + " #" + + villager.getProfession() + + ".")); player.addChatMessage( new ChatComponentText( villagerString + " #" - + villager - .getProfession() + + villager.getProfession() + " " - + StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID - + ".steal2"))); + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + + ".steal2"))); return true; } } else { - player.addChatMessage(new ChatComponentText( - villagerString + " #" - + villager.getProfession() - + " " - + StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID + player.addChatMessage( + new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + " " + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + ".steal1"))); - player.addChatMessage(new ChatComponentText( - villagerString + " #" - + villager.getProfession() - + " " - + StatCollector - .translateToLocal( - "chatmessage." - + Variables.MODID + player.addChatMessage( + new ChatComponentText( + villagerString + " #" + + villager.getProfession() + + " " + + StatCollector.translateToLocal( + "chatmessage." + Variables.MODID + ".steal2"))); return true; } @@ -233,7 +267,8 @@ public class ItemThiefGloves extends Item { } return true; } else - return super.itemInteractionForEntity(stack, player, entity); + return super.itemInteractionForEntity(stack, + player, entity); } /** @@ -249,15 +284,18 @@ public class ItemThiefGloves extends Item { list.add(EnumChatFormatting.GRAY + additionalInfoInstructions()); else { - list.add(EnumChatFormatting.GRAY - + StatCollector.translateToLocal("item." - + Variables.MODID + ".thievingGloves.info.1")); - list.add(EnumChatFormatting.GRAY - + StatCollector.translateToLocal("item." - + Variables.MODID + ".thievingGloves.info.2")); - list.add(EnumChatFormatting.GRAY - + StatCollector.translateToLocal("item." - + Variables.MODID + ".thievingGloves.info.3")); + list.add(EnumChatFormatting.GRAY + StatCollector + .translateToLocal("item." + + Variables.MODID + + ".thievingGloves.info.1")); + list.add(EnumChatFormatting.GRAY + StatCollector + .translateToLocal("item." + + Variables.MODID + + ".thievingGloves.info.2")); + list.add(EnumChatFormatting.GRAY + StatCollector + .translateToLocal("item." + + Variables.MODID + + ".thievingGloves.info.3")); } } @@ -265,7 +303,8 @@ public class ItemThiefGloves extends Item { * @return */ public static boolean shouldAddAdditionalInfo() { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) + if (FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT) if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) return true; return false; @@ -275,8 +314,9 @@ public class ItemThiefGloves extends Item { * @return */ public static String additionalInfoInstructions() { - String message = StatCollector.translateToLocal( - "item." + Variables.MODID + ".thievingGloves.info.extra"); + String message = StatCollector.translateToLocal("item." + + Variables.MODID + + ".thievingGloves.info.extra"); return message; } } diff --git a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java index 3d7bcbe..2f1ba9e 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; public class BraceletRender extends TileEntitySpecialRenderer { public ModelBracelet bracelet = new ModelBracelet(); - ResourceLocation texture = new ResourceLocation( + ResourceLocation texture = new ResourceLocation( Variables.MODID, "textures/entities/Bracelet.png"); @Override @@ -26,21 +26,23 @@ public class BraceletRender extends TileEntitySpecialRenderer { GL11.glPushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); if ((float) z != -1) - bracelet.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F); - if (Loader - .isModLoaded("alpaca") /* - * && fiskfille.alpaca.AlpacaAPI. - * isAlpacaClient(( - * EntityPlayer)entity) - */) { + bracelet.render(entity, 0F, 0F, 0F, (float) z, f, + 1.0F); + if (Loader.isModLoaded( + "alpaca") /* + * && fiskfille.alpaca. + * AlpacaAPI. + * isAlpacaClient(( + * EntityPlayer)entity) + */) { GL11.glTranslatef(1F, 0F, -9F); GL11.glRotatef(25F, 1F, 0F, 0F); GL11.glRotatef(-25F, 0F, 1F, 0F); } else GL11.glTranslatef(0F, 3F, 0F); if ((float) x != -1) - bracelet.render(entity, 0F, 0F, 0F, (float) x, (float) y, - 1.0F); + bracelet.render(entity, 0F, 0F, 0F, (float) x, + (float) y, 1.0F); GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java index 958aceb..c82f2e2 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java @@ -12,8 +12,8 @@ import net.minecraft.util.ResourceLocation; public class EarringsRender extends TileEntitySpecialRenderer { ModelEarrings earrings = new ModelEarrings(); - ResourceLocation texture = new ResourceLocation(Variables.MODID, - "textures/entities/Earrings.png"); + ResourceLocation texture = new ResourceLocation( + Variables.MODID, "textures/entities/Earrings.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java index 9b665ec..50f3472 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java @@ -31,24 +31,23 @@ import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; public class ItemRender implements IItemRenderer { - TileEntitySpecialRenderer render; - public TileEntity entity; - ModelBase model; - private RenderBlocks renderBlocksIr = - new RenderBlocks(); - private Minecraft mc = - Minecraft.getMinecraft(); - private static final ResourceLocation RES_ITEM_GLINT = - new ResourceLocation("textures/misc/enchanted_item_glint.png"); - private float tran = 0F; + TileEntitySpecialRenderer render; + public TileEntity entity; + ModelBase model; + private RenderBlocks renderBlocksIr = new RenderBlocks(); + private Minecraft mc = Minecraft + .getMinecraft(); + private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation( + "textures/misc/enchanted_item_glint.png"); + private float tran = 0F; /** * @param render * @param entity * @param model */ - public ItemRender(TileEntitySpecialRenderer render, TileEntity entity, - ModelBase model) { + public ItemRender(TileEntitySpecialRenderer render, + TileEntity entity, ModelBase model) { this.entity = entity; this.render = render; this.model = model; @@ -63,7 +62,8 @@ public class ItemRender implements IItemRenderer { * @return */ @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { + public boolean handleRenderType(ItemStack item, + ItemRenderType type) { return true; } @@ -92,63 +92,83 @@ public class ItemRender implements IItemRenderer { && JewelryNBT.item(item) == null) { if (type == IItemRenderer.ItemRenderType.ENTITY) { GL11.glRotatef(180f, 0f, 1f, 0f); - GL11.glTranslatef(-0.5f, -0.5f, -0.4f); + GL11.glTranslatef(-0.5f, -0.5f, + -0.4f); } - render.renderTileEntityAt(entity, 0.0D, 0.0D, 0.0D, 0.0F); + render.renderTileEntityAt(entity, 0.0D, + 0.0D, 0.0D, 0.0F); } else if (JewelryNBT.item(item) != null) { GL11.glPushMatrix(); GL11.glColor3f(1F, 1F, 0F); - if (Item.getItemById(Integer.valueOf(item.getTagCompound() - .getTag("target").toString().split(",")[0] - .substring(4).replace("s", ""))) != null) - renderItem(Minecraft.getMinecraft().thePlayer, - JewelryNBT.item(item), 0, type); + if (Item.getItemById(Integer.valueOf(item + .getTagCompound() + .getTag("target") + .toString().split(",")[0] + .substring(4) + .replace("s", ""))) != null) + renderItem(Minecraft + .getMinecraft().thePlayer, + JewelryNBT.item(item), + 0, type); else - renderItem(Minecraft.getMinecraft().thePlayer, - new ItemStack(Blocks.end_portal), 0, type); + renderItem(Minecraft + .getMinecraft().thePlayer, + new ItemStack(Blocks.end_portal), + 0, type); GL11.glPopMatrix(); } else { GL11.glPushMatrix(); GL11.glColor3f(1F, 1F, 0F); - renderItem(Minecraft.getMinecraft().thePlayer, - new ItemStack(Blocks.end_portal), 0, type); + renderItem(Minecraft + .getMinecraft().thePlayer, + new ItemStack(Blocks.end_portal), + 0, type); GL11.glPopMatrix(); } } } - public void renderItem(EntityLivingBase entity, ItemStack itemStack, - int meta, ItemRenderType type) { + public void renderItem(EntityLivingBase entity, + ItemStack itemStack, int meta, + ItemRenderType type) { GL11.glPushMatrix(); - TextureManager texturemanager = this.mc.getTextureManager(); + TextureManager texturemanager = this.mc + .getTextureManager(); if (itemStack != null) { Item item = itemStack.getItem(); Block block = Block.getBlockFromItem(item); - IItemRenderer customRenderer = - MinecraftForgeClient.getItemRenderer(itemStack, type); + IItemRenderer customRenderer = MinecraftForgeClient + .getItemRenderer(itemStack, type); if (customRenderer != null) { - texturemanager - .bindTexture(texturemanager.getResourceLocation( + texturemanager.bindTexture(texturemanager + .getResourceLocation( itemStack.getItemSpriteNumber())); if (type.equals(ItemRenderType.EQUIPPED)) - GL11.glTranslatef(0.7F, 0.55F, 0.55F); - ForgeHooksClient.renderEquippedItem(type, customRenderer, - renderBlocksIr, entity, itemStack); + GL11.glTranslatef(0.7F, 0.55F, + 0.55F); + ForgeHooksClient.renderEquippedItem(type, + customRenderer, + renderBlocksIr, entity, + itemStack); } else if (itemStack.getItemSpriteNumber() == 0 - && item instanceof ItemBlock && RenderBlocks - .renderItemIn3d(block.getRenderType())) { - texturemanager.bindTexture( - texturemanager.getResourceLocation(0)); + && item instanceof ItemBlock + && RenderBlocks.renderItemIn3d( + block.getRenderType())) { + texturemanager.bindTexture(texturemanager + .getResourceLocation(0)); if (type.equals(ItemRenderType.EQUIPPED)) - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); if (itemStack != null && block != null && block.getRenderBlockPass() != 0) { GL11.glDepthMask(false); - renderBlockAsItem(block, itemStack.getItemDamage(), + renderBlockAsItem(block, itemStack + .getItemDamage(), 1.0F); GL11.glDepthMask(true); } else { - renderBlockAsItem(block, itemStack.getItemDamage(), + renderBlockAsItem(block, itemStack + .getItemDamage(), 1.0F); } } else { @@ -157,10 +177,11 @@ public class ItemRender implements IItemRenderer { GL11.glPopMatrix(); return; } - texturemanager - .bindTexture(texturemanager.getResourceLocation( + texturemanager.bindTexture(texturemanager + .getResourceLocation( itemStack.getItemSpriteNumber())); - TextureUtil.func_152777_a(false, false, 1.0F); + TextureUtil.func_152777_a(false, false, + 1.0F); Tessellator tessellator = Tessellator.instance; float f = iicon.getMinU(); float f1 = iicon.getMaxU(); @@ -170,42 +191,63 @@ public class ItemRender implements IItemRenderer { float f6 = 1.6F; GL11.glScalef(f6, f6, f6); if (type.equals(ItemRenderType.ENTITY)) { - GL11.glTranslatef(0.0F, 0.0265F, 0.0F); - GL11.glRotatef(-30F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(0.625F, 0.625F, 0.625F); + GL11.glTranslatef(0.0F, 0.0265F, + 0.0F); + GL11.glRotatef(-30F, 0.0F, 0.0F, + 1.0F); + GL11.glRotatef(45F, 0.0F, 1.0F, + 0.0F); + GL11.glScalef(0.625F, 0.625F, + 0.625F); } - if (!type.equals(ItemRenderType.EQUIPPED_FIRST_PERSON)) { + if (!type.equals( + ItemRenderType.EQUIPPED_FIRST_PERSON)) { GL11.glRotatef(45f, 0f, 1f, 0f); GL11.glRotatef(180f, 0f, 1f, 0f); GL11.glRotatef(30f, 1f, 0f, 0f); if (type.equals(ItemRenderType.EQUIPPED)) { - GL11.glRotatef(35f, 1f, 0f, 0f); - GL11.glTranslatef(0F, -0.15F, -0.6F); + GL11.glRotatef(35f, 1f, 0f, + 0f); + GL11.glTranslatef(0F, + -0.15F, + -0.6F); } - GL11.glTranslatef(-0.5F, -0.5F, 0.0F); - } else if (type - .equals(ItemRenderType.EQUIPPED_FIRST_PERSON)) { - GL11.glTranslatef(-0.35F, 0.4F, 0.93F); + GL11.glTranslatef(-0.5F, -0.5F, + 0.0F); + } else if (type.equals( + ItemRenderType.EQUIPPED_FIRST_PERSON)) { + GL11.glTranslatef(-0.35F, 0.4F, + 0.93F); GL11.glRotatef(45f, 0f, 1f, 0f); GL11.glRotatef(-25f, 0f, 0f, 1f); } - if (itemStack.getItem().requiresMultipleRenderPasses()) { - for (int x = 0; x < itemStack.getItem() - .getRenderPasses(itemStack.getItemDamage()); - x++) { - iicon = itemStack.getItem().getIcon(itemStack, x); + if (itemStack.getItem() + .requiresMultipleRenderPasses()) { + for (int x = 0; x < itemStack + .getItem() + .getRenderPasses( + itemStack.getItemDamage()); x++) { + iicon = itemStack.getItem() + .getIcon(itemStack, + x); f = iicon.getMinU(); f1 = iicon.getMaxU(); f2 = iicon.getMinV(); f3 = iicon.getMaxV(); - ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, - f3, iicon.getIconWidth(), - iicon.getIconHeight(), 0.0625F); + ItemRenderer.renderItemIn2D( + tessellator, + f1, f2, f, + f3, + iicon.getIconWidth(), + iicon.getIconHeight(), + 0.0625F); } } else { - ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, - iicon.getIconWidth(), iicon.getIconHeight(), + ItemRenderer.renderItemIn2D( + tessellator, f1, + f2, f, f3, + iicon.getIconWidth(), + iicon.getIconHeight(), 0.0625F); } GL11.glDepthFunc(GL11.GL_EQUAL); @@ -213,19 +255,21 @@ public class ItemRender implements IItemRenderer { GL11.glPushMatrix(); float f8 = 0.325F; GL11.glScalef(f8, f8, f8); - float f9 = (float) (Minecraft.getSystemTime() % 30000L) + float f9 = (float) (Minecraft + .getSystemTime() % 30000L) / 30000.0F * 8.0F; GL11.glTranslatef(-f9, 0.0F, 0.0F); GL11.glRotatef(30.0F, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, - 1.0F, 256, 256, 0.0625F); + ItemRenderer.renderItemIn2D(tessellator, + 0.0F, 0.0F, 1.0F, 1.0F, + 256, 256, 0.0625F); GL11.glPopMatrix(); GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glDisable(GL11.GL_BLEND); GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glDisable(GL12.GL_RESCALE_NORMAL); - texturemanager - .bindTexture(texturemanager.getResourceLocation( + texturemanager.bindTexture(texturemanager + .getResourceLocation( itemStack.getItemSpriteNumber())); TextureUtil.func_147945_b(); } @@ -255,51 +299,69 @@ public class ItemRender implements IItemRenderer { f1 = 0.0625F; tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 0)); + renderBlocksIr.renderFaceYNeg(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 0)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 1)); + renderBlocksIr.renderFaceYPos(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 1)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); tessellator.addTranslation(0.0F, 0.0F, f1); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 2)); - tessellator.addTranslation(0.0F, 0.0F, -f1); + renderBlocksIr.renderFaceZNeg(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 2)); + tessellator.addTranslation(0.0F, 0.0F, + -f1); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - tessellator.addTranslation(0.0F, 0.0F, -f1); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 3)); + tessellator.addTranslation(0.0F, 0.0F, + -f1); + renderBlocksIr.renderFaceZPos(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 3)); tessellator.addTranslation(0.0F, 0.0F, f1); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); tessellator.addTranslation(f1, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 4)); - tessellator.addTranslation(-f1, 0.0F, 0.0F); + renderBlocksIr.renderFaceXNeg(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 4)); + tessellator.addTranslation(-f1, 0.0F, + 0.0F); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - tessellator.addTranslation(-f1, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 5)); + tessellator.addTranslation(-f1, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos(block, 0.0D, + 0.0D, 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, 5)); tessellator.addTranslation(f1, 0.0F, 0.0F); tessellator.draw(); GL11.glTranslatef(0.0625F, 0.0F, 0.0625F); - GL11.glScalef(0.9375F - 0.0625F, 1F, 0.9375F - 0.0625F); + GL11.glScalef(0.9375F - 0.0625F, 1F, + 0.9375F - 0.0625F); shinyBlock(tessellator, false); } else if (j == 22) { // Chest GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - TileEntityRendererChestHelper.instance.renderChest(block, - damage, luminacy); + TileEntityRendererChestHelper.instance + .renderChest(block, damage, + luminacy); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glTranslatef(0.0625F, 0.0F, 0.0625F); GL11.glScalef(0.9375F - 0.0625F, 0.875F, @@ -309,45 +371,83 @@ public class ItemRender implements IItemRenderer { // Stairs for (k = 0; k < 2; ++k) { if (k == 0) { - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, - 1.0D, 1.0D, 0.5D); + renderBlocksIr.setRenderBounds( + 0.0D, 0.0D, + 0.0D, 1.0D, + 1.0D, + 0.5D); } if (k == 1) { - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.5D, - 1.0D, 0.5D, 1.0D); + renderBlocksIr.setRenderBounds( + 0.0D, 0.0D, + 0.5D, 1.0D, + 0.5D, + 1.0D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glTranslatef(-0.5F, -0.5F, + -0.5F); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 0)); + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 0)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 1)); + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 1)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 2)); + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 2)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 3)); + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 3)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 4)); + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 4)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 5)); + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 5)); tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); } } else if (j == 27) { // Dragon Egg @@ -386,287 +486,499 @@ public class ItemRender implements IItemRenderer { b0 = 3; } float f5 = (float) b0 / 16.0F; - float f6 = 1.0F - (float) k / 16.0F; - float f7 = 1.0F - (float) (k + b1) / 16.0F; + float f6 = 1.0F - (float) k + / 16.0F; + float f7 = 1.0F - (float) (k + b1) + / 16.0F; k += b1; - renderBlocksIr.setRenderBounds((double) (0.5F - f5), - (double) f7, (double) (0.5F - f5), - (double) (0.5F + f5), (double) f6, + renderBlocksIr.setRenderBounds( + (double) (0.5F - f5), + (double) f7, + (double) (0.5F - f5), + (double) (0.5F + f5), + (double) f6, (double) (0.5F + f5)); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 0)); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 1)); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 2)); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 3)); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 4)); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 5)); + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 0)); + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 1)); + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 2)); + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 3)); + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 4)); + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 5)); } tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, - 1.0D, 1.0D); + renderBlocksIr.setRenderBounds(0.0D, 0.0D, + 0.0D, 1.0D, 1.0D, 1.0D); } else if (j == 11) { // Fence for (k = 0; k < 4; ++k) { f2 = 0.125F; if (k == 0) { renderBlocksIr.setRenderBounds( - (double) (0.5F - f2), 0.0D, 0.0D, - (double) (0.5F + f2), 1.0D, + (double) (0.5F - f2), + 0.0D, 0.0D, + (double) (0.5F + f2), + 1.0D, (double) (f2 * 2.0F)); } if (k == 1) { renderBlocksIr.setRenderBounds( - (double) (0.5F - f2), 0.0D, - (double) (1.0F - f2 * 2.0F), - (double) (0.5F + f2), 1.0D, 1.0D); + (double) (0.5F - f2), + 0.0D, + (double) (1.0F - f2 + * 2.0F), + (double) (0.5F + f2), + 1.0D, + 1.0D); } f2 = 0.0625F; if (k == 2) { renderBlocksIr.setRenderBounds( (double) (0.5F - f2), - (double) (1.0F - f2 * 3.0F), + (double) (1.0F - f2 + * 3.0F), (double) (-f2 * 2.0F), - (double) (0.5F + f2), (double) (1.0F - f2), - (double) (1.0F + f2 * 2.0F)); + (double) (0.5F + f2), + (double) (1.0F - f2), + (double) (1.0F + f2 + * 2.0F)); } if (k == 3) { renderBlocksIr.setRenderBounds( (double) (0.5F - f2), - (double) (0.5F - f2 * 3.0F), + (double) (0.5F - f2 + * 3.0F), (double) (-f2 * 2.0F), - (double) (0.5F + f2), (double) (0.5F - f2), - (double) (1.0F + f2 * 2.0F)); + (double) (0.5F + f2), + (double) (0.5F - f2), + (double) (1.0F + f2 + * 2.0F)); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glTranslatef(-0.5F, -0.5F, + -0.5F); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 0)); + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 0)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 1)); + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 1)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 2)); + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 2)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 3)); + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 3)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 4)); + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 4)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 5)); + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 5)); tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); } - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, - 1.0D, 1.0D); + renderBlocksIr.setRenderBounds(0.0D, 0.0D, + 0.0D, 1.0D, 1.0D, 1.0D); } else if (j == 21) { // Fence Gate for (k = 0; k < 3; ++k) { f2 = 0.0625F; if (k == 0) { renderBlocksIr.setRenderBounds( - (double) (0.5F - f2), 0.30000001192092896D, - 0.0D, (double) (0.5F + f2), 1.0D, + (double) (0.5F - f2), + 0.30000001192092896D, + 0.0D, + (double) (0.5F + f2), + 1.0D, (double) (f2 * 2.0F)); } if (k == 1) { renderBlocksIr.setRenderBounds( - (double) (0.5F - f2), 0.30000001192092896D, - (double) (1.0F - f2 * 2.0F), - (double) (0.5F + f2), 1.0D, 1.0D); + (double) (0.5F - f2), + 0.30000001192092896D, + (double) (1.0F - f2 + * 2.0F), + (double) (0.5F + f2), + 1.0D, + 1.0D); } f2 = 0.0625F; if (k == 2) { renderBlocksIr.setRenderBounds( - (double) (0.5F - f2), 0.5D, 0.0D, - (double) (0.5F + f2), (double) (1.0F - f2), + (double) (0.5F - f2), + 0.5D, 0.0D, + (double) (0.5F + f2), + (double) (1.0F - f2), 1.0D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glTranslatef(-0.5F, -0.5F, + -0.5F); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 0)); + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 0)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 1)); + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 1)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 2)); + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 2)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 3)); + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 3)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 4)); + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 4)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSide(block, 5)); + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSide( + block, + 5)); tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); } } else if (j == 32) { // Wall for (k = 0; k < 2; ++k) { if (k == 0) { - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.3125D, - 1.0D, 0.8125D, 0.6875D); + renderBlocksIr.setRenderBounds( + 0.0D, 0.0D, + 0.3125D, + 1.0D, + 0.8125D, + 0.6875D); } if (k == 1) { - renderBlocksIr.setRenderBounds(0.25D, 0.0D, 0.25D, - 0.75D, 1.0D, 0.75D); + renderBlocksIr.setRenderBounds( + 0.25D, + 0.0D, + 0.25D, + 0.75D, + 1.0D, + 0.75D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glTranslatef(-0.5F, -0.5F, + -0.5F); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 0, damage)); + block, + 0, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 1, damage)); + block, + 1, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 2, damage)); + block, + 2, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 3, damage)); + block, + 3, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 4, damage)); + block, + 4, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 5, damage)); + block, + 5, + damage)); tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); } - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, - 1.0D, 1.0D); + renderBlocksIr.setRenderBounds(0.0D, 0.0D, + 0.0D, 1.0D, 1.0D, 1.0D); } else if (j == 35) { // Anvil GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - renderBlocksIr.renderBlockAnvilOrient((BlockAnvil) block, - 0, 0, 0, damage << 2, true); + renderBlocksIr.renderBlockAnvilOrient( + (BlockAnvil) block, 0, 0, + 0, damage << 2, true); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } else if (j == 34) { // Beacon for (k = 0; k < 3; ++k) { if (k == 0) { - renderBlocksIr.setRenderBounds(0.125D, 0.0D, - 0.125D, 0.875D, 0.1875D, 0.875D); - renderBlocksIr - .setOverrideBlockTexture(renderBlocksIr - .getBlockIcon(Blocks.obsidian)); + renderBlocksIr.setRenderBounds( + 0.125D, + 0.0D, + 0.125D, + 0.875D, + 0.1875D, + 0.875D); + renderBlocksIr.setOverrideBlockTexture( + renderBlocksIr.getBlockIcon( + Blocks.obsidian)); } else if (k == 1) { - renderBlocksIr.setRenderBounds(0.1875D, 0.1875D, - 0.1875D, 0.8125D, 0.875D, 0.8125D); - renderBlocksIr - .setOverrideBlockTexture(renderBlocksIr - .getBlockIcon(Blocks.beacon)); + renderBlocksIr.setRenderBounds( + 0.1875D, + 0.1875D, + 0.1875D, + 0.8125D, + 0.875D, + 0.8125D); + renderBlocksIr.setOverrideBlockTexture( + renderBlocksIr.getBlockIcon( + Blocks.beacon)); } else if (k == 2) { - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, - 1.0D, 1.0D, 1.0D); + renderBlocksIr.setRenderBounds( + 0.0D, 0.0D, + 0.0D, 1.0D, + 1.0D, + 1.0D); renderBlocksIr.setOverrideBlockTexture( - renderBlocksIr.getBlockIcon(Blocks.glass)); + renderBlocksIr.getBlockIcon( + Blocks.glass)); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glTranslatef(-0.5F, -0.5F, + -0.5F); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, -1.0F, + 0.0F); + renderBlocksIr.renderFaceYNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 0, damage)); + block, + 0, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 1.0F, + 0.0F); + renderBlocksIr.renderFaceYPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 1, damage)); + block, + 1, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 0.0F, + -1.0F); + renderBlocksIr.renderFaceZNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 2, damage)); + block, + 2, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(0.0F, 0.0F, + 1.0F); + renderBlocksIr.renderFaceZPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 3, damage)); + block, + 3, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(-1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXNeg( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 4, damage)); + block, + 4, + damage)); tessellator.draw(); tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, + tessellator.setNormal(1.0F, 0.0F, + 0.0F); + renderBlocksIr.renderFaceXPos( + block, 0.0D, 0.0D, + 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata( - block, 5, damage)); + block, + 5, + damage)); tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(0.5F, 0.5F, + 0.5F); } - renderBlocksIr.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, - 1.0D, 1.0D); + renderBlocksIr.setRenderBounds(0.0D, 0.0D, + 0.0D, 1.0D, 1.0D, 1.0D); renderBlocksIr.clearOverrideBlockTexture(); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); shinyBlock(tessellator, false); } else { try { - FMLRenderAccessLibrary.renderInventoryBlock( - renderBlocksIr, block, damage, j); + FMLRenderAccessLibrary + .renderInventoryBlock( + renderBlocksIr, + block, + damage, + j); } catch (Exception e) { JewelrycraftMod.logger.error( "Something went wrong with rendering the item"); @@ -683,48 +995,54 @@ public class ItemRender implements IItemRenderer { GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 0, damage)); + renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 0, damage)); tessellator.draw(); GL11.glColor4f(1F, 1F, 0F, 1.0F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 1, damage)); + renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 1, damage)); tessellator.draw(); GL11.glColor4f(1F, 1F, 0F, 1.0F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 2, damage)); + renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 2, damage)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 3, damage)); + renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 3, damage)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 4, damage)); + renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 4, damage)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, - renderBlocksIr.getBlockIconFromSideAndMetadata(block, - 5, damage)); + renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, + 0.0D, + renderBlocksIr.getBlockIconFromSideAndMetadata( + block, 5, damage)); tessellator.draw(); - GL11.glTranslatef((float) block.getBlockBoundsMinX(), + GL11.glTranslatef( + (float) block.getBlockBoundsMinX(), (float) block.getBlockBoundsMinY(), (float) block.getBlockBoundsMinZ()); - GL11.glScalef( - (float) block.getBlockBoundsMaxX() - - (float) block.getBlockBoundsMinX(), + GL11.glScalef((float) block.getBlockBoundsMaxX() + - (float) block.getBlockBoundsMinX(), (float) block.getBlockBoundsMaxY() - (float) block.getBlockBoundsMinY(), (float) block.getBlockBoundsMaxZ() @@ -734,8 +1052,10 @@ public class ItemRender implements IItemRenderer { } } - public void renderShine(Tessellator tessellator, boolean autoAnimate) { - TextureManager texturemanager = this.mc.getTextureManager(); + public void renderShine(Tessellator tessellator, + boolean autoAnimate) { + TextureManager texturemanager = this.mc + .getTextureManager(); texturemanager.bindTexture(RES_ITEM_GLINT); GL11.glEnable(GL11.GL_BLEND); OpenGlHelper.glBlendFunc(768, 1, 1, 0); @@ -753,12 +1073,13 @@ public class ItemRender implements IItemRenderer { } GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F); GL11.glColor3f(1F, 1F, 0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, - 256, 256, 0.001F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, + 1.0F, 256, 256, 0.001F); GL11.glPopMatrix(); } - public void shinyBlock(Tessellator tessellator, boolean autoAnimate) { + public void shinyBlock(Tessellator tessellator, + boolean autoAnimate) { GL11.glPushMatrix(); GL11.glTranslatef(0F, 0.0F, -0.001F); renderShine(tessellator, autoAnimate); diff --git a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java index d967cef..dd671e2 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java @@ -11,9 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; public class MaskRender extends TileEntitySpecialRenderer { - ModelMask mask = new ModelMask(); - ResourceLocation texture = new ResourceLocation(Variables.MODID, - "textures/entities/Mask.png"); + ModelMask mask = new ModelMask(); + ResourceLocation texture = new ResourceLocation( + Variables.MODID, "textures/entities/Mask.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, diff --git a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java index 5134559..c021e7a 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; public class NecklaceRender extends TileEntitySpecialRenderer { public ModelNeckalce neckalce = new ModelNeckalce(); - ResourceLocation texture = new ResourceLocation( + ResourceLocation texture = new ResourceLocation( Variables.MODID, "textures/entities/Necklace.png"); @Override @@ -25,7 +25,8 @@ public class NecklaceRender extends TileEntitySpecialRenderer { GL11.glPushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); if ((float) z != -1) - neckalce.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F); + neckalce.render(entity, 0F, 0F, 0F, (float) z, f, + 1.0F); GL11.glPopMatrix(); } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java index 88083ab..1cde268 100755 --- a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java @@ -12,8 +12,8 @@ import net.minecraft.util.ResourceLocation; public class RingRender extends TileEntitySpecialRenderer { public ModelRing ring = new ModelRing(); - ResourceLocation texture = new ResourceLocation(Variables.MODID, - "textures/entities/Ring.png"); + ResourceLocation texture = new ResourceLocation( + Variables.MODID, "textures/entities/Ring.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, @@ -25,7 +25,8 @@ public class RingRender extends TileEntitySpecialRenderer { GL11.glPushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); if ((float) z != -1) - ring.render(entity, 0F, 0F, 0F, (float) z, f, 1.0F); + ring.render(entity, 0F, 0F, 0F, (float) z, f, + 1.0F); GL11.glPopMatrix(); } } \ No newline at end of file -- cgit v1.2.3