diff options
| author | Lance5057 <Lance5057@gmail.com> | 2015-10-05 00:02:32 -0500 |
|---|---|---|
| committer | Lance5057 <Lance5057@gmail.com> | 2015-10-15 04:54:18 -0500 |
| commit | d67ec64707414df6f78f45ec1710b4ec3fc1ef66 (patch) | |
| tree | 6a926cb12990aa88cb62e8ec099045f5b54fd8b1 | |
| parent | adefc630eb6876c19660c4f51876cc9bf00d78f0 (diff) | |
Refactor and Compartmentalize all the codes!
89 files changed, 443 insertions, 655 deletions
diff --git a/Gimp files/zweihander.xcf b/Gimp files/zweihander.xcf Binary files differnew file mode 100644 index 0000000..d7118c0 --- /dev/null +++ b/Gimp files/zweihander.xcf diff --git a/build.gradle b/build.gradle index 5540d9e..cc2d852 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' version = "1.2.1" -group= "gmail.Lance5057.com" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group= "gmail.lance5057.com" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersdefense" minecraft { diff --git a/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java b/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java deleted file mode 100644 index 793507a..0000000 --- a/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java +++ /dev/null @@ -1,12 +0,0 @@ -package gmail.Lance5057.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class AeonSteelIngot extends Item -{ - public AeonSteelIngot() - { - - } -}
\ No newline at end of file diff --git a/src/main/java/gmail/Lance5057/items/Crest_Feathers.java b/src/main/java/gmail/Lance5057/items/Crest_Feathers.java deleted file mode 100644 index 29b2bbf..0000000 --- a/src/main/java/gmail/Lance5057/items/Crest_Feathers.java +++ /dev/null @@ -1,5 +0,0 @@ -package gmail.Lance5057.items; - -public class Crest_Feathers { - -} diff --git a/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java b/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java deleted file mode 100644 index 539dd08..0000000 --- a/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java +++ /dev/null @@ -1,11 +0,0 @@ -package gmail.Lance5057.items; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class DogbeariumIngot extends Item -{ - public DogbeariumIngot() - { - - } -} diff --git a/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java b/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java deleted file mode 100644 index 74c2708..0000000 --- a/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java +++ /dev/null @@ -1,11 +0,0 @@ -package gmail.Lance5057.items; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class QueensGoldIngot extends Item -{ - public QueensGoldIngot() - { - - } -} diff --git a/src/main/java/gmail/Lance5057/items/RoyalGuard.java b/src/main/java/gmail/Lance5057/items/RoyalGuard.java deleted file mode 100644 index 04bce58..0000000 --- a/src/main/java/gmail/Lance5057/items/RoyalGuard.java +++ /dev/null @@ -1,42 +0,0 @@ -package gmail.Lance5057.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.Weapon; - -import java.util.List; - -public abstract class RoyalGuard extends Weapon { - public RoyalGuard() { - super(10); - } - -@Override -public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { -super.addInformation(stack, player, list, par4); -list.add(EnumChatFormatting.DARK_PURPLE + "Artisan crafted for the royal family"); -} -@Override -public void getSubItems(Item id, CreativeTabs tab, List list) -{ - super.getSubItems(id, tab, list); - - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 2), new ItemStack(getHandleItem(), 1, 6), new ItemStack(getAccessoryItem(), 1, 33), "Royal Guard"); - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - tags.setInteger("Modifiers", 0); - tags.setInteger("Attack", 15); - tags.setInteger("TotalDurability", Integer.MAX_VALUE / 100); - tags.setInteger("BaseDurability", Integer.MAX_VALUE / 100); - tags.setInteger("MiningSpeed", Integer.MAX_VALUE / 100); - tags.setInteger("Unbreaking", 10); - tags.setBoolean("Built", true); - tags.setInteger("Fortune", 450); - list.add(tool); -} -}
\ No newline at end of file diff --git a/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java b/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java deleted file mode 100644 index d834a53..0000000 --- a/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java +++ /dev/null @@ -1,26 +0,0 @@ -package gmail.Lance5057.items.tools; - -import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.*; -import mods.battlegear2.api.IEnchantable; -import mods.battlegear2.api.ISheathed; -import mods.battlegear2.api.shield.IArrowCatcher; -import mods.battlegear2.api.shield.IArrowDisplay; -import mods.battlegear2.api.shield.IShield; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - -public abstract class ArmorCore extends ItemArmor -{ - public ArmorCore(ArmorMaterial par2EnumArmorMaterial, int par3, int par4) { - super(par2EnumArmorMaterial, par3, par4); - } -}
\ No newline at end of file diff --git a/src/main/java/gmail/Lance5057/Reference.java b/src/main/java/lance5057/tDefense/Reference.java index d7e6158..a9d8bf5 100644 --- a/src/main/java/gmail/Lance5057/Reference.java +++ b/src/main/java/lance5057/tDefense/Reference.java @@ -1,4 +1,4 @@ -package gmail.Lance5057; +package lance5057.tDefense; public class Reference { diff --git a/src/main/java/gmail/Lance5057/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java index 73c617b..66e1791 100644 --- a/src/main/java/gmail/Lance5057/TD_Config.java +++ b/src/main/java/lance5057/tDefense/TD_Config.java @@ -1,4 +1,4 @@ -package gmail.Lance5057; +package lance5057.tDefense; import java.util.Vector; diff --git a/src/main/java/gmail/Lance5057/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java index 55dcb82..85a369e 100644 --- a/src/main/java/gmail/Lance5057/TinkersDefense.java +++ b/src/main/java/lance5057/tDefense/TinkersDefense.java @@ -1,45 +1,42 @@ -package gmail.Lance5057; +package lance5057.tDefense; import static net.minecraft.util.EnumChatFormatting.DARK_RED; import static net.minecraft.util.EnumChatFormatting.GOLD; import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE; -import gmail.Lance5057.armor.items.ChainArmor; -import gmail.Lance5057.armor.items.ClothArmor; -import gmail.Lance5057.armor.items.Sheath; -import gmail.Lance5057.armor.items.TinkerArmor; -import gmail.Lance5057.armor.parts.Item_Cloth; -import gmail.Lance5057.armor.parts.Item_Glowthread; -import gmail.Lance5057.armor.parts.Item_Thread; -import gmail.Lance5057.blocks.AeonSteelBlock; -import gmail.Lance5057.blocks.CrestMount; -import gmail.Lance5057.blocks.DogbeariumBlock; -import gmail.Lance5057.blocks.FinishingAnvil; -import gmail.Lance5057.blocks.JewelersBench; -import gmail.Lance5057.blocks.QueensGoldBlock; -import gmail.Lance5057.events.TDEventHandler; -import gmail.Lance5057.items.AeonSteelIngot; -import gmail.Lance5057.items.DogbeariumIngot; -import gmail.Lance5057.items.Injector; -import gmail.Lance5057.items.QueensGoldIngot; -import gmail.Lance5057.items.TD_Patterns; -import gmail.Lance5057.items.tools.HeaterShield; -import gmail.Lance5057.items.tools.RoundShield; -import gmail.Lance5057.items.tools.TinkerWrench; -import gmail.Lance5057.items.tools.TinkerZweihander; -import gmail.Lance5057.liquids.moltenAeonsteelFluid; -import gmail.Lance5057.liquids.moltenDogbeariumFluid; -import gmail.Lance5057.liquids.moltenQueensGoldFluid; -import gmail.Lance5057.modifiers.TDefenseActiveToolMod; -import gmail.Lance5057.modifiers.modifierDaze; -import gmail.Lance5057.modifiers.shields.modifierCrestofBlades; -import gmail.Lance5057.modifiers.shields.modifierCrestofFeathers; -import gmail.Lance5057.modifiers.shields.modifierCrestofLegends; -import gmail.Lance5057.modifiers.shields.modifierCrestofMirrors; -import gmail.Lance5057.network.PacketHandler; -import gmail.Lance5057.proxy.CommonProxy; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; -import gmail.Lance5057.tileentities.TileEntity_JewelersBench; +import lance5057.tDefense.armor.items.ChainArmor; +import lance5057.tDefense.armor.items.ClothArmor; +import lance5057.tDefense.armor.items.Sheath; +import lance5057.tDefense.armor.items.TinkerArmor; +import lance5057.tDefense.armor.parts.Item_Cloth; +import lance5057.tDefense.armor.parts.Item_Glowthread; +import lance5057.tDefense.armor.parts.Item_Thread; +import lance5057.tDefense.blocks.JewelersBench; +import lance5057.tDefense.core.Injector; +import lance5057.tDefense.core.TD_Patterns; +import lance5057.tDefense.core.blocks.AeonSteelBlock; +import lance5057.tDefense.core.blocks.DogbeariumBlock; +import lance5057.tDefense.core.blocks.QueensGoldBlock; +import lance5057.tDefense.core.blocks.crestMount.CrestMount; +import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount; +import lance5057.tDefense.core.events.TDEventHandler; +import lance5057.tDefense.core.liquids.moltenAeonsteelFluid; +import lance5057.tDefense.core.liquids.moltenDogbeariumFluid; +import lance5057.tDefense.core.liquids.moltenQueensGoldFluid; +import lance5057.tDefense.core.network.PacketHandler; +import lance5057.tDefense.core.tools.HeaterShield; +import lance5057.tDefense.core.tools.RoundShield; +import lance5057.tDefense.core.tools.TinkerWrench; +import lance5057.tDefense.core.tools.TinkerZweihander; +import lance5057.tDefense.core.tools.modifiers.TDefenseActiveToolMod; +import lance5057.tDefense.core.tools.modifiers.modifierDaze; +import lance5057.tDefense.core.tools.modifiers.shields.modifierCrestofBlades; +import lance5057.tDefense.core.tools.modifiers.shields.modifierCrestofFeathers; +import lance5057.tDefense.core.tools.modifiers.shields.modifierCrestofLegends; +import lance5057.tDefense.core.tools.modifiers.shields.modifierCrestofMirrors; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.FinishingAnvil; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil; +import lance5057.tDefense.proxy.CommonProxy; +import lance5057.tDefense.tileentities.TileEntity_JewelersBench; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -156,7 +153,7 @@ public class TinkersDefense { public static Injector tcInject; - @SidedProxy(clientSide = "gmail.Lance5057.proxy.ClientProxy", serverSide = "gmail.Lance5057.proxy.CommonProxy") + @SidedProxy(clientSide = "lance5057.tDefense.proxy.ClientProxy", serverSide = "lance5057.tDefense.proxy.CommonProxy") public static CommonProxy proxy; @EventHandler @@ -209,7 +206,7 @@ public class TinkersDefense { GameRegistry.registerItem(item_relic, "Ancient Relic"); // AeonSteel - item_AeonSteelIngot = new AeonSteelIngot().setCreativeTab(tabName) + item_AeonSteelIngot = new Item().setCreativeTab(tabName) .setMaxStackSize(64).setUnlocalizedName("AeonSteelIngot") .setTextureName(Reference.MOD_ID + ":AeonSteelIngot"); @@ -237,7 +234,7 @@ public class TinkersDefense { GameRegistry.registerBlock(moltenAeonsteelBlock, "moltenaeonsteel"); // Queen's Gold - item_QueensGoldIngot = new QueensGoldIngot().setCreativeTab(tabName) + item_QueensGoldIngot = new Item().setCreativeTab(tabName) .setMaxStackSize(64).setUnlocalizedName("QueensGoldIngot") .setTextureName(Reference.MOD_ID + ":QueensGoldIngot"); @@ -267,7 +264,7 @@ public class TinkersDefense { GameRegistry.registerBlock(moltenQueensGoldBlock, "moltenQueensGold"); // Dogbearium - item_DogbeariumIngot = new DogbeariumIngot().setCreativeTab(tabName) + item_DogbeariumIngot = new Item().setCreativeTab(tabName) .setMaxStackSize(64).setUnlocalizedName("DogbeariumIngot") .setTextureName(Reference.MOD_ID + ":DogbeariumIngot"); diff --git a/src/main/java/gmail/Lance5057/armor/items/ChainArmor.java b/src/main/java/lance5057/tDefense/armor/items/ChainArmor.java index 6a5dea9..a2bbd67 100644 --- a/src/main/java/gmail/Lance5057/armor/items/ChainArmor.java +++ b/src/main/java/lance5057/tDefense/armor/items/ChainArmor.java @@ -1,7 +1,6 @@ -package gmail.Lance5057.armor.items; +package lance5057.tDefense.armor.items; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.proxy.ClientProxy; +import lance5057.tDefense.proxy.ClientProxy; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/gmail/Lance5057/armor/items/ClothArmor.java b/src/main/java/lance5057/tDefense/armor/items/ClothArmor.java index 1317a3e..7bd6752 100644 --- a/src/main/java/gmail/Lance5057/armor/items/ClothArmor.java +++ b/src/main/java/lance5057/tDefense/armor/items/ClothArmor.java @@ -1,7 +1,6 @@ -package gmail.Lance5057.armor.items; +package lance5057.tDefense.armor.items; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.proxy.ClientProxy; +import lance5057.tDefense.proxy.ClientProxy; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -33,32 +32,31 @@ public class ClothArmor extends ItemArmor { @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, - ItemStack itemStack, int armorSlot) - { - -// return ClientProxy.chain; + ItemStack itemStack, int armorSlot) { + + // return ClientProxy.chain; ModelBiped armorModel = ClientProxy.chain; if (itemStack != null) { -// if (itemStack.getItem() instanceof TinkerArmor) { -// int type = ((ItemArmor) itemStack.getItem()).armorType; -// if (type == 1 || type == 3) { -// armorModel = TinkersDefense.proxy.getArmorModel(0); -// } else { -// armorModel = TinkersDefense.proxy.getArmorModel(1); -// } -// -// } + // if (itemStack.getItem() instanceof TinkerArmor) { + // int type = ((ItemArmor) itemStack.getItem()).armorType; + // if (type == 1 || type == 3) { + // armorModel = TinkersDefense.proxy.getArmorModel(0); + // } else { + // armorModel = TinkersDefense.proxy.getArmorModel(1); + // } + // + // } if (armorModel != null) { -// armorModel.bipedHead.showModel = armorSlot == 0; -// armorModel.bipedHeadwear.showModel = armorSlot == 0; -// armorModel.bipedBody.showModel = armorSlot == 1 -// || armorSlot == 2; -// armorModel.bipedRightArm.showModel = armorSlot == 1; -// armorModel.bipedLeftArm.showModel = armorSlot == 1; -// armorModel.bipedRightLeg.showModel = armorSlot == 2 -// || armorSlot == 3; -// armorModel.bipedLeftLeg.showModel = armorSlot == 2 -// || armorSlot == 3; + // armorModel.bipedHead.showModel = armorSlot == 0; + // armorModel.bipedHeadwear.showModel = armorSlot == 0; + // armorModel.bipedBody.showModel = armorSlot == 1 + // || armorSlot == 2; + // armorModel.bipedRightArm.showModel = armorSlot == 1; + // armorModel.bipedLeftArm.showModel = armorSlot == 1; + // armorModel.bipedRightLeg.showModel = armorSlot == 2 + // || armorSlot == 3; + // armorModel.bipedLeftLeg.showModel = armorSlot == 2 + // || armorSlot == 3; armorModel.isSneak = entityLiving.isSneaking(); armorModel.isRiding = entityLiving.isRiding(); armorModel.isChild = entityLiving.isChild(); diff --git a/src/main/java/gmail/Lance5057/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java index 9806905..f96d90a 100644 --- a/src/main/java/gmail/Lance5057/armor/items/Sheath.java +++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java @@ -1,7 +1,6 @@ -package gmail.Lance5057.armor.items; +package lance5057.tDefense.armor.items; -import gmail.Lance5057.armor.renderers.ModelSheath; -import gmail.Lance5057.proxy.ClientProxy; +import lance5057.tDefense.armor.renderers.ModelSheath; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gmail/Lance5057/armor/items/TinkerArmor.java b/src/main/java/lance5057/tDefense/armor/items/TinkerArmor.java index 3899023..8660d34 100644 --- a/src/main/java/gmail/Lance5057/armor/items/TinkerArmor.java +++ b/src/main/java/lance5057/tDefense/armor/items/TinkerArmor.java @@ -1,7 +1,6 @@ -package gmail.Lance5057.armor.items; +package lance5057.tDefense.armor.items; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.proxy.ClientProxy; +import lance5057.tDefense.proxy.ClientProxy; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/gmail/Lance5057/armor/parts/Item_Cloth.java b/src/main/java/lance5057/tDefense/armor/parts/Item_Cloth.java index 4090ad8..26f54b1 100644 --- a/src/main/java/gmail/Lance5057/armor/parts/Item_Cloth.java +++ b/src/main/java/lance5057/tDefense/armor/parts/Item_Cloth.java @@ -1,9 +1,8 @@ -package gmail.Lance5057.armor.parts; - -import gmail.Lance5057.TinkersDefense; +package lance5057.tDefense.armor.parts; import java.util.List; +import lance5057.tDefense.TinkersDefense; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/gmail/Lance5057/armor/parts/Item_Glowthread.java b/src/main/java/lance5057/tDefense/armor/parts/Item_Glowthread.java index 91be026..8539c6f 100644 --- a/src/main/java/gmail/Lance5057/armor/parts/Item_Glowthread.java +++ b/src/main/java/lance5057/tDefense/armor/parts/Item_Glowthread.java @@ -1,9 +1,8 @@ -package gmail.Lance5057.armor.parts; - -import gmail.Lance5057.TinkersDefense; +package lance5057.tDefense.armor.parts; import java.util.List; +import lance5057.tDefense.TinkersDefense; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/gmail/Lance5057/armor/parts/Item_Thread.java b/src/main/java/lance5057/tDefense/armor/parts/Item_Thread.java index 434d827..f1bc61c 100644 --- a/src/main/java/gmail/Lance5057/armor/parts/Item_Thread.java +++ b/src/main/java/lance5057/tDefense/armor/parts/Item_Thread.java @@ -1,9 +1,8 @@ -package gmail.Lance5057.armor.parts; - -import gmail.Lance5057.TinkersDefense; +package lance5057.tDefense.armor.parts; import java.util.List; +import lance5057.tDefense.TinkersDefense; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/gmail/Lance5057/armor/renderers/ModelChainArmor.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelChainArmor.java index 5b3fc2a..baca0f1 100644 --- a/src/main/java/gmail/Lance5057/armor/renderers/ModelChainArmor.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelChainArmor.java @@ -1,11 +1,9 @@ -package gmail.Lance5057.armor.renderers; +package lance5057.tDefense.armor.renderers; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import org.lwjgl.opengl.GL11; - public class ModelChainArmor extends ModelBiped { public ModelRenderer Pauldron1R; diff --git a/src/main/java/gmail/Lance5057/armor/renderers/ModelClothArmor.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelClothArmor.java index 3cc043e..fec1dc4 100644 --- a/src/main/java/gmail/Lance5057/armor/renderers/ModelClothArmor.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelClothArmor.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.armor.renderers; +package lance5057.tDefense.armor.renderers; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -47,193 +47,189 @@ public class ModelClothArmor extends ModelBase { public ModelRenderer RightF; public ModelRenderer RightBS; public ModelRenderer RightB; - public ModelRenderer RightBA; public ModelRenderer RightB2; + public ModelRenderer RightBA; public ModelClothArmor() { this.textureWidth = 64; this.textureHeight = 64; - this.TrimRight2 = new ModelRenderer(this, 0, 4); - this.TrimRight2.setRotationPoint(3.0F, -1.5F, -6.0F); - this.TrimRight2.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); - this.setRotateAngle(TrimRight2, 0.0F, 0.0F, 0.7853981633974483F); - this.Top_1 = new ModelRenderer(this, 0, 17); - this.Top_1.setRotationPoint(0.0F, -0.3F, 0.0F); - this.Top_1.addBox(-8.5F, 0.0F, -3.0F, 9, 2, 6, 0.01F); - this.RightB2 = new ModelRenderer(this, 0, 0); - this.RightB2.setRotationPoint(-6.2F, 0.0F, -3.61F); - this.RightB2.addBox(-1.7F, -0.4F, 3.3F, 1, 11, 2, 0.0F); - this.setRotateAngle(RightB2, 0.0F, 1.5707963267948966F, 0.08726646259971647F); - this.Top = new ModelRenderer(this, 0, 0); - this.Top.setRotationPoint(0.5F, 0.0F, 0.0F); - this.Top.addBox(-4.0F, -9.0F, -5.0F, 9, 1, 11, 0.0F); - this.setRotateAngle(Top, 0.0F, 3.141592653589793F, 0.0F); - this.TopLeft = new ModelRenderer(this, 0, 17); - this.TopLeft.setRotationPoint(0.0F, -0.3F, 0.0F); - this.TopLeft.addBox(-8.5F, 0.0F, -3.0F, 9, 2, 6, 0.01F); - this.setRotateAngle(TopLeft, 0.0F, 3.141592653589793F, 0.0F); - this.field_78123_h = new ModelRenderer(this, 0, 16); - this.field_78123_h.setRotationPoint(-1.899999976158142F, 12.0F, 0.10000000149011612F); - this.field_78123_h.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F); - this.TrimLeft3 = new ModelRenderer(this, 0, 0); - this.TrimLeft3.setRotationPoint(-2.3F, 0.0F, -5.5F); - this.TrimLeft3.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); - this.setRotateAngle(TrimLeft3, 0.009773843811168246F, 3.141592653589793F, 0.7853981633974483F); - this.ArmRight = new ModelRenderer(this, 32, 25); - this.ArmRight.setRotationPoint(-3.5F, 0.0F, 0.0F); - this.ArmRight.addBox(0.0F, 0.0F, -2.5F, 5, 11, 5, 0.01F); - this.setRotateAngle(ArmRight, 0.0F, 3.141592653589793F, 0.0F); - this.TrimRight3 = new ModelRenderer(this, 0, 0); - this.TrimRight3.setRotationPoint(3.7F, 0.0F, -5.5F); - this.TrimRight3.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); - this.setRotateAngle(TrimRight3, 0.0F, 3.141592653589793F, 0.7853981633974483F); - this.Left = new ModelRenderer(this, 40, 0); - this.Left.mirror = true; - this.Left.setRotationPoint(-0.5F, -0.3F, 0.0F); - this.Left.addBox(4.0F, -8.3F, -5.0F, 1, 7, 11, 0.0F); - this.setRotateAngle(Left, 0.0F, 3.141592653589793F, 0.08726646259971647F); - this.Right = new ModelRenderer(this, 40, 0); - this.Right.setRotationPoint(0.5F, -0.3F, 0.0F); - this.Right.addBox(-5.0F, -8.3F, -5.0F, 1, 7, 11, 0.0F); - this.setRotateAngle(Right, 0.0F, 3.141592653589793F, -0.08726646259971647F); - this.LeftB2 = new ModelRenderer(this, 0, 0); + this.LeftB2 = new ModelRenderer(this, 34, 51); this.LeftB2.setRotationPoint(-3.0F, -0.1F, 3.61F); this.LeftB2.addBox(-1.7F, 0.0F, -2.0F, 1, 11, 2, 0.0F); this.setRotateAngle(LeftB2, 0.0F, 4.71238898038469F, 0.08726646259971647F); - this.field_78124_i = new ModelRenderer(this, 0, 16); - this.field_78124_i.mirror = true; - this.field_78124_i.setRotationPoint(1.899999976158142F, 12.0F, 0.10000000149011612F); - this.field_78124_i.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F); this.Button = new ModelRenderer(this, 0, 0); this.Button.setRotationPoint(0.0F, 0.0F, -3.5F); this.Button.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); this.setRotateAngle(Button, 0.0F, 0.0F, 0.7853981633974483F); - this.LeftFS = new ModelRenderer(this, 0, 0); + this.Right = new ModelRenderer(this, 0, 46); + this.Right.setRotationPoint(0.5F, -0.3F, 0.0F); + this.Right.addBox(-5.0F, -8.3F, -5.0F, 1, 7, 11, 0.0F); + this.setRotateAngle(Right, 0.0F, 3.141592653589793F, -0.08726646259971647F); + this.RightBS = new ModelRenderer(this, 34, 51); + this.RightBS.setRotationPoint(-3.1F, -0.2F, -3.6F); + this.RightBS.addBox(-0.1F, 0.2F, 1.9F, 1, 11, 2, 0.0F); + this.setRotateAngle(RightBS, 0.0F, 0.7853981633974483F, 0.0F); + this.TrimLeft3 = new ModelRenderer(this, 0, 0); + this.TrimLeft3.setRotationPoint(-2.3F, 0.0F, -5.5F); + this.TrimLeft3.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(TrimLeft3, 0.009773843811168246F, 3.141592653589793F, 0.7853981633974483F); + this.LeftBS = new ModelRenderer(this, 33, 51); + this.LeftBS.setRotationPoint(1.0F, 0.0F, 3.6F); + this.LeftBS.addBox(-1.5F, 0.0F, -2.5F, 1, 11, 2, 0.0F); + this.setRotateAngle(LeftBS, 0.0F, -0.7853981633974483F, 0.0F); + this.LeftB = new ModelRenderer(this, 34, 50); + this.LeftB.setRotationPoint(-2.0F, 0.0F, 3.6F); + this.LeftB.addBox(-1.7F, 0.0F, -3.0F, 1, 11, 3, 0.0F); + this.setRotateAngle(LeftB, 0.0F, 4.71238898038469F, 0.0F); + this.ShawlRight1 = new ModelRenderer(this, 40, 0); + this.ShawlRight1.mirror = true; + this.ShawlRight1.setRotationPoint(-0.6F, 1.4F, 0.0F); + this.ShawlRight1.addBox(0.0F, 0.0F, -3.0F, 6, 5, 6, 0.0F); + this.setRotateAngle(ShawlRight1, 0.0F, 0.0F, -0.2792526803190927F); + this.field_78124_i = new ModelRenderer(this, 48, 30); + this.field_78124_i.mirror = true; + this.field_78124_i.setRotationPoint(1.9F, 12.0F, 0.1F); + this.field_78124_i.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F); + this.Back = new ModelRenderer(this, 46, 40); + this.Back.setRotationPoint(0.0F, 1.2F, 2.02F); + this.Back.addBox(-4.0F, 0.0F, 0.0F, 8, 5, 1, 0.0F); + this.TopLeft = new ModelRenderer(this, 0, 17); + this.TopLeft.setRotationPoint(0.0F, -0.3F, 0.0F); + this.TopLeft.addBox(-8.5F, 0.0F, -3.0F, 9, 2, 6, 0.1F); + this.setRotateAngle(TopLeft, 0.0F, 3.141592653589793F, 0.0F); + this.ShawlLeft1 = new ModelRenderer(this, 40, 0); + this.ShawlLeft1.setRotationPoint(-0.6F, 1.4F, 0.0F); + this.ShawlLeft1.addBox(0.0F, 0.0F, -3.0F, 6, 5, 6, 0.0F); + this.setRotateAngle(ShawlLeft1, 0.0F, 0.0F, -0.2792526803190927F); + this.RightF = new ModelRenderer(this, 32, 50); + this.RightF.setRotationPoint(-4.1F, 0.0F, 1.9F); + this.RightF.addBox(0.0F, 0.0F, -3.0F, 1, 11, 3, 0.0F); + this.setRotateAngle(RightF, 0.0F, -1.5707963267948966F, 0.0F); + this.Chest = new ModelRenderer(this, 0, 0); + this.Chest.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Chest.addBox(-4.5F, 0.0F, -2.5F, 9, 12, 5, 0.0F); + this.LeftFS = new ModelRenderer(this, 36, 51); this.LeftFS.setRotationPoint(-1.8F, 0.0F, -2.9F); this.LeftFS.addBox(1.0F, 0.0F, 2.0F, 1, 11, 2, 0.0F); this.setRotateAngle(LeftFS, 0.0F, 0.7853981633974483F, 0.0F); - this.Collar = new ModelRenderer(this, 0, 12); + this.Collar = new ModelRenderer(this, 0, 33); this.Collar.setRotationPoint(0.0F, 0.0F, 0.0F); this.Collar.addBox(-5.5F, -1.0F, -5.5F, 11, 2, 11, 0.0F); this.setRotateAngle(Collar, 0.0F, 3.141592653589793F, 0.0F); - this.Back = new ModelRenderer(this, 8, 37); - this.Back.setRotationPoint(0.0F, 1.2F, 2.02F); - this.Back.addBox(-4.0F, 0.0F, 0.0F, 8, 5, 1, 0.0F); - this.RightFront = new ModelRenderer(this, 0, 0); - this.RightFront.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.RightFront.addBox(1.4F, 0.0F, -1.5F, 1, 11, 3, 0.0F); + this.Top_1 = new ModelRenderer(this, 0, 17); + this.Top_1.setRotationPoint(0.0F, -0.3F, 0.0F); + this.Top_1.addBox(-8.5F, 0.0F, -3.0F, 9, 2, 6, 0.01F); + this.Left = new ModelRenderer(this, 0, 46); + this.Left.mirror = true; + this.Left.setRotationPoint(-0.5F, -0.3F, 0.0F); + this.Left.addBox(4.0F, -8.3F, -5.0F, 1, 7, 11, 0.0F); + this.setRotateAngle(Left, 0.0F, 3.141592653589793F, 0.08726646259971647F); + this.RightFront = new ModelRenderer(this, 31, 50); + this.RightFront.setRotationPoint(-4.1F, 12.0F, 0.0F); + this.RightFront.addBox(-0.7F, 0.0F, -1.5F, 1, 11, 3, 0.0F); this.setRotateAngle(RightFront, 0.0F, 3.141592653589793F, 0.08726646259971647F); - this.ShawlRight1 = new ModelRenderer(this, 32, 0); - this.ShawlRight1.mirror = true; - this.ShawlRight1.setRotationPoint(-0.6F, 1.3F, 0.0F); - this.ShawlRight1.addBox(0.0F, 0.0F, -3.0F, 6, 5, 6, 0.0F); - this.setRotateAngle(ShawlRight1, 0.0F, 0.0F, -0.2792526803190927F); - this.LeftF = new ModelRenderer(this, 0, 0); - this.LeftF.setRotationPoint(-4.1F, 0.0F, -1.9F); - this.LeftF.addBox(0.0F, 0.0F, 2.1F, 1, 11, 3, 0.0F); - this.setRotateAngle(LeftF, 0.0F, 1.5707963267948966F, 0.0F); - this.LeftB = new ModelRenderer(this, 0, 0); - this.LeftB.setRotationPoint(-2.0F, 0.0F, 3.6F); - this.LeftB.addBox(-1.7F, 0.0F, -3.0F, 1, 11, 3, 0.0F); - this.setRotateAngle(LeftB, 0.0F, 4.71238898038469F, 0.0F); - this.LeftBS = new ModelRenderer(this, 0, 0); - this.LeftBS.setRotationPoint(1.0F, 0.0F, 3.6F); - this.LeftBS.addBox(-1.5F, 0.0F, -2.5F, 1, 11, 2, 0.0F); - this.setRotateAngle(LeftBS, 0.0F, -0.7853981633974483F, 0.0F); - this.RightB = new ModelRenderer(this, 0, 0); - this.RightB.setRotationPoint(-6.1F, -0.2F, -3.6F); - this.RightB.addBox(-1.7F, 0.2F, 4.1F, 1, 11, 3, 0.0F); - this.setRotateAngle(RightB, 0.0F, 1.5707963267948966F, 0.0F); - this.TrimLeft4 = new ModelRenderer(this, 40, 0); + this.TrimLeft2 = new ModelRenderer(this, 0, 33); + this.TrimLeft2.setRotationPoint(-3.0F, -1.5F, -6.0F); + this.TrimLeft2.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(TrimLeft2, 0.0F, 0.0F, 0.7853981633974483F); + this.TrimLeft4 = new ModelRenderer(this, 0, 46); this.TrimLeft4.setRotationPoint(5.3F, -2.0F, 5.0F); this.TrimLeft4.addBox(0.0F, 0.0F, 0.0F, 1, 2, 11, 0.0F); this.setRotateAngle(TrimLeft4, 0.0F, 3.141592653589793F, 0.5235987755982988F); - this.RightF = new ModelRenderer(this, 0, 0); - this.RightF.setRotationPoint(-4.1F, 0.0F, 1.9F); - this.RightF.addBox(0.1F, 0.0F, -5.1F, 1, 11, 3, 0.0F); - this.setRotateAngle(RightF, 0.0F, -1.5707963267948966F, 0.0F); - this.ShawlLeft1 = new ModelRenderer(this, 32, 0); - this.ShawlLeft1.setRotationPoint(-0.6F, 1.3F, 0.0F); - this.ShawlLeft1.addBox(0.0F, 0.0F, -3.0F, 6, 5, 6, 0.0F); - this.setRotateAngle(ShawlLeft1, 0.0F, 0.0F, -0.2792526803190927F); - this.ShawlRight2 = new ModelRenderer(this, 0, 34); + this.LeftF = new ModelRenderer(this, 32, 50); + this.LeftF.setRotationPoint(-4.1F, 0.0F, -1.9F); + this.LeftF.addBox(0.0F, 0.0F, 2.1F, 1, 11, 3, 0.0F); + this.setRotateAngle(LeftF, 0.0F, 1.5707963267948966F, 0.0F); + this.TrimRight2 = new ModelRenderer(this, 0, 33); + this.TrimRight2.setRotationPoint(3.0F, -1.5F, -6.0F); + this.TrimRight2.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(TrimRight2, 0.0F, 0.0F, 0.7853981633974483F); + this.ShawlRight2 = new ModelRenderer(this, 42, 11); this.ShawlRight2.mirror = true; this.ShawlRight2.setRotationPoint(-2.5F, -1.8F, -0.1F); this.ShawlRight2.addBox(1.0F, -1.0F, -2.0F, 6, 3, 5, 0.0F); this.setRotateAngle(ShawlRight2, 0.0F, 0.0F, 0.9424777960769379F); - this.TrimLeft2 = new ModelRenderer(this, 0, 4); - this.TrimLeft2.setRotationPoint(-3.0F, -1.5F, -6.0F); - this.TrimLeft2.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); - this.setRotateAngle(TrimLeft2, 0.0F, 0.0F, 0.7853981633974483F); - this.LeftFront = new ModelRenderer(this, 0, 0); - this.LeftFront.setRotationPoint(1.9F, 12.0F, 0.0F); + this.LeftFront = new ModelRenderer(this, 33, 50); + this.LeftFront.setRotationPoint(2.1F, 12.0F, 0.0F); this.LeftFront.addBox(1.4F, 0.0F, -1.5F, 1, 11, 3, 0.0F); this.setRotateAngle(LeftFront, 0.0F, 0.0F, -0.08726646259971647F); - this.TrimRight4 = new ModelRenderer(this, 40, 0); + this.LeftBA = new ModelRenderer(this, 35, 48); + this.LeftBA.setRotationPoint(-2.9F, -0.1F, 3.91F); + this.LeftBA.addBox(0.3F, 0.0F, -6.0F, 1, 11, 5, 0.0F); + this.setRotateAngle(LeftBA, 0.0F, 0.4363323129985824F, 0.08726646259971647F); + this.field_78123_h = new ModelRenderer(this, 48, 30); + this.field_78123_h.setRotationPoint(-1.9F, 12.0F, 0.1F); + this.field_78123_h.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F); + this.TrimRight4 = new ModelRenderer(this, 0, 46); this.TrimRight4.mirror = true; this.TrimRight4.setRotationPoint(-4.5F, -2.5F, 5.0F); this.TrimRight4.addBox(0.0F, 0.0F, 0.0F, 1, 2, 11, 0.0F); this.setRotateAngle(TrimRight4, 0.0F, 3.141592653589793F, -0.5235987755982988F); - this.ShawlLeft2 = new ModelRenderer(this, 0, 34); + this.Flop = new ModelRenderer(this, 2, 0); + this.Flop.setRotationPoint(0.0F, -7.0F, 8.5F); + this.Flop.addBox(-4.0F, 0.0F, 0.0F, 8, 7, 4, 0.0F); + this.setRotateAngle(Flop, 0.5235987755982988F, 3.141592653589793F, 0.0F); + this.RightB = new ModelRenderer(this, 34, 50); + this.RightB.setRotationPoint(-6.1F, -0.2F, -3.6F); + this.RightB.addBox(-1.7F, 0.1F, 2.0F, 1, 11, 3, 0.0F); + this.setRotateAngle(RightB, 0.0F, 1.5707963267948966F, 0.0F); + this.RightB2 = new ModelRenderer(this, 33, 51); + this.RightB2.setRotationPoint(-6.2F, 0.0F, -3.61F); + this.RightB2.addBox(-1.7F, -0.3F, 1.2F, 1, 11, 2, 0.0F); + this.setRotateAngle(RightB2, 0.0F, 1.5707963267948966F, 0.08726646259971647F); + this.RightBA = new ModelRenderer(this, 33, 48); + this.RightBA.setRotationPoint(-6.9F, -0.3F, -3.61F); + this.RightBA.addBox(-3.1F, 0.0F, -4.6F, 1, 11, 5, 0.0F); + this.setRotateAngle(RightBA, 0.0F, 2.6179938779914944F, 0.08726646259971647F); + this.TrimRight3 = new ModelRenderer(this, 0, 0); + this.TrimRight3.setRotationPoint(3.7F, 0.0F, -5.5F); + this.TrimRight3.addBox(0.0F, 0.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(TrimRight3, 0.0F, 3.141592653589793F, 0.7853981633974483F); + this.Belt = new ModelRenderer(this, 0, 37); + this.Belt.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Belt.addBox(-6.8F, 10.0F, -3.0F, 10, 3, 6, 0.0F); + this.setRotateAngle(Belt, 0.0F, 0.0F, -0.13962634015954636F); + this.ShawlLeft2 = new ModelRenderer(this, 42, 11); this.ShawlLeft2.mirror = true; this.ShawlLeft2.setRotationPoint(-2.5F, -1.8F, 0.1F); this.ShawlLeft2.addBox(1.0F, -1.0F, -3.0F, 6, 3, 5, 0.0F); this.setRotateAngle(ShawlLeft2, 0.0F, 0.0F, 0.9424777960769379F); - this.RightBA = new ModelRenderer(this, 0, 0); - this.RightBA.setRotationPoint(-5.8F, -0.4F, -3.61F); - this.RightBA.addBox(-3.9F, 0.0F, -4.1F, 1, 11, 5, 0.0F); - this.setRotateAngle(RightBA, 0.0F, 2.6179938779914944F, 0.08726646259971647F); - this.LeftBA = new ModelRenderer(this, 0, 0); - this.LeftBA.setRotationPoint(-2.9F, -0.1F, 3.91F); - this.LeftBA.addBox(0.3F, 0.0F, -6.0F, 1, 11, 5, 0.0F); - this.setRotateAngle(LeftBA, 0.0F, 0.4363323129985824F, 0.08726646259971647F); - this.RightFS = new ModelRenderer(this, 0, 0); - this.RightFS.setRotationPoint(-1.9F, 0.0F, 2.9F); - this.RightFS.addBox(1.1F, 0.0F, -4.0F, 1, 11, 2, 0.0F); + this.RightFS = new ModelRenderer(this, 35, 51); + this.RightFS.setRotationPoint(-1.8F, 0.0F, 2.9F); + this.RightFS.addBox(-0.5F, 0.0F, -2.5F, 1, 11, 2, 0.0F); this.setRotateAngle(RightFS, 0.0F, -0.7853981633974483F, 0.0F); - this.ArmLeft = new ModelRenderer(this, 32, 25); + this.ArmLeft = new ModelRenderer(this, 44, 30); this.ArmLeft.setRotationPoint(3.5F, -0.0F, 0.0F); - this.ArmLeft.addBox(0.0F, 0.0F, -2.5F, 5, 11, 5, 0.01F); - this.RightBS = new ModelRenderer(this, 0, 0); - this.RightBS.setRotationPoint(-3.1F, -0.2F, -3.6F); - this.RightBS.addBox(1.4F, 0.2F, 3.4F, 1, 11, 2, 0.0F); - this.setRotateAngle(RightBS, 0.0F, 0.7853981633974483F, 0.0F); - this.Flop = new ModelRenderer(this, 18, 25); - this.Flop.setRotationPoint(0.0F, -7.0F, 8.5F); - this.Flop.addBox(-4.0F, 0.0F, 0.0F, 8, 7, 4, 0.0F); - this.setRotateAngle(Flop, 0.5235987755982988F, 3.141592653589793F, 0.0F); - this.Belt = new ModelRenderer(this, 0, 25); - this.Belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.Belt.addBox(-6.8F, 10.0F, -3.0F, 10, 3, 6, 0.01F); - this.setRotateAngle(Belt, 0.0F, 0.0F, -0.13962634015954636F); - this.Chest = new ModelRenderer(this, 0, 0); - this.Chest.setRotationPoint(0.0F, 0.0F, 0.0F); - this.Chest.addBox(-4.5F, 0.0F, -2.5F, 9, 12, 5, 0.0F); - this.RightFront.addChild(this.RightB2); + this.ArmLeft.addBox(0.0F, 0.0F, -2.5F, 5, 11, 5, 0.0F); + this.Top = new ModelRenderer(this, 24, 52); + this.Top.setRotationPoint(-0.5F, 0.0F, -1.0F); + this.Top.addBox(-4.0F, -9.0F, -5.0F, 9, 1, 11, 0.0F); + this.ArmRight = new ModelRenderer(this, 44, 30); + this.ArmRight.setRotationPoint(-3.5F, 0.0F, 0.0F); + this.ArmRight.addBox(0.0F, 0.0F, -2.5F, 5, 11, 5, 0.0F); + this.setRotateAngle(ArmRight, 0.0F, 3.141592653589793F, 0.0F); this.LeftFront.addChild(this.LeftB2); - this.LeftFront.addChild(this.LeftFS); - this.ArmRight.addChild(this.ShawlRight1); - this.LeftFront.addChild(this.LeftF); - this.LeftFront.addChild(this.LeftB); + this.RightFront.addChild(this.RightBS); this.LeftFront.addChild(this.LeftBS); - this.RightFront.addChild(this.RightB); - this.RightFront.addChild(this.RightF); + this.LeftFront.addChild(this.LeftB); + this.ArmRight.addChild(this.ShawlRight1); this.ArmLeft.addChild(this.ShawlLeft1); + this.RightFront.addChild(this.RightF); + this.LeftFront.addChild(this.LeftFS); + this.LeftFront.addChild(this.LeftF); this.ShawlRight1.addChild(this.ShawlRight2); - this.ShawlLeft1.addChild(this.ShawlLeft2); - this.RightFront.addChild(this.RightBA); this.LeftFront.addChild(this.LeftBA); + this.RightFront.addChild(this.RightB); + this.RightFront.addChild(this.RightB2); + this.RightFront.addChild(this.RightBA); + this.ShawlLeft1.addChild(this.ShawlLeft2); this.RightFront.addChild(this.RightFS); - this.RightFront.addChild(this.RightBS); } @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - this.TrimRight2.render(f5); - this.Top_1.render(f5); - this.Top.render(f5); - this.TopLeft.render(f5); - this.field_78123_h.render(f5); + this.Button.render(f5); + this.Right.render(f5); GL11.glPushMatrix(); GL11.glTranslatef(this.TrimLeft3.offsetX, this.TrimLeft3.offsetY, this.TrimLeft3.offsetZ); GL11.glTranslatef(this.TrimLeft3.rotationPointX * f5, this.TrimLeft3.rotationPointY * f5, this.TrimLeft3.rotationPointZ * f5); @@ -242,27 +238,20 @@ public class ModelClothArmor extends ModelBase { GL11.glTranslatef(-this.TrimLeft3.rotationPointX * f5, -this.TrimLeft3.rotationPointY * f5, -this.TrimLeft3.rotationPointZ * f5); this.TrimLeft3.render(f5); GL11.glPopMatrix(); - this.ArmRight.render(f5); - GL11.glPushMatrix(); - GL11.glTranslatef(this.TrimRight3.offsetX, this.TrimRight3.offsetY, this.TrimRight3.offsetZ); - GL11.glTranslatef(this.TrimRight3.rotationPointX * f5, this.TrimRight3.rotationPointY * f5, this.TrimRight3.rotationPointZ * f5); - GL11.glScaled(0.5D, 0.5D, 1.0D); - GL11.glTranslatef(-this.TrimRight3.offsetX, -this.TrimRight3.offsetY, -this.TrimRight3.offsetZ); - GL11.glTranslatef(-this.TrimRight3.rotationPointX * f5, -this.TrimRight3.rotationPointY * f5, -this.TrimRight3.rotationPointZ * f5); - this.TrimRight3.render(f5); - GL11.glPopMatrix(); - this.Left.render(f5); - this.Right.render(f5); this.field_78124_i.render(f5); - this.Button.render(f5); - this.Collar.render(f5); this.Back.render(f5); + this.TopLeft.render(f5); + this.Chest.render(f5); + this.Collar.render(f5); + this.Top_1.render(f5); + this.Left.render(f5); this.RightFront.render(f5); - this.TrimLeft4.render(f5); this.TrimLeft2.render(f5); + this.TrimLeft4.render(f5); + this.TrimRight2.render(f5); this.LeftFront.render(f5); + this.field_78123_h.render(f5); this.TrimRight4.render(f5); - this.ArmLeft.render(f5); GL11.glPushMatrix(); GL11.glTranslatef(this.Flop.offsetX, this.Flop.offsetY, this.Flop.offsetZ); GL11.glTranslatef(this.Flop.rotationPointX * f5, this.Flop.rotationPointY * f5, this.Flop.rotationPointZ * f5); @@ -271,8 +260,18 @@ public class ModelClothArmor extends ModelBase { GL11.glTranslatef(-this.Flop.rotationPointX * f5, -this.Flop.rotationPointY * f5, -this.Flop.rotationPointZ * f5); this.Flop.render(f5); GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslatef(this.TrimRight3.offsetX, this.TrimRight3.offsetY, this.TrimRight3.offsetZ); + GL11.glTranslatef(this.TrimRight3.rotationPointX * f5, this.TrimRight3.rotationPointY * f5, this.TrimRight3.rotationPointZ * f5); + GL11.glScaled(0.5D, 0.5D, 1.0D); + GL11.glTranslatef(-this.TrimRight3.offsetX, -this.TrimRight3.offsetY, -this.TrimRight3.offsetZ); + GL11.glTranslatef(-this.TrimRight3.rotationPointX * f5, -this.TrimRight3.rotationPointY * f5, -this.TrimRight3.rotationPointZ * f5); + this.TrimRight3.render(f5); + GL11.glPopMatrix(); this.Belt.render(f5); - this.Chest.render(f5); + this.ArmLeft.render(f5); + this.Top.render(f5); + this.ArmRight.render(f5); } /** diff --git a/src/main/java/gmail/Lance5057/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java index 0f86778..ba2b101 100644 --- a/src/main/java/gmail/Lance5057/armor/renderers/ModelSheath.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java @@ -1,6 +1,6 @@ -package gmail.Lance5057.armor.renderers; +package lance5057.tDefense.armor.renderers; -import gmail.Lance5057.TinkersDefense; +import lance5057.tDefense.TinkersDefense; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/gmail/Lance5057/armor/renderers/ModelTinkerArmor.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkerArmor.java index d97d7fb..d8d17d1 100644 --- a/src/main/java/gmail/Lance5057/armor/renderers/ModelTinkerArmor.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkerArmor.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package gmail.Lance5057.armor.renderers; +package lance5057.tDefense.armor.renderers; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/gmail/Lance5057/blocks/JewelersBench.java b/src/main/java/lance5057/tDefense/blocks/JewelersBench.java index 8f7580c..e224675 100644 --- a/src/main/java/gmail/Lance5057/blocks/JewelersBench.java +++ b/src/main/java/lance5057/tDefense/blocks/JewelersBench.java @@ -1,14 +1,14 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gmail.Lance5057.tileentities.TileEntity_JewelersBench; +import lance5057.tDefense.tileentities.TileEntity_JewelersBench; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class JewelersBench extends Block implements ITileEntityProvider { diff --git a/src/main/java/gmail/Lance5057/items/Injector.java b/src/main/java/lance5057/tDefense/core/Injector.java index c1e5eb9..8510fd4 100644 --- a/src/main/java/gmail/Lance5057/items/Injector.java +++ b/src/main/java/lance5057/tDefense/core/Injector.java @@ -1,22 +1,18 @@ -package gmail.Lance5057.items; +package lance5057.tDefense.core; -import gmail.Lance5057.TinkersDefense; - -import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.crafting.PatternBuilder.MaterialSet; -import tconstruct.library.tools.ToolCore; -import tconstruct.tools.TinkerTools; +import lance5057.tDefense.TinkersDefense; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.PatternBuilder.MaterialSet; +import tconstruct.library.tools.ToolCore; +import tconstruct.tools.TinkerTools; public class Injector extends ToolCore { diff --git a/src/main/java/gmail/Lance5057/items/TD_Patterns.java b/src/main/java/lance5057/tDefense/core/TD_Patterns.java index 938cf02..7b33e18 100644 --- a/src/main/java/gmail/Lance5057/items/TD_Patterns.java +++ b/src/main/java/lance5057/tDefense/core/TD_Patterns.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.items; +package lance5057.tDefense.core; import java.util.List; diff --git a/src/main/java/gmail/Lance5057/blocks/AeonSteelBlock.java b/src/main/java/lance5057/tDefense/core/blocks/AeonSteelBlock.java index 259132a..7b1349e 100644 --- a/src/main/java/gmail/Lance5057/blocks/AeonSteelBlock.java +++ b/src/main/java/lance5057/tDefense/core/blocks/AeonSteelBlock.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.core.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/gmail/Lance5057/blocks/DogbeariumBlock.java b/src/main/java/lance5057/tDefense/core/blocks/DogbeariumBlock.java index b7f5c79..af88f38 100644 --- a/src/main/java/gmail/Lance5057/blocks/DogbeariumBlock.java +++ b/src/main/java/lance5057/tDefense/core/blocks/DogbeariumBlock.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.core.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/gmail/Lance5057/blocks/QueensGoldBlock.java b/src/main/java/lance5057/tDefense/core/blocks/QueensGoldBlock.java index 0ad2376..fea9ed2 100644 --- a/src/main/java/gmail/Lance5057/blocks/QueensGoldBlock.java +++ b/src/main/java/lance5057/tDefense/core/blocks/QueensGoldBlock.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.core.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java index 4cdeb42..d4b55dc 100644 --- a/src/main/java/gmail/Lance5057/containers/Container_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java @@ -1,6 +1,5 @@ -package gmail.Lance5057.containers; +package lance5057.tDefense.core.blocks.crestMount; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/gmail/Lance5057/blocks/CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java index d1561ec..fa09b53 100644 --- a/src/main/java/gmail/Lance5057/blocks/CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java @@ -1,16 +1,13 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.core.blocks.crestMount; import static net.minecraftforge.common.util.ForgeDirection.EAST; import static net.minecraftforge.common.util.ForgeDirection.NORTH; import static net.minecraftforge.common.util.ForgeDirection.SOUTH; import static net.minecraftforge.common.util.ForgeDirection.WEST; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import lance5057.tDefense.TinkersDefense; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +18,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class CrestMount extends BlockContainer { public CrestMount() { diff --git a/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java index cbd3b8d..efb6f82 100644 --- a/src/main/java/gmail/Lance5057/gui/Gui_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java @@ -1,25 +1,13 @@ -package gmail.Lance5057.gui; - -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.containers.Container_CrestMount; -import gmail.Lance5057.network.Message_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; - -import javax.swing.plaf.basic.BasicComboBoxUI.KeyHandler; +package lance5057.tDefense.core.blocks.crestMount; +import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.core.network.Message_CrestMount; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; public class Gui_CrestMount extends GuiContainer { diff --git a/src/main/java/gmail/Lance5057/models/ModelCrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java index 8134ee2..b077a75 100644 --- a/src/main/java/gmail/Lance5057/models/ModelCrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package gmail.Lance5057.models; +package lance5057.tDefense.core.blocks.crestMount; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/gmail/Lance5057/models/Renderer_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java index d32d637..f146c36 100644 --- a/src/main/java/gmail/Lance5057/models/Renderer_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java @@ -1,20 +1,13 @@ -package gmail.Lance5057.models; +package lance5057.tDefense.core.blocks.crestMount; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java index ad1ab70..1a90b3e 100644 --- a/src/main/java/gmail/Lance5057/tileentities/TileEntity_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.tileentities; +package lance5057.tDefense.core.blocks.crestMount; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/gmail/Lance5057/events/TDEventHandler.java b/src/main/java/lance5057/tDefense/core/events/TDEventHandler.java index bd46ed9..8b7a845 100644 --- a/src/main/java/gmail/Lance5057/events/TDEventHandler.java +++ b/src/main/java/lance5057/tDefense/core/events/TDEventHandler.java @@ -1,18 +1,15 @@ -package gmail.Lance5057.events; +package lance5057.tDefense.core.events; +import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.entity.projectile.EntityLargeFireball; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; import net.minecraft.util.Vec3; import net.minecraftforge.common.MinecraftForge; -import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TDEventHandler { diff --git a/src/main/java/gmail/Lance5057/liquids/moltenAeonsteelFluid.java b/src/main/java/lance5057/tDefense/core/liquids/moltenAeonsteelFluid.java index 650426e..450e4b8 100644 --- a/src/main/java/gmail/Lance5057/liquids/moltenAeonsteelFluid.java +++ b/src/main/java/lance5057/tDefense/core/liquids/moltenAeonsteelFluid.java @@ -1,14 +1,12 @@ -package gmail.Lance5057.liquids; +package lance5057.tDefense.core.liquids; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.Locale; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class moltenAeonsteelFluid extends BlockFluidClassic diff --git a/src/main/java/gmail/Lance5057/liquids/moltenDogbeariumFluid.java b/src/main/java/lance5057/tDefense/core/liquids/moltenDogbeariumFluid.java index d23b24b..ee82745 100644 --- a/src/main/java/gmail/Lance5057/liquids/moltenDogbeariumFluid.java +++ b/src/main/java/lance5057/tDefense/core/liquids/moltenDogbeariumFluid.java @@ -1,14 +1,12 @@ -package gmail.Lance5057.liquids; +package lance5057.tDefense.core.liquids; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.Locale; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class moltenDogbeariumFluid extends BlockFluidClassic diff --git a/src/main/java/gmail/Lance5057/liquids/moltenQueensGoldFluid.java b/src/main/java/lance5057/tDefense/core/liquids/moltenQueensGoldFluid.java index 972761d..f1ba268 100644 --- a/src/main/java/gmail/Lance5057/liquids/moltenQueensGoldFluid.java +++ b/src/main/java/lance5057/tDefense/core/liquids/moltenQueensGoldFluid.java @@ -1,14 +1,12 @@ -package gmail.Lance5057.liquids; +package lance5057.tDefense.core.liquids; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import java.util.Locale; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class moltenQueensGoldFluid extends BlockFluidClassic diff --git a/src/main/java/gmail/Lance5057/network/Handler_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java index fa1a89c..9e4a469 100644 --- a/src/main/java/gmail/Lance5057/network/Handler_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java @@ -1,9 +1,6 @@ -package gmail.Lance5057.network; +package lance5057.tDefense.core.network; -import ibxm.Player; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/gmail/Lance5057/network/Handler_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java index 125a514..4a7d7f1 100644 --- a/src/main/java/gmail/Lance5057/network/Handler_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java @@ -1,9 +1,6 @@ -package gmail.Lance5057.network; +package lance5057.tDefense.core.network; -import ibxm.Player; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/gmail/Lance5057/network/Message_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java index 66328aa..0a2ebb3 100644 --- a/src/main/java/gmail/Lance5057/network/Message_CrestMount.java +++ b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java @@ -1,12 +1,7 @@ -package gmail.Lance5057.network; +package lance5057.tDefense.core.network; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; public class Message_CrestMount implements IMessage { diff --git a/src/main/java/gmail/Lance5057/network/Message_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java index 1145f13..7065e07 100644 --- a/src/main/java/gmail/Lance5057/network/Message_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java @@ -1,15 +1,9 @@ -package gmail.Lance5057.network; +package lance5057.tDefense.core.network; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; -import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; public class Message_FinishingAnvil implements IMessage { diff --git a/src/main/java/gmail/Lance5057/network/PacketHandler.java b/src/main/java/lance5057/tDefense/core/network/PacketHandler.java index ebf860a..750fa3e 100644 --- a/src/main/java/gmail/Lance5057/network/PacketHandler.java +++ b/src/main/java/lance5057/tDefense/core/network/PacketHandler.java @@ -1,6 +1,6 @@ -package gmail.Lance5057.network; +package lance5057.tDefense.core.network; -import gmail.Lance5057.TinkersDefense; +import lance5057.tDefense.TinkersDefense; import cpw.mods.fml.relauncher.Side; public class PacketHandler { diff --git a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java index 94f3e2d..e35ba7c 100644 --- a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java +++ b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java @@ -1,27 +1,16 @@ -package gmail.Lance5057.items.tools; - -import gmail.Lance5057.TinkersDefense; +package lance5057.tDefense.core.tools; import java.util.List; -import mods.battlegear2.api.ISheathed; -import mods.battlegear2.api.shield.IArrowCatcher; -import mods.battlegear2.api.shield.IArrowDisplay; -import mods.battlegear2.api.shield.IShield; -import net.minecraft.block.material.Material; +import lance5057.tDefense.TinkersDefense; import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -112,22 +101,22 @@ public class HeaterShield extends Shield { return "heatershield"; } -// /* tool_TinkerShield specific */ -// @Override -// public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, -// Entity entity) { -// if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) { -// entity.hurtResistantTime += 7; -// /* -// * if (entity instanceof EntityLiving) { EntityLiving living = -// * (EntityLiving) entity; if (living.getHealth() <= 0) { -// * -// * } } -// */ -// // if (entity.getHealth() <= 0) -// } -// return true; -// } + // /* tool_TinkerShield specific */ + // @Override + // public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, + // Entity entity) { + // if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) { + // entity.hurtResistantTime += 7; + // /* + // * if (entity instanceof EntityLiving) { EntityLiving living = + // * (EntityLiving) entity; if (living.getHealth() <= 0) { + // * + // * } } + // */ + // // if (entity.getHealth() <= 0) + // } + // return true; + // } @Override public void onUpdate(ItemStack stack, World world, Entity entity, int par4, @@ -135,7 +124,7 @@ public class HeaterShield extends Shield { super.onUpdate(stack, world, entity, par4, par5); } - + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, diff --git a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java b/src/main/java/lance5057/tDefense/core/tools/RoundShield.java index 45ea263..b25ae1a 100644 --- a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java +++ b/src/main/java/lance5057/tDefense/core/tools/RoundShield.java @@ -1,27 +1,16 @@ -package gmail.Lance5057.items.tools; - -import gmail.Lance5057.TinkersDefense; +package lance5057.tDefense.core.tools; import java.util.List; -import mods.battlegear2.api.ISheathed; -import mods.battlegear2.api.shield.IArrowCatcher; -import mods.battlegear2.api.shield.IArrowDisplay; -import mods.battlegear2.api.shield.IShield; -import net.minecraft.block.material.Material; +import lance5057.tDefense.TinkersDefense; import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -84,13 +73,13 @@ public class RoundShield extends Shield { switch (partType) { case 0: return "_shield_face"; - case 1: + case 1: return "_shield_face_broken"; - case 2: + case 2: return "_shield_edge"; - case 3: + case 3: return "_shield_boss"; - default: + default: return ""; } } @@ -105,22 +94,22 @@ public class RoundShield extends Shield { return "shield"; } -// /* tool_TinkerShield specific */ -// @Override -// public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, -// Entity entity) { -// if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) { -// entity.hurtResistantTime += 7; -// /* -// * if (entity instanceof EntityLiving) { EntityLiving living = -// * (EntityLiving) entity; if (living.getHealth() <= 0) { -// * -// * } } -// */ -// // if (entity.getHealth() <= 0) -// } -// return true; -// } + // /* tool_TinkerShield specific */ + // @Override + // public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, + // Entity entity) { + // if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) { + // entity.hurtResistantTime += 7; + // /* + // * if (entity instanceof EntityLiving) { EntityLiving living = + // * (EntityLiving) entity; if (living.getHealth() <= 0) { + // * + // * } } + // */ + // // if (entity.getHealth() <= 0) + // } + // return true; + // } @Override public void onUpdate(ItemStack stack, World world, Entity entity, int par4, @@ -128,7 +117,7 @@ public class RoundShield extends Shield { super.onUpdate(stack, world, entity, par4, par5); } - + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, diff --git a/src/main/java/gmail/Lance5057/items/tools/Shield.java b/src/main/java/lance5057/tDefense/core/tools/Shield.java index 5c8af46..c47b5a7 100644 --- a/src/main/java/gmail/Lance5057/items/tools/Shield.java +++ b/src/main/java/lance5057/tDefense/core/tools/Shield.java @@ -1,8 +1,5 @@ -package gmail.Lance5057.items.tools; +package lance5057.tDefense.core.tools; -import cpw.mods.fml.common.Optional; -import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.*; import mods.battlegear2.api.ISheathed; import mods.battlegear2.api.shield.IArrowCatcher; import mods.battlegear2.api.shield.IArrowDisplay; @@ -14,19 +11,22 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; - +import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.ISheathed"), - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowCatcher"), - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowDisplay"), - @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IShield") -}) - + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.ISheathed"), + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowCatcher"), + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowDisplay"), + @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IShield") }) public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatcher, IArrowDisplay { public Shield(int baseDamage) { @@ -174,7 +174,6 @@ public class Shield extends ToolCore implements IShield, ISheathed, return false; } - @Override @Optional.Method(modid = "battlegear2") public boolean sheatheOnBack(ItemStack item) { @@ -236,7 +235,6 @@ public class Shield extends ToolCore implements IShield, ISheathed, } @Override - public Item getAccessoryItem() { return null; } diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java index 7435c87..0714823 100644 --- a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java +++ b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java @@ -1,30 +1,12 @@ -package gmail.Lance5057.items.tools; +package lance5057.tDefense.core.tools; -import java.util.List; - -import buildcraft.api.tools.IToolWrench; -import mods.battlegear2.api.ISheathed; -import mods.battlegear2.api.shield.IArrowCatcher; -import mods.battlegear2.api.shield.IArrowDisplay; -import mods.battlegear2.api.shield.IShield; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; public class TinkerWrench extends Weapon implements IToolWrench { int induceDamage = 0; diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java index 980542f..d77cbc5 100644 --- a/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java +++ b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java @@ -1,17 +1,24 @@ -package gmail.Lance5057.items.tools; +package lance5057.tDefense.core.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -public class TinkerZweihander extends Weapon -{ +public class TinkerZweihander extends Weapon { public TinkerZweihander(int baseDamage) { super(5); - this.setUnlocalizedName("zweihander"); + this.setUnlocalizedName("zweihander"); } @Override @@ -23,28 +30,23 @@ public class TinkerZweihander extends Weapon public Item getHandleItem() { return TinkerTools.toughRod; } - + @Override public Item getAccessoryItem() { return TinkerTools.wideGuard; } - + @Override public Item getExtraItem() { return TinkerTools.swordBlade; } - -// @Override -// public int durabilityTypeAccessory() { -// return 2; -// } -// -// @Override -// public int durabilityTypeExtra () -// { -// return 1; -// } + @Override + public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) + { + + return stack; + } @Override public float getRepairCost() { @@ -60,8 +62,7 @@ public class TinkerZweihander extends Weapon public float getDamageModifier() { return 1.4f; } - - + @Override public int getPartAmount() { return 4; @@ -94,4 +95,20 @@ public class TinkerZweihander extends Weapon public String getDefaultFolder() { return "zweihander"; } + + @Override + @SideOnly(Side.CLIENT) + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, + boolean par5) { + super.onUpdate(stack, world, entity, par4, par5); + if (entity instanceof EntityPlayerSP) { + EntityPlayerSP player = (EntityPlayerSP) entity; + ItemStack usingItem = player.inventory.getCurrentItem(); + if (usingItem != null && usingItem.getItem() == this) { + player.addPotionEffect(new PotionEffect(Potion.resistance.getId(),2,1)); + + } + } + } + } diff --git a/src/main/java/gmail/Lance5057/modifiers/TDefenseActiveToolMod.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefenseActiveToolMod.java index fa47e3e..2075410 100644 --- a/src/main/java/gmail/Lance5057/modifiers/TDefenseActiveToolMod.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefenseActiveToolMod.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.modifiers; +package lance5057.tDefense.core.tools.modifiers; import java.util.ArrayList; import java.util.Random; diff --git a/src/main/java/gmail/Lance5057/modifiers/modifierDaze.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/modifierDaze.java index cf30e66..734ffa5 100644 --- a/src/main/java/gmail/Lance5057/modifiers/modifierDaze.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/modifierDaze.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.modifiers; +package lance5057.tDefense.core.tools.modifiers; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofBlades.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofBlades.java index 455a21f..86b54ad 100644 --- a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofBlades.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofBlades.java @@ -1,10 +1,8 @@ -package gmail.Lance5057.modifiers.shields; +package lance5057.tDefense.core.tools.modifiers.shields; -import tconstruct.library.tools.ToolCore; -import tconstruct.modifiers.tools.ItemModTypeFilter; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.modifiers.tools.ItemModTypeFilter; public class modifierCrestofBlades extends ItemModTypeFilter { diff --git a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofFeathers.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofFeathers.java index 0bdcb85..0b82ae4 100644 --- a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofFeathers.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofFeathers.java @@ -1,10 +1,10 @@ -package gmail.Lance5057.modifiers.shields; +package lance5057.tDefense.core.tools.modifiers.shields; -import tconstruct.library.tools.ToolCore; -import tconstruct.modifiers.tools.ItemModTypeFilter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; +import tconstruct.modifiers.tools.ItemModTypeFilter; public class modifierCrestofFeathers extends ItemModTypeFilter { diff --git a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofLegends.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofLegends.java index 1589b36..d1cd350 100644 --- a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofLegends.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofLegends.java @@ -1,9 +1,9 @@ -package gmail.Lance5057.modifiers.shields; +package lance5057.tDefense.core.tools.modifiers.shields; -import gmail.Lance5057.items.tools.Shield; -import tconstruct.modifiers.tools.ItemModTypeFilter; +import lance5057.tDefense.core.tools.Shield; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.modifiers.tools.ItemModTypeFilter; public class modifierCrestofLegends extends ItemModTypeFilter { diff --git a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofMirrors.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofMirrors.java index 35cf9a9..93d47e2 100644 --- a/src/main/java/gmail/Lance5057/modifiers/shields/modifierCrestofMirrors.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/shields/modifierCrestofMirrors.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.modifiers.shields; +package lance5057.tDefense.core.tools.modifiers.shields; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/gmail/Lance5057/containers/Container_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java index ab7d15a..499e81b 100644 --- a/src/main/java/gmail/Lance5057/containers/Container_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java @@ -1,6 +1,5 @@ -package gmail.Lance5057.containers; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/gmail/Lance5057/blocks/FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java index ac4dcf3..b3bf540 100644 --- a/src/main/java/gmail/Lance5057/blocks/FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java @@ -1,16 +1,13 @@ -package gmail.Lance5057.blocks; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; import static net.minecraftforge.common.util.ForgeDirection.EAST; import static net.minecraftforge.common.util.ForgeDirection.NORTH; import static net.minecraftforge.common.util.ForgeDirection.SOUTH; import static net.minecraftforge.common.util.ForgeDirection.WEST; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import lance5057.tDefense.TinkersDefense; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,8 +18,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FinishingAnvil extends BlockContainer { public FinishingAnvil() { diff --git a/src/main/java/gmail/Lance5057/gui/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java index 0e16dd8..30b841f 100644 --- a/src/main/java/gmail/Lance5057/gui/Gui_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java @@ -1,28 +1,20 @@ -package gmail.Lance5057.gui; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.containers.Container_CrestMount; -import gmail.Lance5057.containers.Container_FinishingAnvil; -import gmail.Lance5057.network.Message_CrestMount; -import gmail.Lance5057.network.Message_FinishingAnvil; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; - -import org.lwjgl.opengl.GL11; - -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.ToolCore; +import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.core.network.Message_FinishingAnvil; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.ToolCore; + public class Gui_FinishingAnvil extends GuiContainer { private float xSize_lo; diff --git a/src/main/java/gmail/Lance5057/models/ModelArmorAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java index 3bc064e..b261efc 100644 --- a/src/main/java/gmail/Lance5057/models/ModelArmorAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java @@ -1,14 +1,14 @@ -package gmail.Lance5057.models; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; /** - * Armor Anvil - Lance5057 + * Armor Anvil - lance5057 * Created using Tabula 4.1.1 */ -public class ModelArmorAnvil extends ModelBase { +public class ModelFinishingAnvil extends ModelBase { public ModelRenderer Log; public ModelRenderer HammerHead; public ModelRenderer HammerHandle; @@ -16,7 +16,7 @@ public class ModelArmorAnvil extends ModelBase { public ModelRenderer AnvilStem; public ModelRenderer AnvilTop; - public ModelArmorAnvil() { + public ModelFinishingAnvil() { this.textureWidth = 64; this.textureHeight = 64; this.AnvilTop = new ModelRenderer(this, 0, 22); diff --git a/src/main/java/gmail/Lance5057/gui/RenderItem_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java index 6c67d44..8fc450b 100644 --- a/src/main/java/gmail/Lance5057/gui/RenderItem_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java @@ -1,6 +1,4 @@ -package gmail.Lance5057.gui; - -import org.lwjgl.opengl.GL11; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; @@ -9,6 +7,8 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; + public class RenderItem_FinishingAnvil extends RenderItem { private Gui_FinishingAnvil anvilGui; diff --git a/src/main/java/gmail/Lance5057/models/Renderer_ArmorAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java index be7bd9e..06ac9ed 100644 --- a/src/main/java/gmail/Lance5057/models/Renderer_ArmorAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java @@ -1,6 +1,4 @@ -package gmail.Lance5057.models; - -import org.lwjgl.opengl.GL11; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -8,12 +6,14 @@ import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -public class Renderer_ArmorAnvil extends TileEntitySpecialRenderer +import org.lwjgl.opengl.GL11; + +public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer { - private final ModelArmorAnvil model; + private final ModelFinishingAnvil model; - public Renderer_ArmorAnvil() { - this.model = new ModelArmorAnvil(); + public Renderer_FinishingAnvil() { + this.model = new ModelFinishingAnvil(); } @Override diff --git a/src/main/java/gmail/Lance5057/tileentities/TileEntity_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java index 164048e..7148e03 100644 --- a/src/main/java/gmail/Lance5057/tileentities/TileEntity_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.tileentities; +package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java new file mode 100644 index 0000000..38f2b2d --- /dev/null +++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java @@ -0,0 +1,5 @@ +package lance5057.tDefense.finishingAnvil.utilities; + +public class InjectorLocations { + +} diff --git a/src/main/java/gmail/Lance5057/models/ModelJewelersBench.java b/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java index 46c43bd..827f232 100644 --- a/src/main/java/gmail/Lance5057/models/ModelJewelersBench.java +++ b/src/main/java/lance5057/tDefense/models/ModelJewelersBench.java @@ -1,11 +1,11 @@ -package gmail.Lance5057.models; +package lance5057.tDefense.models; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; /** - * JewelersBench - Lance5057 + * JewelersBench - lance5057 * Created using Tabula 4.1.1 */ public class ModelJewelersBench extends ModelBase { diff --git a/src/main/java/gmail/Lance5057/models/Renderer_JewelersBench.java b/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java index df13248..3406cea 100644 --- a/src/main/java/gmail/Lance5057/models/Renderer_JewelersBench.java +++ b/src/main/java/lance5057/tDefense/models/Renderer_JewelersBench.java @@ -1,6 +1,4 @@ -package gmail.Lance5057.models; - -import org.lwjgl.opengl.GL11; +package lance5057.tDefense.models; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -8,6 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + public class Renderer_JewelersBench extends TileEntitySpecialRenderer { private final ModelJewelersBench model; diff --git a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java index 1deab99..50d1010 100644 --- a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java +++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java @@ -1,16 +1,15 @@ -package gmail.Lance5057.proxy; +package lance5057.tDefense.proxy; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.armor.renderers.ModelChainArmor; -import gmail.Lance5057.armor.renderers.ModelClothArmor; -import gmail.Lance5057.armor.renderers.ModelSheath; -import gmail.Lance5057.armor.renderers.ModelTinkerArmor; -import gmail.Lance5057.models.Renderer_ArmorAnvil; -import gmail.Lance5057.models.Renderer_CrestMount; -import gmail.Lance5057.models.Renderer_JewelersBench; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; -import gmail.Lance5057.tileentities.TileEntity_JewelersBench; +import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.renderers.ModelChainArmor; +import lance5057.tDefense.armor.renderers.ModelClothArmor; +import lance5057.tDefense.armor.renderers.ModelTinkerArmor; +import lance5057.tDefense.core.blocks.crestMount.Renderer_CrestMount; +import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Renderer_FinishingAnvil; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil; +import lance5057.tDefense.models.Renderer_JewelersBench; +import lance5057.tDefense.tileentities.TileEntity_JewelersBench; import net.minecraft.client.model.ModelBiped; import net.minecraftforge.client.MinecraftForgeClient; import tconstruct.client.FlexibleToolRenderer; @@ -37,7 +36,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer( TileEntity_CrestMount.class, new Renderer_CrestMount()); ClientRegistry.bindTileEntitySpecialRenderer( - TileEntity_FinishingAnvil.class, new Renderer_ArmorAnvil()); + TileEntity_FinishingAnvil.class, new Renderer_FinishingAnvil()); ClientRegistry.bindTileEntitySpecialRenderer( TileEntity_JewelersBench.class, new Renderer_JewelersBench()); diff --git a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java index 2ff33b3..361851b 100644 --- a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java +++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java @@ -1,12 +1,12 @@ -package gmail.Lance5057.proxy; +package lance5057.tDefense.proxy; -import gmail.Lance5057.TinkersDefense; -import gmail.Lance5057.containers.Container_CrestMount; -import gmail.Lance5057.containers.Container_FinishingAnvil; -import gmail.Lance5057.gui.Gui_CrestMount; -import gmail.Lance5057.gui.Gui_FinishingAnvil; -import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; +import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount; +import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount; +import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Container_FinishingAnvil; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Gui_FinishingAnvil; +import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/gmail/Lance5057/tileentities/TileEntity_JewelersBench.java b/src/main/java/lance5057/tDefense/tileentities/TileEntity_JewelersBench.java index 7ca36da..b4c0c68 100644 --- a/src/main/java/gmail/Lance5057/tileentities/TileEntity_JewelersBench.java +++ b/src/main/java/lance5057/tDefense/tileentities/TileEntity_JewelersBench.java @@ -1,4 +1,4 @@ -package gmail.Lance5057.tileentities; +package lance5057.tDefense.tileentities; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/utilities/InjectorLocations.java b/src/main/java/utilities/InjectorLocations.java deleted file mode 100644 index 572b2fd..0000000 --- a/src/main/java/utilities/InjectorLocations.java +++ /dev/null @@ -1,5 +0,0 @@ -package utilities; - -public class InjectorLocations { - -} diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png Binary files differindex 028a415..f2fb2a1 100644 --- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png +++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png Binary files differindex b37a680..46bf663 100644 --- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png +++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png Binary files differindex 460de4b..5c7e1f7 100644 --- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png +++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png Binary files differindex 139dc53..d79295d 100644 --- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png +++ b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..07c37a9 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png Binary files differnew file mode 100644 index 0000000..ccfa649 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..91fc466 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..1c2eee3 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..600e05c --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..3175c28 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..9475927 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..13900b9 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..d9a5559 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..b1b9b10 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..ff55867 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..87520ce --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..d773a04 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..5f1da70 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..d7a5167 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..fd7bea7 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png Binary files differnew file mode 100644 index 0000000..8ce6419 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png |
