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 f392fe19..782ace04 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 @@ -1,44 +1,29 @@ package nmd.primal.forgecraft.blocks.Crucibles; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; 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.common.helper.NBTHelper; import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.core.common.helper.WorldHelper; -import nmd.primal.core.common.tiles.machines.TileStorageCrate; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.crafting.CrucibleCrafting; -import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.ItemCrucible; import nmd.primal.forgecraft.items.SlottedTongs; -import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileNBTCrucible; import java.util.Random; @@ -126,7 +111,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider, return NBTHelper.getStackBlockNBT(world, pos, state, super.getItem(world, pos, state)); } - @Override public boolean takeBlock(World world, BlockPos pos, IBlockState state, EnumFacing face, EntityPlayer player) { if (world.isRemote) @@ -134,8 +118,9 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider, TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileNBTCrucible) { +//World world, BlockPos pos, EnumFacing face, EntityPlayer player, EnumHand hand, ItemStack stack + PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, player.getActiveHand(), this.getItem(world, pos, state)); - PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, this.getItem(world, pos, state)); //world.updateComparatorOutputLevel(pos, state.getBlock()); return world.setBlockState(pos, this.getReplacementBlock(world, pos, state)); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 426a25bd..c8edcef6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -36,7 +36,7 @@ public class ModItems { //public static Item test; public static Item itemnbtcrucible; public static Item slottedtongs; - public static Item itemcrucible; + // public static Item itemcrucible; public static Item bellowshandle; public static Item forgehammer; public static Item softcrucible; @@ -149,7 +149,7 @@ public class ModItems { //pistonbellows = new ItemBellowsHandle("pistonbellows"); itemnbtcrucible = new ItemNBTCrucible("itemnbtcrucible", ModBlocks.nbtCrucible); slottedtongs = new SlottedTongs("slottedtongs"); - itemcrucible = new ItemCrucible("itemcrucible"); + //itemcrucible = new ItemCrucible("itemcrucible"); bellowshandle = new BaseItem("bellowshandle"); softcrucible = new ItemSoftCrucible("softcrucible"); stonetongs = new ItemStoneTongs("stonetongs"); @@ -276,7 +276,7 @@ public class ModItems { public static void register() { ForgeRegistries.ITEMS.register(itemnbtcrucible); ForgeRegistries.ITEMS.register(slottedtongs); - ForgeRegistries.ITEMS.register(itemcrucible); + //ForgeRegistries.ITEMS.register(itemcrucible); ForgeRegistries.ITEMS.register(castingmud); ForgeRegistries.ITEMS.register(bellowshandle); ForgeRegistries.ITEMS.register(softcrucible); @@ -397,7 +397,7 @@ public class ModItems { @SideOnly(Side.CLIENT) public static void registerRenders() { registerRender(itemnbtcrucible); - registerRender(itemcrucible); + //registerRender(itemcrucible); registerRender(castingmud); registerRender(bellowshandle); registerRender(softcrucible); diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json index 73d7acf3..0eea6329 100644 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json @@ -7,6 +7,7 @@ } }, "variants": { - "normal": { "model": "forgecraft:crucibleshut" } + "normal": { "model": "forgecraft:crucibleshut" }, + "inventory": { "model": "forgecraft:item/itemnbtcrucible" } } } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/itemnbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/itemnbtcrucible.json new file mode 100644 index 00000000..23e3ab1e --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/itemnbtcrucible.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:block/crucibleshut", + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/nbtcrucible/nbtcrucible_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/nbtcrucible/nbtcrucible_1"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_0.json similarity index 62% rename from kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_0.json index 0b7be2fb..11dc9a16 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_0.json @@ -1,8 +1,7 @@ { - "forge_marker":1, + "parent": "forgecraft:block/crucibleshut", "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" + } } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_1.json b/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_1.json new file mode 100644 index 00000000..dc40087f --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/nbtcrucible/nbtcrucible_1.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:block/crucibleshut", + "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/assets/forgecraft/models/item/testnbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/testnbtcrucible.json new file mode 100644 index 00000000..214c15e5 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/testnbtcrucible.json @@ -0,0 +1,3 @@ +{ + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file