From 622a3f4b17d0f71ac42ddf84a62035656a074e05 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 4 Sep 2017 13:24:17 -0400 Subject: [PATCH] fixing bugs --- kfc/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../forgecraft/blocks/Anvil/AnvilStone.java | 4 +-- .../primal/forgecraft/tiles/TileBloomery.java | 26 ++++++++++++++++--- .../primal/forgecraft/tiles/TileForge.java | 21 +++++++++++++-- kfc/src/main/resources/mcmod.info | 2 +- 6 files changed, 47 insertions(+), 10 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 6c569123..d99fe0d1 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.3.1 +mod_version=1.3.2 forge_version=14.22.0.2463 mcp_mappings=snapshot_20170624 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index c0a66045..066e87f1 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.3.1"; + public static final String MOD_VERSION = "1.3.2"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.0,2344,);" + "required-after:primal@[0.5,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java index 6364203b..4ad5458e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java @@ -42,7 +42,7 @@ public class AnvilStone extends AnvilBase { for (int i = 0; i < 25; i++) { tempArray[i] = tile.getSlotStack(i).getItem().getRegistryName().toString(); } - for (int i = 0; i < 25; i++) { + /*for (int i = 0; i < 25; i++) { if (tile.getSlotStack(i).getItem() instanceof BaseMultiItem) { if (((BaseMultiItem) tile.getSlotStack(i).getItem()).getMaterial(tile.getSlotStack(i).getItem()) != PrimalMaterials.TOOL_WROUGHT_IRON) { world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); @@ -52,7 +52,7 @@ public class AnvilStone extends AnvilBase { return true; } } - } + }*/ doAnvilRecipe(pItem, tempArray, world, tile, pos, player); return true; } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 735d5e98..f29de5cc 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -10,6 +10,7 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.helper.CommonUtils; @@ -41,6 +42,18 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(100); } this.iteration++; + if (this.iteration == 100) { + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } + } + if (this.iteration == 200) { + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } + } if (this.iteration == 300) { this.iteration = 0; //IBlockState state = world.getBlockState(this.pos); @@ -51,9 +64,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { world.notifyBlockUpdate(pos, state, state, 2); } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); - + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } } - slotZeroManager(world); slotOneManager(); } } @@ -103,10 +118,15 @@ public class TileBloomery extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(RecipeHelper.getBurnTime(this.getSlotStack(0)) / 5); + Integer decrInt = Math.round(RecipeHelper.getBurnTime(this.getSlotStack(0)) / 5); if(decrInt == 0) { decrInt = 1; } + //System.out.println(GameRegistry.getFuelValue(this.getSlotStack(0))); + //System.out.println( "Burn Time: " + RecipeHelper.getBurnTime(this.getSlotStack(0))); + //System.out.println("Burn Time / 5 :" + RecipeHelper.getBurnTime(this.getSlotStack(0))/5); + //System.out.println("Burn Time rounded: " + Math.round(RecipeHelper.getBurnTime(this.getSlotStack(0)) / 5)); + //System.out.println(decrInt); Integer size = this.getSlotStack(0).getCount(); Integer burnModifier = 0; if(size / 16 <= 1){ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 39565be6..62970350 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -46,6 +46,20 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ IBlockState aboveState = world.getBlockState(abovePos); Block block = world.getBlockState(abovePos).getBlock(); if (world.getBlockState(this.getPos()).getValue(PrimalStates.ACTIVE)) { + + if (this.iteration == 100) { + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } + } + if (this.iteration == 200) { + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } + } + if (this.iteration == 300) { this.iteration = 0; @@ -55,11 +69,14 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } - + RecipeHelper.fuelManger(world, this, this.getSlotStack(0)); + if(CommonUtils.randomCheck(1000)) { + makeSmoke(world, pos); + } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); } - slotZeroManager(world); + //slotZeroManager(world); craftingManager(); } } diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index c67fbd3c..a847393d 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.3.1", + "version": "1.3.2", "mcversion": "1.12.0", "url": "", "updateUrl": "",