nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spear_finished

Browse Source
This commit is contained in:
KitsuShadow
2015-08-11 16:25:34 -04:00
parent 4783806ed0
commit aaebf5feb5
12 changed files with 134 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/assets/kitsumedievalcraft/lang/en_US.lang
View File

@@ -281,6 +281,7 @@ item.fireBow.name=Fire Bow
item.longbow.name=Longbow item.longbow.name=Longbow
item.gladius.name=Gladius item.gladius.name=Gladius
item.battleAxe.name=Battle Axe item.battleAxe.name=Battle Axe
item.itemITSpear.name=Iron Tipped Spear
item.itemIronTippedModelArrow.name=Iron Tipped Longbow Arrow item.itemIronTippedModelArrow.name=Iron Tipped Longbow Arrow
item.itemModelArrow.name=Longbow Arrow item.itemModelArrow.name=Longbow Arrow
item.workBlade.name=Crafting Blade item.workBlade.name=Crafting Blade

BIN
bin/com/kitsu/medievalcraft/Main.class
View File

Binary file not shown.

BIN
bin/com/kitsu/medievalcraft/crafting/ModCrafting.class
View File

Binary file not shown.

BIN
bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class
View File

Binary file not shown.

2
bin/mcmod.info
View File

@@ -3,7 +3,7 @@
"modid": "kitsumedievalcraft", "modid": "kitsumedievalcraft",
"name": "ForgeCraft", "name": "ForgeCraft",
"description": "ForgeCraft", "description": "ForgeCraft",
"version": "{2.2.5}", "version": "{2.2.6}",
"mcversion": "{1.7.10}", "mcversion": "{1.7.10}",
"url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging",
"updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",

2
src/main/java/com/kitsu/medievalcraft/Main.java
View File

@@ -55,7 +55,7 @@ public class Main {
public static final String MODID = "kitsumedievalcraft"; public static final String MODID = "kitsumedievalcraft";
public static final String MODNAME = "ForgeCraft"; public static final String MODNAME = "ForgeCraft";
public static final String VERSION = "2.2.5"; public static final String VERSION = "2.2.6";
public static SimpleNetworkWrapper sNet; public static SimpleNetworkWrapper sNet;

1
src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java
View File

@@ -260,6 +260,7 @@ public final class ModCrafting {
gladius0.stackTagCompound = new NBTTagCompound(); gladius0.stackTagCompound = new NBTTagCompound();
gladius0.stackTagCompound.setInteger("GLADIUSTEXTURE", 0); gladius0.stackTagCompound.setInteger("GLADIUSTEXTURE", 0);
GameRegistry.addRecipe(new ShapedOreRecipe(gladius0, new Object[]{"x", "y", Character.valueOf('y'), "strapLeather", 'x', ModItems.ironshortswordBlade})); GameRegistry.addRecipe(new ShapedOreRecipe(gladius0, new Object[]{"x", "y", Character.valueOf('y'), "strapLeather", 'x', ModItems.ironshortswordBlade}));
GameRegistry.addRecipe(new ShapedOreRecipe((ModItems.itemITSpear), new Object[]{"a", "c", "b", 'a', ModItems.ironspearTip, 'b', ModItems.woodentoolHandle, Character.valueOf('c'), "strapLeather"}));
//-----------------------PICKAXE COMBOS-----------------------// //-----------------------PICKAXE COMBOS-----------------------//
//BASE PICK //BASE PICK

168
src/main/java/com/kitsu/medievalcraft/item/throwable/ItemITSpear.java
View File

@@ -21,105 +21,107 @@ import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent;
public class ItemITSpear extends ItemSword { public class ItemITSpear extends ItemSword {
private String name = "itemITSpear"; private String name = "itemITSpear";
public ItemITSpear(String name, ToolMaterial mat) { public ItemITSpear(String name, ToolMaterial mat) {
super(mat); super(mat);
setUnlocalizedName(name); setUnlocalizedName(name);
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(CustomTab.MedievalCraftTab); setCreativeTab(CustomTab.MedievalCraftTab);
setTextureName(Main.MODID + ":" + name); setTextureName(Main.MODID + ":" + name);
setMaxDamage(100);
GameRegistry.registerItem(this, name); GameRegistry.registerItem(this, name);
} }
@Override @Override
public EnumAction getItemUseAction(ItemStack stack) { public EnumAction getItemUseAction(ItemStack stack) {
return EnumAction.bow; return EnumAction.bow;
} }
@Override @Override
public int getMaxItemUseDuration(ItemStack p_77626_1_) { public int getMaxItemUseDuration(ItemStack p_77626_1_) {
return 72000; return 72000;
} }
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
{
ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
MinecraftForge.EVENT_BUS.post(event);
if (event.isCanceled())
{
return event.result;
}
if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.itemITSpear))
{
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
}
return p_77659_1_;
}
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{ {
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_; ArrowNockEvent event = new ArrowNockEvent(player, stack);
ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j); MinecraftForge.EVENT_BUS.post(event);
MinecraftForge.EVENT_BUS.post(event); if (event.isCanceled())
if (event.isCanceled()) {
{ return event.result;
return; }
} if (player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.itemITSpear))
j = event.charge; {
boolean flag = p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0; player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
if (flag || p_77615_3_.inventory.hasItem(ModItems.itemITSpear)) }
{ if(!world.isRemote){
float f = (float)j / 20.0F; this.setMaxDamage(500);
f = (f * f + f * 2.0F) / 3.0F; }
if ((double)f < 0.1D) return stack;
{ }
return;
} public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_)
if (f > 1.0F) {
{ if (!p_77615_2_.isRemote)
f = 1.0F; {
} int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
EntityITSpear entityspear = new EntityITSpear(p_77615_2_, p_77615_3_, f * 2.0F); ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
if (f == 1.0F) MinecraftForge.EVENT_BUS.post(event);
{ if (event.isCanceled())
entityspear.setIsCritical(true); {
} return;
int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, p_77615_1_); }
if (k > 0) j = event.charge;
{ //boolean flag = p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
entityspear.setDamage(entityspear.getDamage() + (double)k * 0.5D + 0.5D); if (p_77615_3_.inventory.hasItem(ModItems.itemITSpear))
} {
int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, p_77615_1_); float f = (float)j / 20.0F;
if (l > 0) f = (f * f + f * 2.0F) / 3.0F;
{ if ((double)f < 0.1D)
entityspear.setKnockbackStrength(l); {
} return;
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, p_77615_1_) > 0) }
{ if (f > 1.0F)
entityspear.setFire(100); {
} f = 1.0F;
p_77615_1_.damageItem(1, p_77615_3_); }
p_77615_2_.playSoundAtEntity(p_77615_3_, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); EntityITSpear entityspear = new EntityITSpear(p_77615_2_, p_77615_3_, f * 2.0F);
if (flag) if (f == 1.0F)
{ {
entityspear.canBePickedUp = 2; entityspear.setIsCritical(true);
} }
else /*int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, p_77615_1_);
{ if (k > 0)
p_77615_3_.inventory.consumeInventoryItem(ModItems.itemITSpear); {
} entityspear.setDamage(entityspear.getDamage() + (double)k * 0.5D + 0.5D);
if (!p_77615_2_.isRemote) }
{ int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, p_77615_1_);
p_77615_2_.spawnEntityInWorld(entityspear); if (l > 0)
} {
} entityspear.setKnockbackStrength(l);
} }
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, p_77615_1_) > 0)
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) {
{ entityspear.setFire(100);
return p_77654_1_; }*/
} //p_77615_1_.damageItem(1, p_77615_3_);
p_77615_2_.playSoundAtEntity(p_77615_3_, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
p_77615_3_.inventory.consumeInventoryItem(ModItems.itemITSpear);
this.setMaxDamage(100);
p_77615_2_.spawnEntityInWorld(entityspear);
}
}
}
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_)
{
return p_77654_1_;
}
} }

