diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java index 782ace04..eeaa77e0 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java @@ -3,6 +3,7 @@ package nmd.primal.forgecraft.blocks.Crucibles; import net.minecraft.block.BlockContainer; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +19,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.interfaces.IPickup; +import nmd.primal.core.api.interfaces.types.ITypeNBT; +import nmd.primal.core.api.interfaces.types.ITypeWood; import nmd.primal.core.common.helper.NBTHelper; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; @@ -54,6 +58,18 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider, TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos); ItemStack pItem = player.inventory.getCurrentItem(); ItemStack pItem1 = new ItemStack(pItem.getItem(), 1); + /**CLEARS THE INVENTORY**/ + if(player.isSneaking()){ + for(int i=0; i if (!stack1.isEmpty()) { GL11.glPushMatrix(); GL11.glTranslated(0, 0.50D, 0); - renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); + //renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); + renderItem.renderItem(stack1, ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } 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 b2ed3652..02f0fb76 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -93,11 +93,17 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if (this.getHeat() >= recipe.getCookTemp() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) { cookCounter++; - this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true); + //this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true); System.out.println("Cooking"); this.updateBlock(); this.markDirty(); } + if (cookCounter >= (recipe.getCookTime()/4) && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) { + this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true); + System.out.println("hot"); + this.updateBlock(); + this.markDirty(); + } if (cookCounter >= recipe.getCookTime() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) { this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("status", true); this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("heat", this.getHeat()); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java index 21313bdd..d9577aad 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java @@ -66,16 +66,17 @@ public class TileNBTCrucible extends BaseTile implements ITickable { @Override public void update () { if (!world.isRemote) { - World world = this.getWorld(); - IBlockState state = world.getBlockState(this.pos); + //World world = this.getWorld(); + //IBlockState state = world.getBlockState(this.pos); + coolManager(); } } private void coolManager() { - System.out.println(this.getHeat() + " " + this.getStatus() + " " + this.getDrops()); + System.out.println(this.getHeat() + " " + this.getHot() + " " + this.getDrops()); if(this.getHot()){ - System.out.println("Still Hot"); + //System.out.println("Still Hot"); if(this.getHeat() > 0){ this.setHeat( this.getHeat() - 1); System.out.println(this.getHeat()); diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json index 73d7acf3..674af720 100644 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json @@ -1,12 +1,19 @@ { "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, + "variants": { - "normal": { "model": "forgecraft:crucibleshut" } + "normal": { "model": "forgecraft:crucibleshut" }, + "active=false": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "active=true": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + } } } \ No newline at end of file diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 01764619..c2e6ebd8 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,11 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", -<<<<<<< HEAD - "version": "1.4.01", -======= "version": "1.4.06", ->>>>>>> master-1.12 "mcversion": "1.12.2", "url": "", "updateUrl": "",