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

ForgeHammer and Tongs Plate Render

Browse Source
This commit is contained in:
kitsushadow
2015-07-04 05:50:37 -04:00
parent 2653079404
commit 9c06cd5dfb
64 changed files with 388 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,19 @@ import com.kitsu.medievalcraft.item.craftingtools.WorkBlade;
import com.kitsu.medievalcraft.item.craftingtools.filters.CoarseFilter;
import com.kitsu.medievalcraft.item.craftingtools.filters.FineFilter;
import com.kitsu.medievalcraft.item.craftingtools.filters.MediumFilter;
import com.kitsu.medievalcraft.item.forms.clay.CClayAxeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayBattleAxeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayDaggerForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayHoeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayLongswordForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayMaceHeadForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayPickaxeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayRingForm;
import com.kitsu.medievalcraft.item.forms.clay.CClaySawBladeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClaySharpTipForm;
import com.kitsu.medievalcraft.item.forms.clay.CClayShortSwordForm;
import com.kitsu.medievalcraft.item.forms.clay.CClaySpadeForm;
import com.kitsu.medievalcraft.item.forms.clay.CClaySpearTipForm;
import com.kitsu.medievalcraft.item.forms.iron.IronAxeForm;
import com.kitsu.medievalcraft.item.forms.iron.IronBattleAxeForm;
import com.kitsu.medievalcraft.item.forms.iron.IronDaggerForm;
@@ -497,53 +510,20 @@ public final class ModItems {
//-----------------------COOKED CLAY FORMS-----------------------//
cookedpickaxeClayForm = new Item().setUnlocalizedName("cookedpickaxeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedpickaxeClayForm");
GameRegistry.registerItem(cookedpickaxeClayForm, "cookedpickaxeClayForm");
cookedspadeHeadClayForm = new Item().setUnlocalizedName("cookedspadeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedspadeHeadClayForm");
GameRegistry.registerItem(cookedspadeHeadClayForm, "cookedspadeHeadClayForm");
cookedhoeHeadClayForm = new Item().setUnlocalizedName("cookedhoeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedhoeHeadClayForm");
GameRegistry.registerItem(cookedhoeHeadClayForm, "cookedhoeHeadClayForm");
cookedaxeHeadClayForm = new Item().setUnlocalizedName("cookedaxeHeadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedaxeHeadClayForm");
GameRegistry.registerItem(cookedaxeHeadClayForm, "cookedaxeHeadClayForm");
cookedlongswordClayForm = new Item().setUnlocalizedName("cookedlongswordClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedlongswordClayForm");
GameRegistry.registerItem(cookedlongswordClayForm, "cookedlongswordClayForm");
cookedshortswordClayForm = new Item().setUnlocalizedName("cookedshortswordClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedshortswordClayForm");
GameRegistry.registerItem(cookedshortswordClayForm, "cookedshortswordClayForm");
cookeddaggerClayForm = new Item().setUnlocalizedName("cookeddaggerClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookeddaggerClayForm");
GameRegistry.registerItem(cookeddaggerClayForm, "cookeddaggerClayForm");
//cookedhalberdClayForm = new Item().setUnlocalizedName("cookedhalberdClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedhalberdClayForm");
//GameRegistry.registerItem(cookedhalberdClayForm, "cookedhalberdClayForm");
cookedspeartipClayForm = new Item().setUnlocalizedName("cookedspeartipClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedspeartipClayForm");
GameRegistry.registerItem(cookedspeartipClayForm, "cookedspeartipClayForm");
cookedmaceheadClayForm = new Item().setUnlocalizedName("cookedmaceheadClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedmaceheadClayForm");
GameRegistry.registerItem(cookedmaceheadClayForm, "cookedmaceheadClayForm");
cookedsharptipClayForm = new Item().setUnlocalizedName("cookedsharptipClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedsharptipClayForm");
GameRegistry.registerItem(cookedsharptipClayForm, "cookedsharptipClayForm");
cookedbattleaxeClayForm = new Item().setUnlocalizedName("cookedbattleaxeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedbattleaxeClayForm");
GameRegistry.registerItem(cookedbattleaxeClayForm, "cookedbattleaxeClayForm");
cookedringClayForm = new Item().setUnlocalizedName("cookedringClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedringClayForm");
GameRegistry.registerItem(cookedringClayForm, "cookedringClayForm");
//cookedplateClayForm = new Item().setUnlocalizedName("cookedplateClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedplateClayForm");
//GameRegistry.registerItem(cookedplateClayForm, "cookedplateClayForm");
cookedsawbladeClayForm = new Item().setUnlocalizedName("cookedsawbladeClayForm").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "cookedsawbladeClayForm");
GameRegistry.registerItem(cookedsawbladeClayForm, "cookedsawbladeClayForm");
cookedpickaxeClayForm = new CClayPickaxeForm("cookedpickaxeClayForm", cookedpickaxeClayForm);
cookedspadeHeadClayForm = new CClaySpadeForm("cookedspadeHeadClayForm", cookedspadeHeadClayForm);
cookedhoeHeadClayForm = new CClayHoeForm("cookedhoeHeadClayForm", cookedhoeHeadClayForm);
cookedaxeHeadClayForm = new CClayAxeForm("cookedaxeHeadClayForm", cookedaxeHeadClayForm);
cookedlongswordClayForm = new CClayLongswordForm("cookedlongswordClayForm", cookedlongswordClayForm);
cookedshortswordClayForm = new CClayShortSwordForm("cookedshortswordClayForm", cookedshortswordClayForm);
cookeddaggerClayForm = new CClayDaggerForm("cookeddaggerClayForm", cookeddaggerClayForm);
cookedspeartipClayForm = new CClaySpearTipForm("cookedspeartipClayForm", cookedspeartipClayForm);
cookedmaceheadClayForm = new CClayMaceHeadForm("cookedmaceheadClayForm", cookedmaceheadClayForm);
cookedsharptipClayForm = new CClaySharpTipForm("cookedsharptipClayForm", cookedsharptipClayForm);
cookedbattleaxeClayForm = new CClayBattleAxeForm("cookedbattleaxeClayForm", cookedbattleaxeClayForm);
cookedringClayForm = new CClayRingForm("cookedringClayForm", cookedringClayForm);
cookedsawbladeClayForm = new CClaySawBladeForm("cookedsawbladeClayForm", cookedsawbladeClayForm);
//-----------------------IRON PARTS-----------------------//
ironpickaxeHead = new Item().setUnlocalizedName("ironpickaxeHead").setCreativeTab(CustomTab.MedievalCraftTab).setTextureName(Main.MODID + ":" + "ironpickaxeHead").setMaxStackSize(1);
GameRegistry.registerItem(ironpickaxeHead, "ironpickaxeHead");
@@ -793,6 +773,4 @@ public final class ModItems {
GameRegistry.registerItem(customHandleIronLumberAxe = new CustomHandleIronLumberAxe("customHandleIronLumberAxe", customIronToolRodNormal), "customHandleIronLumberAxe");
GameRegistry.registerItem(customHandleStrongIronLumberAxe = new CustomHandleStrongIronLumberAxe("customHandleStrongIronLumberAxe", customIronToolRodStrong), "customHandleStrongIronLumberAxe");
}
}

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

