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

[fixed_forgeHammer_bug

Browse Source
This commit is contained in:
KitsuShadow
2016-02-06 09:58:44 -05:00
parent 42f657ebdb
commit e9835ce9d5
13 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/item/ModItems.class
View File

Binary file not shown.

BIN
bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class
View File

Binary file not shown.

BIN
bin/com/kitsu/medievalcraft/util/AnvilUtil.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.3.6}", "version": "{2.3.8}",
"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

@@ -57,7 +57,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.3.6"; public static final String VERSION = "2.3.8";
public static SimpleNetworkWrapper sNet; public static SimpleNetworkWrapper sNet;

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

@@ -209,7 +209,10 @@ public final class ModCrafting {
GameRegistry.addRecipe(new ItemStack(ModItems.itemModelArrow, 4), new Object[]{" x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', ModItems.leatherString}); GameRegistry.addRecipe(new ItemStack(ModItems.itemModelArrow, 4), new Object[]{" x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', ModItems.leatherString});
GameRegistry.addRecipe(new ItemStack(ModItems.itemModelArrow, 4), new Object[]{" x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', Items.string}); GameRegistry.addRecipe(new ItemStack(ModItems.itemModelArrow, 4), new Object[]{" x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', Items.string});
//GameRegistry.addRecipe(new ItemStack(ModItems.itemIronTippedModelArrow), new Object[]{" a"," x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', Items.string, 'a', ModItems.ironsharpTip}); GameRegistry.addRecipe(new ItemStack(ModItems.itemIronTippedModelArrow), new Object[]{"x", "z", 'z', ModItems.itemModelArrow, 'x', ModItems.ironsharpTip});
//GameRegistry.addRecipe(new ItemStack(ModItems.itemIronTippedModelArrow, 4), new Object[]{" a"," x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', ModItems.leatherString, 'a', ModItems.ironsharpTip});
//GameRegistry.addRecipe(new ItemStack(ModItems.itemIronTippedModelArrow, 4), new Object[]{" a"," x", "zy", 'x', Items.stick, 'y', Items.feather, 'z', Items.string, 'a', ModItems.ironsharpTip});
//Temp Recipe //Temp Recipe
ItemStack longbow0 = new ItemStack(ModItems.longbow); ItemStack longbow0 = new ItemStack(ModItems.longbow);
longbow0.stackTagCompound = new NBTTagCompound(); longbow0.stackTagCompound = new NBTTagCompound();

26
src/main/java/com/kitsu/medievalcraft/item/ModItems.java
View File

@@ -648,46 +648,46 @@ public final class ModItems {
cookedsawbladeClayForm = new CClaySawBladeForm("cookedsawbladeClayForm", cookedsawbladeClayForm); cookedsawbladeClayForm = new CClaySawBladeForm("cookedsawbladeClayForm", cookedsawbladeClayForm);
//-----------------------IRON PARTS-----------------------// //-----------------------IRON PARTS-----------------------//
ironpickaxeHead = new Item().setUnlocalizedName("ironpickaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironpickaxeHead").setMaxStackSize(1); ironpickaxeHead = new Item().setUnlocalizedName("ironpickaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironpickaxeHead").setMaxStackSize(64);
GameRegistry.registerItem(ironpickaxeHead, "ironpickaxeHead"); GameRegistry.registerItem(ironpickaxeHead, "ironpickaxeHead");
ironspadeHead = new Item().setUnlocalizedName("ironspadeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironspadeHead").setMaxStackSize(1); ironspadeHead = new Item().setUnlocalizedName("ironspadeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironspadeHead").setMaxStackSize(64);
GameRegistry.registerItem(ironspadeHead, "ironspadeHead"); GameRegistry.registerItem(ironspadeHead, "ironspadeHead");
ironhoeHead = new Item().setUnlocalizedName("ironhoeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironhoeHead").setMaxStackSize(1); ironhoeHead = new Item().setUnlocalizedName("ironhoeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironhoeHead").setMaxStackSize(64);
GameRegistry.registerItem(ironhoeHead, "ironhoeHead"); GameRegistry.registerItem(ironhoeHead, "ironhoeHead");
ironaxeHead = new Item().setUnlocalizedName("ironaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironaxeHead").setMaxStackSize(1); ironaxeHead = new Item().setUnlocalizedName("ironaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironaxeHead").setMaxStackSize(64);
GameRegistry.registerItem(ironaxeHead, "ironaxeHead"); GameRegistry.registerItem(ironaxeHead, "ironaxeHead");
ironlongswordBlade = new Item().setUnlocalizedName("ironlongswordBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironlongswordBlade").setMaxStackSize(1); ironlongswordBlade = new Item().setUnlocalizedName("ironlongswordBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironlongswordBlade").setMaxStackSize(64);
GameRegistry.registerItem(ironlongswordBlade, "ironlongswordBlade"); GameRegistry.registerItem(ironlongswordBlade, "ironlongswordBlade");
ironshortswordBlade = new Item().setUnlocalizedName("ironshortswordBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironshortswordBlade").setMaxStackSize(1); ironshortswordBlade = new Item().setUnlocalizedName("ironshortswordBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironshortswordBlade").setMaxStackSize(64);
GameRegistry.registerItem(ironshortswordBlade, "ironshortswordBlade"); GameRegistry.registerItem(ironshortswordBlade, "ironshortswordBlade");
irondaggerBlade = new Item().setUnlocalizedName("irondaggerBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "irondaggerBlade").setMaxStackSize(1); irondaggerBlade = new Item().setUnlocalizedName("irondaggerBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "irondaggerBlade").setMaxStackSize(64);
GameRegistry.registerItem(irondaggerBlade, "irondaggerBlade"); GameRegistry.registerItem(irondaggerBlade, "irondaggerBlade");
//ironhalberdHead = new Item().setUnlocalizedName("ironhalberdHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironhalberdHead"); //ironhalberdHead = new Item().setUnlocalizedName("ironhalberdHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironhalberdHead");
//GameRegistry.registerItem(ironhalberdHead, "ironhalberdHead"); //GameRegistry.registerItem(ironhalberdHead, "ironhalberdHead");
ironspearTip = new Item().setUnlocalizedName("ironspearTip").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironspearTip").setMaxStackSize(1); ironspearTip = new Item().setUnlocalizedName("ironspearTip").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironspearTip").setMaxStackSize(64);
GameRegistry.registerItem(ironspearTip, "ironspearTip"); GameRegistry.registerItem(ironspearTip, "ironspearTip");
ironsharpTip = new Item().setUnlocalizedName("ironsharpTip").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsharpTip").setMaxStackSize(1); ironsharpTip = new Item().setUnlocalizedName("ironsharpTip").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsharpTip").setMaxStackSize(64);
GameRegistry.registerItem(ironsharpTip, "ironsharpTip"); GameRegistry.registerItem(ironsharpTip, "ironsharpTip");
ironmaceHead = new Item().setUnlocalizedName("ironmaceHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironmaceHead").setMaxStackSize(1); ironmaceHead = new Item().setUnlocalizedName("ironmaceHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironmaceHead").setMaxStackSize(64);
GameRegistry.registerItem(ironmaceHead, "ironmaceHead"); GameRegistry.registerItem(ironmaceHead, "ironmaceHead");
ironbattleaxeHead = new Item().setUnlocalizedName("ironbattleaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironbattleaxeHead").setMaxStackSize(1); ironbattleaxeHead = new Item().setUnlocalizedName("ironbattleaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironbattleaxeHead").setMaxStackSize(64);
GameRegistry.registerItem(ironbattleaxeHead, "ironbattleaxeHead"); GameRegistry.registerItem(ironbattleaxeHead, "ironbattleaxeHead");
ironsquarePlate = new Item().setUnlocalizedName("ironsquarePlate").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsquarePlate").setMaxStackSize(1); ironsquarePlate = new Item().setUnlocalizedName("ironsquarePlate").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsquarePlate").setMaxStackSize(64);
GameRegistry.registerItem(ironsquarePlate, "ironsquarePlate"); GameRegistry.registerItem(ironsquarePlate, "ironsquarePlate");
ironsawBlade = new Item().setUnlocalizedName("ironsawBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsawBlade").setMaxStackSize(1); ironsawBlade = new Item().setUnlocalizedName("ironsawBlade").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironsawBlade").setMaxStackSize(64);
GameRegistry.registerItem(ironsawBlade, "ironsawBlade"); GameRegistry.registerItem(ironsawBlade, "ironsawBlade");
//-----------------------TOOL ROD PARTS-----------------------// //-----------------------TOOL ROD PARTS-----------------------//

22
src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java
View File

@@ -20,6 +20,7 @@ import com.kitsu.medievalcraft.block.ModBlocks;
import com.kitsu.medievalcraft.block.ingots.IngotBase; import com.kitsu.medievalcraft.block.ingots.IngotBase;
import com.kitsu.medievalcraft.crafting.ForgeAnvilCrafting; import com.kitsu.medievalcraft.crafting.ForgeAnvilCrafting;
import com.kitsu.medievalcraft.crafting.TestForgeCrafting; import com.kitsu.medievalcraft.crafting.TestForgeCrafting;
import com.kitsu.medievalcraft.item.ModItems;
import com.kitsu.medievalcraft.item.forms.clay.ClayForms; import com.kitsu.medievalcraft.item.forms.clay.ClayForms;
import com.kitsu.medievalcraft.item.forms.iron.IronForms; import com.kitsu.medievalcraft.item.forms.iron.IronForms;
import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket;
@@ -46,6 +47,7 @@ public class ForgeHammer extends Item implements AnvilUtil{
TileMyIronIngot tileRefIngot; TileMyIronIngot tileRefIngot;
TileIronPlate tilePlate; TileIronPlate tilePlate;
Random rand; Random rand;
private ItemStack stackGive;
public ForgeHammer() { public ForgeHammer() {
@@ -134,7 +136,25 @@ public class ForgeHammer extends Item implements AnvilUtil{
tile.hits++; tile.hits++;
stack.damageItem(1, p); stack.damageItem(1, p);
if(tile.hits >= 4 + rand.nextInt(3)){ if(tile.hits >= 4 + rand.nextInt(3)){
world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsIron.get(tileEnt.getStackInSlot(0).getItem()))); Item itemGive = formsIronTest.get(tileEnt.getStackInSlot(0).getItem());
if(itemGive == ModItems.irondaggerBlade){
stackGive = new ItemStack (itemGive, 3);
} else if (itemGive == ModItems.ironweaponHandle){
stackGive = new ItemStack (itemGive, 2);
} else if (itemGive == ModItems.ironRing){
stackGive = new ItemStack (itemGive, 9);
} else if (itemGive == ModItems.ironsharpTip){
stackGive = new ItemStack (itemGive, 9);
} else if (itemGive == ModItems.ironshortswordBlade){
stackGive = new ItemStack (itemGive, 2);
} else {
stackGive = new ItemStack (itemGive, 1);
}
System.out.println(stackGive);
world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, stackGive));
//formsIron.get(tileEnt.getStackInSlot(0).getItem())
System.out.println(formsIron.get(tileEnt.getStackInSlot(0).getItem()));
world.setBlock(x, y, z, Blocks.air, 0, 2); world.setBlock(x, y, z, Blocks.air, 0, 2);
if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){ if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){
if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){ if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){

39
src/main/java/com/kitsu/medievalcraft/util/AnvilUtil.java
View File

@@ -66,6 +66,45 @@ public interface AnvilUtil {
put(ModItems.cookedspeartipClayForm, new ItemStack(ModItems.ironspearTip, 1)); put(ModItems.cookedspeartipClayForm, new ItemStack(ModItems.ironspearTip, 1));
}}; }};
static final Hashtable<Item, Item> makeFormsTest = new Hashtable <Item, Item>(){{
put(ModItems.ironaxeHead, (ModItems.ironAxeForm));
put(ModItems.ironbattleaxeHead, (ModItems.ironBattleAxeForm));
put(ModItems.irondaggerBlade, (ModItems.ironDaggerForm));
put(ModItems.woodentoolHandle, (ModItems.ironHandleForm));
put(ModItems.ironhoeHead, (ModItems.ironHoeForm));
put(ModItems.ironlongswordBlade, (ModItems.ironLongswordForm));
put(ModItems.ironmaceHead, (ModItems.ironMaceHeadForm));
put(ModItems.ironpickaxeHead, (ModItems.ironPickaxeForm));
put(ModItems.ironRing, (ModItems.ironRingForm));
put(ModItems.ironsawBlade, (ModItems.ironSawBladeForm));
put(ModItems.ironsharpTip, (ModItems.ironSharpTipForm));
put(ModItems.ironshortswordBlade, (ModItems.ironShortSwordForm));
put(ModItems.ironspadeHead, (ModItems.ironSpadForm));
put(ModItems.ironspearTip, (ModItems.ironSpearTipForm));
}};
//==============TESTING========================//
static final Hashtable<Item, Item> formsIronTest = new Hashtable <Item, Item>(){{
put(ModItems.ironAxeForm, (ModItems.ironaxeHead));
put(ModItems.ironBattleAxeForm, (ModItems.ironbattleaxeHead));
put(ModItems.ironDaggerForm, (ModItems.irondaggerBlade));
put(ModItems.ironHandleForm, (ModItems.ironweaponHandle));
put(ModItems.ironHoeForm, (ModItems.ironhoeHead));
put(ModItems.ironLongswordForm, (ModItems.ironlongswordBlade));
put(ModItems.ironMaceHeadForm, (ModItems.ironmaceHead));
put(ModItems.ironPickaxeForm, (ModItems.ironpickaxeHead));
put(ModItems.ironRingForm, (ModItems.ironRing));
put(ModItems.ironSawBladeForm, (ModItems.ironsawBlade));
put(ModItems.ironSharpTipForm, (ModItems.ironsharpTip));
put(ModItems.ironShortSwordForm, (ModItems.ironshortswordBlade));
put(ModItems.ironSpadForm, (ModItems.ironspadeHead));
put(ModItems.ironSpearTipForm, (ModItems.ironspearTip));
}};

BIN
src/main/resources/assets/kitsumedievalcraft/models/damascusmodelarrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

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.3.6}", "version": "{2.3.8}",
"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",