2
src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java
View File

@@ -102,7 +102,7 @@ public class RendererRegistry {
MinecraftForgeClient.registerItemRenderer(ModItems.heavyMace, new ItemRenderHeavymace()); MinecraftForgeClient.registerItemRenderer(ModItems.heavyMace, new ItemRenderHeavymace());
MinecraftForgeClient.registerItemRenderer(ModItems.battleAxe, new IRBattleAxe()); MinecraftForgeClient.registerItemRenderer(ModItems.battleAxe, new IRBattleAxe());
MinecraftForgeClient.registerItemRenderer(ModItems.gladius, new IRGladius()); MinecraftForgeClient.registerItemRenderer(ModItems.gladius, new IRGladius());
MinecraftForgeClient.registerItemRenderer(ModItems.workBlade, new IRCraftingBlade()); //MinecraftForgeClient.registerItemRenderer(ModItems.workBlade, new IRCraftingBlade());
MinecraftForgeClient.registerItemRenderer(ModItems.slottedTongs, new IRSlottedTongs()); MinecraftForgeClient.registerItemRenderer(ModItems.slottedTongs, new IRSlottedTongs());

93
src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/IRITSpear.java
View File

@@ -13,15 +13,15 @@ import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.IModelCustom;
public class IRITSpear implements IItemRenderer{ public class IRITSpear implements IItemRenderer{
public static final ResourceLocation MODEL = new ResourceLocation("kitsumedievalcraft:models/Spear.obj"); public static final ResourceLocation MODEL = new ResourceLocation("kitsumedievalcraft:models/Spear.obj");
public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/Spear.png"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/Spear.png");
public IModelCustom model = AdvancedModelLoader.loadModel(MODEL); public IModelCustom model = AdvancedModelLoader.loadModel(MODEL);
@Override @Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) { public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) { switch(type) {
case EQUIPPED: { case EQUIPPED: {
return true; return true;
@@ -35,15 +35,15 @@ public class IRITSpear implements IItemRenderer{
case ENTITY: { case ENTITY: {
return true; return true;
} }
default: return false; default: return false;
} }
} }
@Override @Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,
ItemRendererHelper helper) { ItemRendererHelper helper) {
switch(type) { switch(type) {
case EQUIPPED: { case EQUIPPED: {
return false; return false;
@@ -55,86 +55,77 @@ public class IRITSpear implements IItemRenderer{
return false; return false;
} }
case ENTITY: { case ENTITY: {
return false; return false;
} }
default: return false; default: return false;
} }
} }
@Override @Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) { public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) { switch(type) {
case EQUIPPED: { case EQUIPPED: {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glScalef(1.0F, 1.0F, 1.0F); GL11.glScalef(1.0F, 1.0F, 1.0F);
if(item.getMaxDamage()==500){
GL11.glTranslatef(0.5F, 0.4F, -0.0F); GL11.glTranslatef(0.5F, 0.6F, -0.125F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE GL11.glRotatef(40F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(140F, 0.0F, 0.0F, 1.0F); }
//GL11.glRotatef(-20F, 0.0F, 1.0F, 0.0F); if(item.getMaxDamage()==100){
//GL11.glRotatef(40F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.5F, 0.4F, -0.0F);
//GL11.glRotated(90, 1.0, 0.0, 0.0); GL11.glRotatef(140F, 0.0F, 0.0F, 1.0F);
}
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
model.renderAll(); model.renderAll();
GL11.glPopMatrix(); GL11.glPopMatrix();
} break; } break;
case EQUIPPED_FIRST_PERSON: { case EQUIPPED_FIRST_PERSON: {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glScalef(1.0F, 1.0F, 1.0F); GL11.glScalef(1.0F, 1.0F, 1.0F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE
GL11.glTranslatef(0.0F, 2.0F, 0.0F);
//GL11.glRotatef(45F, 1.0F, 0.0F, 0.0F);
//GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
//GL11.glRotatef(45F, 0.0F, -1.0F, 0.0F);
//GL11.glRotated(-85, 1.0, 0.0, 0.0); if(item.getMaxDamage()==500){
//GL11.glRotated(50, 0.0F, 0.0F, 1.0F); GL11.glRotatef(40F, 0.0F, 0.0F, 1.0F);
//GL11.glRotated(3, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.8F, -0.2F);
}
if(item.getMaxDamage()==100){
GL11.glRotatef(110F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(0.0F, -0.5F, -0.2F);
}
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
model.renderAll(); model.renderAll();
GL11.glPopMatrix(); GL11.glPopMatrix();
} break; } break;
case INVENTORY: { case INVENTORY: {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_TEXTURE_2D);
float iscale = 9F; float iscale = 5F;
GL11.glScalef(iscale, iscale, iscale); GL11.glScalef(iscale, iscale, iscale);
//GL11.glRotatef(-45, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(1.5F, 1.5F, 0.0F);
//GL11.glRotatef(45, 1.0F, 0.0F, 0.0F); GL11.glRotatef(-45, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90, 1.0F, 0.0F, 0.0F);
//GL11.glTranslatef(0.2F, 1.2F, 0.0F); //GL11.glTranslatef(0.2F, 1.2F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
model.renderAll(); model.renderAll();
GL11.glPopMatrix(); GL11.glPopMatrix();
} break; } break;
case ENTITY: { case ENTITY: {
GL11.glPushMatrix(); GL11.glPushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);
GL11.glScalef(5.0F, 5.0F, 5.0F); GL11.glScalef(2.0F, 2.0F, 2.0F);
//GL11.glTranslatef(5.0F, 5.0F, 5.0F); //GL11.glTranslatef(5.0F, 5.0F, 5.0F);
//ANGLE, X ROTATE, Y ROTATE, Z ROTATE //ANGLE, X ROTATE, Y ROTATE, Z ROTATE
//GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); //GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F);
//GL11.glRotatef(90F, 1.0F, 0.0F, 1.0F); //GL11.glRotatef(90F, 1.0F, 0.0F, 1.0F);

1
src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang
View File

@@ -281,6 +281,7 @@ item.fireBow.name=Fire Bow
item.longbow.name=Longbow item.longbow.name=Longbow
item.gladius.name=Gladius item.gladius.name=Gladius
item.battleAxe.name=Battle Axe item.battleAxe.name=Battle Axe
item.itemITSpear.name=Iron Tipped Spear
item.itemIronTippedModelArrow.name=Iron Tipped Longbow Arrow item.itemIronTippedModelArrow.name=Iron Tipped Longbow Arrow
item.itemModelArrow.name=Longbow Arrow item.itemModelArrow.name=Longbow Arrow
item.workBlade.name=Crafting Blade item.workBlade.name=Crafting Blade

2
src/main/resources/mcmod.info
View File

@@ -3,7 +3,7 @@
"modid": "kitsumedievalcraft", "modid": "kitsumedievalcraft",
"name": "ForgeCraft", "name": "ForgeCraft",
"description": "ForgeCraft", "description": "ForgeCraft",
"version": "{2.2.5}", "version": "{2.2.6}",
"mcversion": "{1.7.10}", "mcversion": "{1.7.10}",
"url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging",
"updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",