From ec08e00c9e661b49085c8c76e97744e73b11fa09 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 27 Jan 2017 20:19:21 -0500 Subject: [PATCH] fixed the damn empty crucibles --- .../forgecraft/blocks/EmptyCrucible.java | 44 +++++- .../nmd/primal/forgecraft/init/ModBlocks.java | 12 ++ .../primal/forgecraft/init/ModCrafting.java | 10 +- .../primal/forgecraft/tiles/TileBloomery.java | 14 +- .../forgecraft/blockstates/emptycrucible.json | 5 +- .../blockstates/emptycruciblecracked.json | 12 ++ .../blockstates/emptycruciblecrackedhot.json | 12 ++ .../blockstates/emptycruciblehot.json | 12 ++ .../models/block/emptycruciblecracked.json | 144 ----------------- .../models/block/emptycruciblecrackedhot.json | 144 ----------------- .../models/block/emptycruciblehot.json | 145 ------------------ .../forgecraft/models/item/emptycrucible.json | 8 + .../models/item/emptycruciblecracked.json | 8 + .../models/item/emptycruciblecrackedhot.json | 8 + .../models/item/emptycruciblehot.json | 8 + .../textures/blocks/stone_slab_cracked.png | Bin 0 -> 478 bytes .../blocks/stone_slab_cracked_hot.png | Bin 0 -> 518 bytes 17 files changed, 135 insertions(+), 451 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecracked.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecrackedhot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblehot.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecracked.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecrackedhot.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/emptycrucible.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked_hot.png diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java index 54101a1d..ae6522a8 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java @@ -8,15 +8,20 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; 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.forgecraft.CommonUtils; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.tiles.TileFirebox; /** * Created by mminaie on 1/24/17. @@ -25,21 +30,54 @@ public class EmptyCrucible extends Block { protected static final AxisAlignedBB boundBox = new AxisAlignedBB(4/16D, 0.0D, 4/16D, 12/16D, 7/16D, 12/16D); - public static final PropertyInteger SIZE = PropertyInteger.create("size", 0, 3); + //public static final PropertyInteger SIZE = PropertyInteger.create("size", 0, 3); public EmptyCrucible(Material material, String registryName) { super(material); setUnlocalizedName(ModInfo.ForgecraftBlocks.EMPTYCRUCIBLE.getUnlocalizedName()); + //setUnlocalizedName("emptycrucible"); setRegistryName(registryName); //setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); setCreativeTab(ModInfo.TAB_FORGECRAFT); setHardness(3.0f); - this.blockState.getBaseState().withProperty(SIZE, Integer.valueOf(0)); + //this.blockState.getBaseState().withProperty(SIZE, Integer.valueOf(0)); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + /*if (!world.isRemote) { + System.out.println(state.getValue(SIZE)); + //TileFirebox tile = (TileFirebox) world.getTileEntity(pos); + //if (tile != null) { + ItemStack pItem = player.inventory.getCurrentItem(); + if(pItem.isEmpty()) { + if (player.isSneaking()) { + CommonUtils.spawnItemEntity(world, player, new ItemStack(this, 1, this.getMetaFromState(state))); + } + } + + if(state.getValue(SIZE) == 3){ + world.setBlockState(pos, state.withProperty(SIZE, 0), 2); + return true; + } else + world.setBlockState(pos, state.withProperty(SIZE, state.getValue(SIZE) + 1), 2); + return true; + } + if(player.isSneaking()){ + + }*/ + return false; } // ***************************************************************************** // // BlockState // ***************************************************************************** // + /*@Override + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + { + worldIn.setBlockState(pos, state.withProperty(SIZE, 0), 2); + } + @Override public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { @@ -88,7 +126,7 @@ public class EmptyCrucible extends Block { return i; } return i; - } + }*/ @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 7684a692..de74053b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -26,6 +26,9 @@ public class ModBlocks { public static Block pistonbellowsdarkoak; public static Block pistonbellowsacacia; public static Block emptycrucible; + public static Block emptycruciblehot; + public static Block emptycruciblecracked; + public static Block emptycruciblecrackedhot; public static void init() { @@ -39,6 +42,9 @@ public class ModBlocks { pistonbellowsacacia = new PistonBellows(Material.WOOD, "pistonbellowsacacia"); bloomery = new Bloomery(Material.ROCK, "bloomery"); emptycrucible = new EmptyCrucible(Material.ROCK, "emptycrucible"); + emptycruciblehot = new EmptyCrucible(Material.ROCK, "emptycruciblehot"); + emptycruciblecracked = new EmptyCrucible(Material.ROCK, "emptycruciblecracked"); + emptycruciblecrackedhot = new EmptyCrucible(Material.ROCK, "emptycruciblecrackedhot"); } public static void register() { @@ -51,6 +57,9 @@ public class ModBlocks { registerBlock(pistonbellowsacacia); registerBlock(bloomery); registerBlock(emptycrucible); + registerBlock(emptycruciblehot); + registerBlock(emptycruciblecracked); + registerBlock(emptycruciblecrackedhot); } public static void registerRenders() { @@ -63,6 +72,9 @@ public class ModBlocks { registerRender(pistonbellowsacacia); registerRender(bloomery); registerRender(emptycrucible); + registerRender(emptycruciblehot); + registerRender(emptycruciblecracked); + registerRender(emptycruciblecrackedhot); } private static void registerBlock(Block block) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 2cdcf3f6..12dacdbd 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -38,17 +38,17 @@ public class ModCrafting { //DryingRecipe.addRecipe(new ItemStack(Items.FISH, 1, 0), new ItemStack(PrimalItems.FISH_COD_DRIED), new ItemStack(PrimalItems.FISH_COD_ROTTEN), 25, 0.006F); BloomeryCrafting.addRecipe( new ItemStack(ModItems.softcrucible, 1), + new ItemStack(ModBlocks.emptycruciblehot, 1), new ItemStack(ModBlocks.emptycrucible, 1), - new ItemStack(Items.STICK, 1), - 2100, - 2400, + 500, + 1200, 0.25f, 0.25f); BloomeryCrafting.addRecipe( new ItemStack(ModBlocks.emptycrucible, 1), - new ItemStack(Items.STICK, 1), - new ItemStack(Items.STICK, 1), + new ItemStack(Items.STICK, 1, 3), + new ItemStack(Items.STICK, 1, 3), 2700, 9000, 0.0f, diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 56d03080..59e90907 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -76,7 +76,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { } } if(cookCounter > recipe.getIdealTime() + (recipe.getIdealTime() * recipe.getTimeVariance())){ - if(this.getSlotStack(1) == recipe.getInput()) { + if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; System.out.print(" :Failure Time: " + this.getSlotStack(1)); @@ -85,11 +85,13 @@ public class TileBloomery extends TileBaseSlot implements ITickable { } } if(this.getHeat() > recipe.getHeatThreshold() + (recipe.getHeatThreshold() * recipe.getHeatVariance())){ - this.setSlotStack(1, recipe.getOutputFailed()); - this.cookCounter = 0; - System.out.print(" :Failure Heat: " + this.getSlotStack(1)); - this.updateBlock(); - this.markDirty(); + if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { + this.setSlotStack(1, recipe.getOutputFailed()); + this.cookCounter = 0; + System.out.print(" :Failure Heat: " + this.getSlotStack(1)); + this.updateBlock(); + this.markDirty(); + } } if (this.getSlotStack(1).isEmpty()){ this.cookCounter=0; diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/emptycrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycrucible.json index b3b043ae..d42f0e0b 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/emptycrucible.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycrucible.json @@ -1,8 +1,5 @@ { "variants": { - "size=0": { "model": "forgecraft:emptycrucible" }, - "size=1": { "model": "forgecraft:emptycruciblehot" }, - "size=2": { "model": "forgecraft:emptycruciblecracked" } - "size=3": { "model": "forgecraft:emptycruciblecrackedhot" } + "normal": { "model": "forgecraft:emptycrucible" } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecracked.json b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecracked.json new file mode 100644 index 00000000..8fdc1bcf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecracked.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_cracked", + "texture": "forgecraft:blocks/stone_slab_cracked" + } + }, + "variants": { + "normal": { "model": "forgecraft:emptycrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecrackedhot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecrackedhot.json new file mode 100644 index 00000000..b826ba50 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblecrackedhot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_cracked_hot", + "texture": "forgecraft:blocks/stone_slab_cracked_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:emptycrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblehot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblehot.json new file mode 100644 index 00000000..dfc73f1c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/emptycruciblehot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:emptycrucible" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecracked.json b/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecracked.json deleted file mode 100644 index b538fc80..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecracked.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab_cracked" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 5, 0, 5 ], - "to": [ 11, 1, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 5 ], - "to": [ 11, 7, 6 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 10 ], - "to": [ 11, 7, 11 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 5, 1, 6 ], - "to": [ 6, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 10, 1, 6 ], - "to": [ 11, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 4, 5, 6 ], - "to": [ 5, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 11, 5, 6 ], - "to": [ 12, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 6, 5, 4 ], - "to": [ 10, 6, 5 ], - "faces": { - "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube18", - "from": [ 6, 5, 11 ], - "to": [ 10, 6, 12 ], - "faces": { - "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [ 0.1, 1.1, -2.35 ] - }, - "firstperson_righthand": { - "translation": [ 0, 4, 0 ] - }, - "gui": { - "translation": [ 0, 4, 0 ] - }, - "ground": { - "translation": [ 0, 4, 0 ] - }, - "fixed": { - "rotation": [ 45, 45, 0 ], - "translation": [ 0, 4, 0 ] - } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecrackedhot.json b/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecrackedhot.json deleted file mode 100644 index ed8550e2..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblecrackedhot.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab_cracked_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 5, 0, 5 ], - "to": [ 11, 1, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 5 ], - "to": [ 11, 7, 6 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 10 ], - "to": [ 11, 7, 11 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 5, 1, 6 ], - "to": [ 6, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 10, 1, 6 ], - "to": [ 11, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 4, 5, 6 ], - "to": [ 5, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 11, 5, 6 ], - "to": [ 12, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 6, 5, 4 ], - "to": [ 10, 6, 5 ], - "faces": { - "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube18", - "from": [ 6, 5, 11 ], - "to": [ 10, 6, 12 ], - "faces": { - "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [ 0.1, 1.1, -2.35 ] - }, - "firstperson_righthand": { - "translation": [ 0, 4, 0 ] - }, - "gui": { - "translation": [ 0, 4, 0 ] - }, - "ground": { - "translation": [ 0, 4, 0 ] - }, - "fixed": { - "rotation": [ 45, 45, 0 ], - "translation": [ 0, 4, 0 ] - } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblehot.json deleted file mode 100644 index e6f7335e..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/emptycruciblehot.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 5, 0, 5 ], - "to": [ 11, 1, 11 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "west": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 5 ], - "to": [ 11, 7, 6 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube11", - "from": [ 5, 1, 10 ], - "to": [ 11, 7, 11 ], - "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 5, 1, 6 ], - "to": [ 6, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 10, 1, 6 ], - "to": [ 11, 7, 10 ], - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 4, 5, 6 ], - "to": [ 5, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube15", - "from": [ 11, 5, 6 ], - "to": [ 12, 6, 10 ], - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 6, 5, 4 ], - "to": [ 10, 6, 5 ], - "faces": { - "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, - "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube18", - "from": [ 6, 5, 11 ], - "to": [ 10, 6, 12 ], - "faces": { - "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, - "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, - "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [ 0.1, 1.1, -2.35 ] - }, - "firstperson_righthand": { - "translation": [ 0, 4, 0 ] - }, - "gui": { - "translation": [ 0, 4, 0 ] - }, - "ground": { - "translation": [ 0, 4, 0 ] - }, - "fixed": { - "rotation": [ 45, 45, 0 ], - "translation": [ 0, 4, 0 ] - } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/emptycrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/emptycrucible.json new file mode 100644 index 00000000..8d090e7a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/emptycrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/emptycrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json new file mode 100644 index 00000000..8d419578 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_cracked", + "texture": "forgecraft:blocks/stone_slab_cracked" + }, + "parent": "forgecraft:block/emptycrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json new file mode 100644 index 00000000..b8f9a6f2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_cracked_hot", + "texture": "forgecraft:blocks/stone_slab_cracked_hot" + }, + "parent": "forgecraft:block/emptycrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json new file mode 100644 index 00000000..ca445aaf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/emptycrucible" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked.png new file mode 100644 index 0000000000000000000000000000000000000000..7165a55b57f9157f9cca76be03a7c3ee06cf724c GIT binary patch literal 478 zcmV<40U`d0P)97CL=(7%cz*0c%M_ zK~y-)b(68G<1i3K&n}iMFv3JG0_oBvzmcEI*SR;ONEb+vLI{Cu7rRB6d2+~8HI_y* z=U$EfT(8%E^E^|pwr%OU4uHqw!QpTq=ghaf2HC7y!Di!#PJO<%eJx21+Ra7-PseZxW3$+5p(ZjRej)Qc3_= zYgyNIlUU1;6=S5C=UEX2v%V-qLRd@f`<^C*fcIV#K0B6D)U;2M+wDg4tvaA`K8=+e zW6YaC^vi1u!?1DvH~sP=P2J5}tMR(7svjVP!1MXs6wNvFS8(bs-g~_FiW@>;97o+Z z#;EKj#;9h=d)G6u-|rd6k>l~G`yx5UNYnTI#=P1nxqLpKH>S#Y-}i3`g73X&S(eRA zh)2t^D3wT769qq|q*GX984BDqG)@2j0h38Y zK~y-)ZIiu@6EP6Se_+R67uKGly&y%3prL}|DmqHuf+yjz?iJEqMM;Hjby6gf2wm91 z>&+S{96R3Rrn1*F^Z%IHSNGq({_BTIN~hgkyJRVC;%;>;Mo_ zGxX1sL?Jcd1Q0>aXPFLSW*OZ6)Wi@*KS?ZQq}X;nvLA*_G0`jw6Qjg16jB$qLe}*y z$}~CQ5-}XRY}zH0pY0E%cZaL)K$df9Y|0T*M+QlMnuf8fiR)qXS5rx$P0j0s7K=cNtf&KN%TDpV8;b zyQ{rOTk72*ZsO+gA*22AfBEq73%hm=!0*lX{8s+Xl~Mrw2RG5~^rXxo6aWAK07*qo IM6N<$g0|A-K>z>% literal 0 HcmV?d00001