diff --git a/1.11/To-Dos b/1.11/To-Dos index 50c9f0a5..be66650f 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -1,12 +1,23 @@ To-Dos *** Priority *** -- [ ] Tongs Extract from bloomery for Hot Iron -- [ ] Tongs Extract from bloomery for Hot Iron Finished -- [ ] Item Drop for failed crucible -- [ ] Try Submodel +- [ ] Block Drop for failed crucible +- [ ] Fix Bloomery Lit Texture +- [ ] Tile Firebox Heat Manager +- [ ] oreDictionary ingotBall to ingotIron +- [ ] Crafting Recipes +- [x] Bellows break texture +- [x] Bellows Pump Speed +- [x] Break IronCrucible gives back Ore +- [x] Tile Bloomery Heat Manager +- [x] Tongs Model for hotIron +- [x] Tongs Model for hotIronCooked +- [x] Tongs Model for hotIronBurnt +- [x] Tongs Extract from bloomery for Hot Iron +- [x] Tongs Extract from bloomery for Hot Iron Finished + - [ ] Anvil - [ ] Anvil Recipe Handler diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java index 2bcb2f8b..471d59e1 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java @@ -93,6 +93,7 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid if ((pItem.getItem() == Items.FLINT_AND_STEEL) //|| (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == Item.getItemFromBlock(Blocks.TORCH)) { world.setBlockState(pos, state.withProperty(ACTIVE, true), 2); + tile.setHeat(400); tile.markDirty(); tile.updateBlock(); return true; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java index a80bba26..8ad2eb65 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java @@ -11,6 +11,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -31,6 +32,8 @@ import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileFirebox; import org.apache.commons.lang3.StringUtils; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import java.util.List; import java.util.Random; @@ -91,8 +94,10 @@ public class Crucible extends Block { if(!world.isRemote){ spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.emptycrucible, 1)); if(StringUtils.isEmpty(this.getUnlocalizedName()) == false) { - if (checkDrops(this.getUnlocalizedName()).equals(this.getUnlocalizedName())) { - spawnItemEntityFromWorld(world, pos, new ItemStack(getItemFromName(this.getUnlocalizedName()), 1)); + if(checkDrops(this.getUnlocalizedName()) != null) { + if (checkDrops(this.getUnlocalizedName()).equals(this.getUnlocalizedName())) { + spawnItemEntityFromWorld(world, pos, new ItemStack(getItemFromName(this.getUnlocalizedName()), 1)); + } } } } @@ -104,13 +109,20 @@ public class Crucible extends Block { if(name.equals("tile.coolironcrucible")){ string = this.getUnlocalizedName(); } + if(name.equals("tile.rawironcrucible")){ + string = this.getUnlocalizedName(); + } + return string; } private Item getItemFromName(String name){ - if(name.equals(getUnlocalizedName())){ + if(name.equals("tile.coolironcrucible")){ return Item.getItemFromBlock(ModBlocks.ironball); - } else return Items.AIR; + } else if (name.equals("tile.rawironcrucible")){ + return Item.getItemFromBlock(Blocks.IRON_ORE); + } + else return Items.AIR; } @Override 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 e01a8a8c..791b7766 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 @@ -88,17 +88,17 @@ public class ModCrafting { 0.5f ); -//Remakes the Burnt Hot Iron Crucible +//Makes the Finished Hot Iron Crucible BloomeryCrafting.addRecipe( - new ItemStack(ModBlocks.failedironcruciblehot, 1), + new ItemStack(ModBlocks.hotcookedironcrucible, 1), new ItemStack(ModBlocks.failedironcruciblehot, 1), new ItemStack(ModBlocks.failedironcruciblehot, 1), new ItemStack(ModBlocks.failedironcrucible, 1), - 5000, - 5000, + 1550, + 1200, 800, - 0.0f, - 0.0f + 0.33f, + 0.5f ); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 66f999a9..d5ee1829 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -52,7 +52,11 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_default"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhotcracked")); + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhotcracked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotiron"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironcooked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironfailed") + ); ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { @Override @@ -67,6 +71,15 @@ public class ModItems { else if (stack.getTagCompound().getInteger("type") == 2 ) { return new ModelResourceLocation(stack.getItem().getRegistryName() + "_emptyhotcracked", "inventory"); } + else if (stack.getTagCompound().getInteger("type") == 3 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotiron", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 4 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotironcooked", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 5 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotironfailed", "inventory"); + } else return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); } return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index b5fc02c0..def79a15 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -11,7 +11,10 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.blocks.Crucible; +import nmd.primal.forgecraft.blocks.CrucibleHot; import nmd.primal.forgecraft.init.ModBlocks; +import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileBloomery; /** @@ -34,6 +37,7 @@ public class ItemStoneTongs extends Item { item.setTagCompound(new NBTTagCompound()); //this.setDamage(item, 1000); item.getTagCompound().setInteger("type", 0); + item.getTagCompound().setInteger("cooldown", 0); //item.getTagCompound().setBoolean("active", false); } } @@ -42,8 +46,50 @@ public class ItemStoneTongs extends Item { { if(!world.isRemote) { ItemStack itemstack = player.getHeldItem(hand); +/***** + Picks Up Hot Crucibles from the Ground + *****/ if (world.getBlockState(pos).getBlock() != ModBlocks.bloomery) { - if (world.getBlockState(pos).getMaterial() == Material.ROCK || world.getBlockState(pos).getMaterial() == Material.ROCK) { + if(world.getBlockState(pos).getBlock() instanceof CrucibleHot) { + TileBaseCrucible tileCrucible = (TileBaseCrucible) world.getTileEntity(pos); + if (world.getBlockState(pos).getBlock() == ModBlocks.emptycruciblehot) { + itemstack.getTagCompound().setInteger("type", 1); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.emptycruciblecrackedhot) { + itemstack.getTagCompound().setInteger("type", 2); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotironcrucible) { + itemstack.getTagCompound().setInteger("type", 3); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedironcrucible) { + itemstack.getTagCompound().setInteger("type", 4); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.failedironcruciblehot) { + itemstack.getTagCompound().setInteger("type", 5); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + } +/***** + Places the crucible from the Tongs to the World + *****/ + if ((world.getBlockState(pos).getBlock() instanceof Crucible) || (world.getBlockState(pos).getBlock() instanceof CrucibleHot)) { + return EnumActionResult.FAIL; + } else if (world.getBlockState(pos).getMaterial() == Material.ROCK || world.getBlockState(pos).getMaterial() == Material.SAND) + { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); if (world.getBlockState(tempPos).getBlock() == Blocks.AIR) { switch (itemstack.getTagCompound().getInteger("type")) { @@ -51,18 +97,39 @@ public class ItemStoneTongs extends Item { break; case 1: world.setBlockState(tempPos, ModBlocks.emptycruciblehot.getDefaultState(), 3); + TileBaseCrucible tileCrucible1 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible1.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 2: world.setBlockState(tempPos, ModBlocks.emptycruciblecrackedhot.getDefaultState(), 3); + TileBaseCrucible tileCrucible2 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible2.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; case 3: - return EnumActionResult.FAIL; + world.setBlockState(tempPos, ModBlocks.hotironcrucible.getDefaultState(), 3); + TileBaseCrucible tileCrucible3 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible3.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; case 4: - return EnumActionResult.FAIL; + world.setBlockState(tempPos, ModBlocks.hotcookedironcrucible.getDefaultState(), 3); + TileBaseCrucible tileCrucible4 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible4.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; case 5: - return EnumActionResult.FAIL; + world.setBlockState(tempPos, ModBlocks.failedironcruciblehot.getDefaultState(), 3); + TileBaseCrucible tileCrucible5 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible5.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; case 6: return EnumActionResult.FAIL; case 7: @@ -71,6 +138,9 @@ public class ItemStoneTongs extends Item { } } } +/***** + Pulls the crucible from the Bloomery + *****/ if (world.getBlockState(pos).getBlock() == ModBlocks.bloomery) { TileBloomery tile = (TileBloomery) world.getTileEntity(pos); if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.emptycruciblehot))) { @@ -81,8 +151,21 @@ public class ItemStoneTongs extends Item { itemstack.getTagCompound().setInteger("type", 2); tile.setSlotStack(1, ItemStack.EMPTY); return EnumActionResult.SUCCESS; - } else return EnumActionResult.FAIL; - } else return EnumActionResult.FAIL; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotironcrucible))) { + itemstack.getTagCompound().setInteger("type", 3); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedironcrucible))) { + itemstack.getTagCompound().setInteger("type", 4); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.failedironcruciblehot))) { + itemstack.getTagCompound().setInteger("type", 5); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } + else return EnumActionResult.FAIL; + } } return EnumActionResult.FAIL; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java index 6e6350a9..21c96b78 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java @@ -40,7 +40,7 @@ public class TilePistonBellowsRender extends TileEntitySpecialRenderer= recipe.getHeatThreshold()){ cookCounter++; } @@ -72,7 +72,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutput()); this.cookCounter = 0; - //System.out.print(" :Success: " + this.getSlotStack(1)); + System.out.print(" :Success: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -81,7 +81,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - //System.out.print(" :Failure Time: " + this.getSlotStack(1)); + System.out.print(" :Failure Time: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -90,7 +90,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - //System.out.print(" :Failure Heat: " + this.getSlotStack(1)); + System.out.print(" :Failure Heat: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -132,31 +132,26 @@ public class TileBloomery extends TileBaseSlot implements ITickable { return 1; } - private void heatManager(Integer h, IBlockState state, ItemStack stack){ + private void heatManager(Integer h, IBlockState state, ItemStack stack, World world, BlockPos pos){ if(state.getValue(Bloomery.ACTIVE) == true){ if(!stack.isEmpty()) { - if(h > 400) { + if(h > 0) { this.setHeat(h - 25); } - /*if(h < 400){ - this.setHeat(400); - }*/ + if(h < 10 ){ + world.setBlockState(pos, state.withProperty(Bloomery.ACTIVE, false), 2); + } } if(stack.isEmpty()){ - if(h > 50){ - this.setHeat(h - 25); - if(this.getHeat() < 50){ - this.setHeat(50); - } - } + world.setBlockState(pos, state.withProperty(Bloomery.ACTIVE, false), 2); } } if(state.getValue(Bloomery.ACTIVE) == false){ if(h > 50){ this.setHeat(h - 50); - if(this.getHeat() < 50){ - this.setHeat(50); - } + } + if(h < 0){ + this.setHeat(0); } } this.updateBlock(); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java index 1922f45e..8f99c04b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java @@ -23,18 +23,18 @@ public class TilePistonBellows extends BaseTile implements ITickable{ IBlockState state = world.getBlockState(this.pos); if (world.getBlockState(this.getPos()).getValue(PistonBellows.ACTIVE)) { iteration++; - if(iteration <= 35){ + if(iteration <= 30){ animateIteration++; // } - if(iteration > 35){ - animateIteration = 35 - (iteration - 35); + if(iteration > 30){ + animateIteration = 30 - (iteration - 30); if(animateIteration < 0){ animateIteration = 0; } // } - if(iteration > 71){ + if(iteration > 61){ iteration = 0; animateIteration = 0; world.setBlockState(this.getPos(), state.withProperty(PistonBellows.ACTIVE, false), 3); diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json index 756f30f5..ec457bab 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_acacia", "texture_test": "blocks/checker_test", "texture": "blocks/planks_acacia" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json index 48e895fd..74c4a11b 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_birch", "texture_test": "blocks/checker_test", "texture": "blocks/planks_birch" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json index 07d58f20..0584fbef 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_big_oak", "texture_test": "blocks/checker_test", "texture": "blocks/planks_big_oak" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json index f0b7d20c..919a60c5 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_jungle", "texture_test": "blocks/checker_test", "texture": "blocks/planks_jungle" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json index d5fbd503..ed645b2b 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_oak", "texture_test": "blocks/checker_test", "texture": "blocks/planks_oak" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json index 1a84fc23..cea93383 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json @@ -2,7 +2,7 @@ "forge_marker":1, "defaults": { "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_spruce", "texture_test": "blocks/checker_test", "texture": "blocks/planks_spruce" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows.json b/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows.json index 68dd5525..0ca4613e 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows.json @@ -1,7 +1,7 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/checker_test", + "particle": "blocks/planks_oak", "texture_test": "blocks/checker_test", "texture": "blocks/planks_oak" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json index 06d6aabf..21a4dcd0 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json @@ -1,92 +1,11 @@ { - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "forge_marker":1, "textures": { "particle": "blocks/planks_oak", "texture": "blocks/planks_oak", "texture1": "forgecraft:blocks/stone_slab" }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 4, 0, 0 ], - "to": [ 5, 1, 3 ], - "faces": { - "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, - "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, - "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube2", - "from": [ 11, 0, 0 ], - "to": [ 12, 1, 3 ], - "faces": { - "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, - "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, - "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube3", - "from": [ 4, 0, 3 ], - "to": [ 5, 1, 10 ], - "rotation": { "origin": [ 4, 0, 3 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, - "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 11, 0, 3 ], - "to": [ 12, 1, 10 ], - "rotation": { "origin": [ 12, 1, 3 ], "axis": "y", "angle": -45 }, - "faces": { - "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, - "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube5", - "from": [ 6.5, 0, 7.5 ], - "to": [ 7.5, 1, 16 ], - "faces": { - "down": { "uv": [ 6.5, 0, 7.5, 8.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 7.5, 7.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 8.5, 0, 7.5 ], - "to": [ 9.5, 1, 16 ], - "faces": { - "down": { "uv": [ 8.5, 0, 9.5, 8.5 ], "texture": "#texture" }, - "up": { "uv": [ 8.5, 7.5, 9.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } - } - } - ], + "parent": "forgecraft:item/stonetongs", "display": { "thirdperson_righthand": { "rotation": [60, 0, 0], @@ -107,4 +26,5 @@ "translation": [ 0, 0, 8 ] } } -} \ No newline at end of file +} + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default2.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default2.json deleted file mode 100644 index 75a38d2b..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default2.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:item/stonetongs" -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json index 504e4ef2..f088337d 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", "texture1": "forgecraft:blocks/stone_slab", "texture2": "forgecraft:blocks/stone_slab_hot" }, @@ -94,129 +94,129 @@ } }, { - "__comment": "Cube1", - "from": [ 5, -4, -3 ], - "to": [ 11, -3, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, - "south": { "uv": [ 7, 14, 13, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 12, 10 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 12, 10 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube11", + "__comment": "Cube16", "from": [ 5, -3, 2 ], "to": [ 11, 3, 3 ], "shade": false, "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube13", - "from": [ 5, -3, -2 ], - "to": [ 6, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube13", - "from": [ 10, -3, -2 ], - "to": [ 11, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube15", - "from": [ 4, 1, -2 ], - "to": [ 5, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube15", - "from": [ 11, 1, -2 ], - "to": [ 12, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" } + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } } }, { "__comment": "Cube17", - "from": [ 6, 1, -4 ], - "to": [ 10, 2, -3 ], - "shade": false, - "faces": { - "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture2" }, - "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture2" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube18", - "from": [ 6, 1, 3 ], - "to": [ 10, 2, 4 ], - "shade": false, - "faces": { - "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture2" }, - "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture2" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube11", "from": [ 5, -3, -3 ], "to": [ 11, 3, -2 ], "shade": false, "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 7, 11, 13 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" } + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube18", + "from": [ 5, -3, -2 ], + "to": [ 6, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube19", + "from": [ 10, -3, -2 ], + "to": [ 11, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube20", + "from": [ 5, -4, -3 ], + "to": [ 11, -3, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 11, 6 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 3, 6, 4 ], "texture": "#texture2" }, + "east": { "uv": [ 10, 3, 16, 4 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube21", + "from": [ 4, 1, -2 ], + "to": [ 5, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube22", + "from": [ 11, 1, -2 ], + "to": [ 12, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube23", + "from": [ 6, 1, -4 ], + "to": [ 10, 2, -3 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube24", + "from": [ 6, 1, 3 ], + "to": [ 10, 2, 4 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } } } ], diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhotcracked.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhotcracked.json index 82826832..fab8611e 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhotcracked.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhotcracked.json @@ -1,8 +1,8 @@ { "forge_marker":1, "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", "texture1": "forgecraft:blocks/stone_slab_cracked", "texture2": "forgecraft:blocks/stone_slab_cracked_hot" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot2.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotiron.json similarity index 51% rename from 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot2.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotiron.json index 504e4ef2..db7e2463 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot2.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotiron.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", "texture1": "forgecraft:blocks/stone_slab", "texture2": "forgecraft:blocks/stone_slab_hot" }, @@ -94,135 +94,149 @@ } }, { - "__comment": "Cube1", - "from": [ 5, -4, -3 ], - "to": [ 11, -3, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, - "south": { "uv": [ 7, 14, 13, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 12, 10 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 12, 10 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube11", + "__comment": "Cube16", "from": [ 5, -3, 2 ], "to": [ 11, 3, 3 ], "shade": false, "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube13", - "from": [ 5, -3, -2 ], - "to": [ 6, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube13", - "from": [ 10, -3, -2 ], - "to": [ 11, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube15", - "from": [ 4, 1, -2 ], - "to": [ 5, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube15", - "from": [ 11, 1, -2 ], - "to": [ 12, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture2" }, - "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" } + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } } }, { "__comment": "Cube17", - "from": [ 6, 1, -4 ], - "to": [ 10, 2, -3 ], - "shade": false, - "faces": { - "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture2" }, - "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture2" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube18", - "from": [ 6, 1, 3 ], - "to": [ 10, 2, 4 ], - "shade": false, - "faces": { - "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture2" }, - "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture2" }, - "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture2" }, - "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture2" }, - "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube11", "from": [ 5, -3, -3 ], "to": [ 11, 3, -2 ], "shade": false, "faces": { - "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 7, 11, 13 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture2" } + "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube18", + "from": [ 5, -3, -2 ], + "to": [ 6, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube19", + "from": [ 10, -3, -2 ], + "to": [ 11, 3, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube20", + "from": [ 5, -4, -3 ], + "to": [ 11, -3, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 5, 0, 11, 6 ], "texture": "#texture2" }, + "north": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "south": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 3, 6, 4 ], "texture": "#texture2" }, + "east": { "uv": [ 10, 3, 16, 4 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube21", + "from": [ 4, 1, -2 ], + "to": [ 5, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube22", + "from": [ 11, 1, -2 ], + "to": [ 12, 2, 2 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube23", + "from": [ 6, 1, -4 ], + "to": [ 10, 2, -3 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube24", + "from": [ 6, 1, 3 ], + "to": [ 10, 2, 4 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, + "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, + "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube25", + "from": [ 5.5, 3, -2.5 ], + "to": [ 10.5, 4, 2.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture2" }, + "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture2" }, + "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 10.5, 12, 15.5, 13 ], "texture": "#texture2" } } } ], "display": { "thirdperson_righthand": { - "rotation": [60, 0, 0], + "rotation": [ 60, 0, 0 ], "translation": [ 0, 8.9, 3.7 ] }, "firstperson_righthand": { diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironcooked.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironcooked.json new file mode 100644 index 00000000..70458ffb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironcooked.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironfailed.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironfailed.json new file mode 100644 index 00000000..d5e4a58b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironfailed.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot.png index 84289a5b..95fb0d63 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot.png and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot.png differ