@@ -20,7 +20,13 @@ import com.kitsu.medievalcraft.block.ModBlocks;
import com.kitsu.medievalcraft.block.ingots.IngotBase;
import com.kitsu.medievalcraft.crafting.ForgeAnvilCrafting;
import com.kitsu.medievalcraft.crafting.TestForgeCrafting;
import com.kitsu.medievalcraft.item.forms.clay.ClayForms;
import com.kitsu.medievalcraft.item.forms.iron.IronForms;
import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacket;
import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocY;
import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocZ;
import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgPacketLocX;
import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase;
import com.kitsu.medievalcraft.tileents.ingots.TileIronPlate;
import com.kitsu.medievalcraft.tileents.ingots.TileMyIronIngot;
import com.kitsu.medievalcraft.tileents.machine.TileEntityAnvilForge;
@@ -79,21 +85,53 @@ public class ForgeHammer extends Item implements IronFormNames{
tilePlate = (TileIronPlate) world.getTileEntity(x, y, z);
}
if((block instanceof IngotBase)&&(blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)){
if((block instanceof IngotBase)&&(blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)&&(block!=ModBlocks.ironPlate)){
TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z);
if(tileEnt.getStackInSlot(0).getItem() instanceof IronForms){
if(){
TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z);
if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){
p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
Main.sNet.sendToAll(new MsgPacket(true));
Main.sNet.sendToAll(new MsgPacketLocX(x));
Main.sNet.sendToAll(new MsgPacketLocY(y));
Main.sNet.sendToAll(new MsgPacketLocZ(z));
tile.hits++;
if(tile.hits >= 3 + rand.nextInt(3)){
world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, forms.get(tileEnt.getStackInSlot(0).getItem())));
stack.damageItem(1, p);
world.setBlock(x, y, z, Blocks.air, 0, 2);
if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){
if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){
tileEnt.decrStackSize(0, 1);
}
else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1);
}
}
}
}
if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){
p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
Main.sNet.sendToAll(new MsgPacket(true));
Main.sNet.sendToAll(new MsgPacketLocX(x));
Main.sNet.sendToAll(new MsgPacketLocY(y));
Main.sNet.sendToAll(new MsgPacketLocZ(z));
tile.hits++;
if(tile.hits >= 3 + rand.nextInt(3)){
world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem())));
stack.damageItem(1, p);
world.setBlock(x, y, z, Blocks.air, 0, 2);
tileEnt.decrStackSize(0, 1);
tile.markForUpdate();
}
}
}
}
/*if((block == blockToRun(block)) && (blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)){
TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z);
if((tileEnt.getStackInSlot(0) == null) && (blockKey == 0)){
if (rand.nextInt(2) == 0 ) {
tileRefIngot.hits++;
@@ -171,7 +209,7 @@ public class ForgeHammer extends Item implements IronFormNames{
Main.sNet.sendToAll(new MsgPacketlTicks(x));
Main.sNet.sendToAll(new MsgPacketLocY(y));
Main.sNet.sendToAll(new MsgPacketLocZ(z));
if (rand.nextInt(2) == 0 ) {
tilePlate.hits++;
}
@@ -251,7 +289,7 @@ public class ForgeHammer extends Item implements IronFormNames{
}
}
}
*/
*/
}
/*

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayAxeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayAxeForm extends ClayForms{
public CClayAxeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayBattleAxeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayBattleAxeForm extends ClayForms{
public CClayBattleAxeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayDaggerForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayDaggerForm extends ClayForms{
public CClayDaggerForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayHoeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayHoeForm extends ClayForms{
public CClayHoeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayLongswordForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayLongswordForm extends ClayForms{
public CClayLongswordForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayMaceHeadForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayMaceHeadForm extends ClayForms{
public CClayMaceHeadForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayPickaxeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayPickaxeForm extends ClayForms{
public CClayPickaxeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayRingForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayRingForm extends ClayForms{
public CClayRingForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySawBladeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClaySawBladeForm extends ClayForms{
public CClaySawBladeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySharpTipForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClaySharpTipForm extends ClayForms{
public CClaySharpTipForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClayShortSwordForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClayShortSwordForm extends ClayForms{
public CClayShortSwordForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpadeForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClaySpadeForm extends ClayForms{
public CClaySpadeForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

12
src/main/java/com/kitsu/medievalcraft/item/forms/clay/CClaySpearTipForm.java Normal file
View File

@@ -0,0 +1,12 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
public class CClaySpearTipForm extends ClayForms{
public CClaySpearTipForm(String name, Item item) {
super(name, item);
// TODO Auto-generated constructor stub
}
}

22
src/main/java/com/kitsu/medievalcraft/item/forms/clay/ClayForms.java Normal file
View File

@@ -0,0 +1,22 @@
package com.kitsu.medievalcraft.item.forms.clay;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import com.kitsu.medievalcraft.Main;
import com.kitsu.medievalcraft.util.CustomTab;
import cpw.mods.fml.common.registry.GameRegistry;
public abstract class ClayForms extends Item {
protected ClayForms(String name, Item item){
setMaxStackSize(1);
setUnlocalizedName(name);
setCreativeTab(CustomTab.MedievalCraftTab);
setTextureName(Main.MODID + ":" + name);
setHasSubtypes(false);
item = this;
GameRegistry.registerItem(this, name);
}
}