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

firebow_change&bark_strip_change

Browse Source
This commit is contained in:
KitsuShadow
2016-01-31 20:40:26 -05:00
parent b0321dadef
commit 520ab3e1e0
10 changed files with 94 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ public class Main {
public static final String MODID = "kitsumedievalcraft";
public static final String MODNAME = "ForgeCraft";
public static final String VERSION = "2.3.4";
public static final String VERSION = "2.3.6";
public static SimpleNetworkWrapper sNet;

1
src/main/java/com/kitsu/medievalcraft/compat/ModDict.java
View File

@@ -29,6 +29,7 @@ public class ModDict {
OreDictionary.registerOre("clumpFuel", new ItemStack(ModBlocks.shitblock, 1, 0));
OreDictionary.registerOre("ingotBrickClay", new ItemStack(Items.brick, 1, 0));
OreDictionary.registerOre("cordageStrong", new ItemStack(Items.string, 1, 0));
//OreDictionary.registerOre("cordage", new ItemStack(ModItems.leatherString, 1, 0));
//OreDictionary.registerOre("itemLeather", ModItems.cutLeather);
//OreDictionary.replacements.put(new ItemStack(Item.leather), "itemLeather");

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

@@ -113,6 +113,7 @@ public final class ModCrafting {
'x', Items.string,
'y', Items.paper,
'z', new ItemStack(ModItems.woodPulp,2,0)});
GameRegistry.addRecipe(new ItemStack(ModItems.fineFilter), new Object[]
{"xyx", "zzz", "xyx",
'x', Items.string,
@@ -139,10 +140,8 @@ public final class ModCrafting {
'x', ModBlocks.damascus,
'y', ModItems.ironweaponHandle}));
GameRegistry.addRecipe(new ItemStack(ModItems.fireBow), new Object[]
{"xxx", "yxy",
'x', Items.stick,
'y', Items.string});
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fireBow),
new Object[]{" x ", "xyx", 'x', Items.stick, Character.valueOf('y'), "cordageStrong"}));
GameRegistry.addRecipe(new ShapedOreRecipe(ModItems.workBlade, true, new Object[]
{"x", "y",

170
src/main/java/com/kitsu/medievalcraft/events/EventHandle.java
View File

@@ -172,89 +172,93 @@ public void splitLogEvent(PlayerInteractEvent event){
if(!event.entity.worldObj.isRemote){
if (event.entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.entity;
if(player.inventory.getCurrentItem()!=null){
Block test = event.world.getBlock(event.x, event.y, event.z);
//Block isEmpty = event.world.getBlock(event.x, event.y + 1, event.z);
ItemStack itemStack = new ItemStack(ModItems.itemBark);
if((player.inventory.getCurrentItem() == null)) {
if((event.action == event.action.RIGHT_CLICK_BLOCK ) && ((test == Blocks.log)||test == Blocks.log2) ) { //&& (test == ModBlocks.testForge) && (isEmpty == Blocks.air)
if(test == Blocks.log){
player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.15F, 0.85F);
int woodMeta = event.world.getBlockMetadata(event.x,event.y, event.z);
if(woodMeta == 0 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
//ItemStack stickStack = new ItemStack(Items.stick);
if((player.inventory.getCurrentItem().getItem() == Items.stick)) {
if((event.action == event.action.RIGHT_CLICK_BLOCK ) && ((test == Blocks.log)||test == Blocks.log2) ) { //&& (test == ModBlocks.testForge) && (isEmpty == Blocks.air)
if(test == Blocks.log){
player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.15F, 0.85F);
int woodMeta = event.world.getBlockMetadata(event.x,event.y, event.z);
if(woodMeta == 0 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 4 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 8 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 1 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 5 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 9 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 2 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 6 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 10 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 3 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 7 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 11 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
}
if(woodMeta == 4 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 8 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanOak, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 1 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 5 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 9 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanSpruce, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 2 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 6 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 10 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanBirch, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 3 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 7 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 11 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y,event.z, ModBlocks.cleanJungle, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
}
if(test == Blocks.log2){
player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.2F, 0.8F);
int woodMeta = event.world.getBlockMetadata(event.x, event.y, event.z);
if(woodMeta == 0 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 4 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 8 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 1 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 5 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 9 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
if(test == Blocks.log2){
player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.2F, 0.8F);
int woodMeta = event.world.getBlockMetadata(event.x, event.y, event.z);
if(woodMeta == 0 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 4 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 8 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanAcacia, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 1 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 0, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 5 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 4, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
if(woodMeta == 9 && event.world.rand.nextInt(9)==0){
event.world.setBlock(event.x, event.y, event.z, ModBlocks.cleanDarkOak, 8, 2);
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y, event.z, new ItemStack(ModItems.itemBark, 1 + event.world.rand.nextInt(2), 0)));
}
}
}
}
@@ -285,7 +289,7 @@ public void splitLogEvent(PlayerInteractEvent event){
event.world.spawnEntityInWorld(new EntityItem(event.world, event.x, event.y+1, event.z, flintKnapped));
player.inventory.decrStackSize(player.inventory.currentItem, 1);
}
}
}
}
@@ -443,10 +447,10 @@ public void splitLogEvent(PlayerInteractEvent event){
}
}
}
/*@SubscribeEvent
public void onItemShitJoinEvent(ItemEvent event){
if(!event.entity.worldObj.isRemote){
if(event.entity.getgetEntityItem().getItem() == ModItems.itemShit){
@@ -470,7 +474,7 @@ public void splitLogEvent(PlayerInteractEvent event){
if ( rand.nextInt(1500) == 0 ) {
//Checks to see if the LivingUpdate is being applied to cow, if so:
if (event.entity instanceof EntityCow) {
event.entityLiving.dropItem(ModItems.itemShit, 1);
}
}

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

@@ -3,7 +3,7 @@
"modid": "kitsumedievalcraft",
"name": "ForgeCraft",
"description": "ForgeCraft",
"version": "{2.3.4}",
"version": "{2.3.6}",
"mcversion": "{1.7.10}",
"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",