diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index df738fb5..3cb7d0ab 100644 Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class index 06d6e98a..4a2f389d 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class differ diff --git a/bin/mcmod.info b/bin/mcmod.info index 18a9e0f5..edc9b5da 100644 --- a/bin/mcmod.info +++ b/bin/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.3.1}", + "version": "{2.3.4}", "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", diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index 6b3843ba..89a64139 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -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.1"; + public static final String VERSION = "2.3.4"; public static SimpleNetworkWrapper sNet; @@ -110,7 +110,7 @@ public class Main { BucketHandle.INSTANCE.buckets.put(ModBlocks.blockTannin, ModItems.tanninBucket); BucketHandle.INSTANCE.buckets.put(ModBlocks.blockSlackedLime, ModItems.slackBucket); - //EntityRegistry.registerModEntity(EntityShit.class, "itemShit", 1, this, 64, 10, true); + EntityRegistry.registerModEntity(EntityShit.class, "itemShit", 1, this, 64, 10, true); EntityRegistry.registerModEntity(EntityModelArrow.class, "itemModelArrow", 2, this, 64, 10, true); EntityRegistry.registerModEntity(EntityITSpear.class, "itemITSpear", 3, this, 64, 10, true); EntityRegistry.registerModEntity(EntityTester.class, "itemTester", 4, this, 64, 10, true); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java index 6262a3c3..7875ca63 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java @@ -239,6 +239,7 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ if(isItemFuel(stack)==true){ this.ticks++; double burnTime = (this.getItemBurnTime(stack)+((fuelMulti(stack.stackSize, stack)*this.getItemBurnTime(stack)))); + //System.out.println(this.ticks); if(time >= burnTime){ decrStackSize(0, 1); this.ticks=0; @@ -249,29 +250,30 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ } } private static double fuelMulti(int i, ItemStack stack){ + double a=0; if(stack!=null){ if(stack.stackSize<=15){ - return 0.25; + a=0.25; } if(stack.stackSize>=16 && stack.stackSize<=31){ - return 0.5; + a=0.5; } if(stack.stackSize>=32 && stack.stackSize<=47){ - return 0.75; + a=0.75; } if(stack.stackSize>=48){ - return 1; + a=1; } } - return 0.0d; + return a; } - public static int getItemBurnTime(ItemStack p_145952_0_) + public static int getItemBurnTime(ItemStack stack) { - if (p_145952_0_ == null) + if (stack == null) { return 0; } - Item item = p_145952_0_.getItem(); + Item item = stack.getItem(); if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.air) { @@ -291,6 +293,7 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ { return 16000; } + } if (item instanceof ItemTool && ((ItemTool)item).getToolMaterialName().equals("WOOD")) return 200; @@ -301,11 +304,14 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ if (item == Items.lava_bucket) return 20000; if (item == Item.getItemFromBlock(Blocks.sapling)) return 100; if (item == Items.blaze_rod) return 2400; - return GameRegistry.getFuelValue(p_145952_0_); + return GameRegistry.getFuelValue(stack); } public static boolean isItemFuel(ItemStack stack) { - return getItemBurnTime(stack) > 0; + if(getItemBurnTime(stack)>0){ + return true; + } else + return false; } public void isFurnace(World world, int x, int y, int z){ if(world.getBlock(x, y+1, z).equals(Blocks.furnace)&&(world.getBlockMetadata(x, y, z)==1)){ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 18a9e0f5..edc9b5da 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.3.1}", + "version": "{2.3.4}", "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",