From 8f30ff4e9657f703e73057bd7114909de1cb583b Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 12 Jun 2017 15:08:31 -0400 Subject: [PATCH] commiting b4 switch to bugfix branch --- 1.11/{To-Dos => To-Dos.md} | 3 +- .../forgecraft/blocks/BloomeryBase.java | 420 ++++++++++++++++++ .../forgecraft/blocks/PistonBellows.java | 46 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 5 +- .../primal/forgecraft/init/ModCrafting.java | 8 +- .../renders/blocks/TileBloomeryRender.java | 3 +- .../primal/forgecraft/tiles/TileBloomery.java | 35 ++ .../forgecraft/blockstates/bloomery.json | 24 +- .../blockstates/bloomery_adobe.json | 12 + .../forgecraft/models/block/bloomery2.json | 0 .../models/block/bloomery_adobe.json | 251 ++++++----- 1.11/stoneanvil.json | 59 --- 12 files changed, 627 insertions(+), 239 deletions(-) rename 1.11/{To-Dos => To-Dos.md} (99%) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json delete mode 100644 1.11/stoneanvil.json diff --git a/1.11/To-Dos b/1.11/To-Dos.md similarity index 99% rename from 1.11/To-Dos rename to 1.11/To-Dos.md index fee2a500..4b7d0267 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos.md @@ -3,7 +3,7 @@ To-Dos *** Bugs *** -*** Priority *** +*** Current Feature *** *** Feature Musket *** @@ -19,7 +19,6 @@ To-Dos *** Backlog *** - [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer -- [ ] Add Yew - [ ] Add Iron Ring Recipe - [ ] Add chainmail recipe - [ ] Add Iron Shield diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java new file mode 100644 index 00000000..25f593f9 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -0,0 +1,420 @@ +package nmd.primal.forgecraft.blocks; + +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +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.PrimalStates; +import nmd.primal.core.common.crafting.FireSource; +import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.core.common.helper.FireHelper; +import nmd.primal.core.common.helper.PlayerHelper; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.crafting.BloomeryCrafting; +import nmd.primal.forgecraft.tiles.TileBloomery; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +import static nmd.primal.core.common.helper.FireHelper.makeSmoke; + +/** + * Created by mminaie on 6/11/17. + */ +public class BloomeryBase extends CustomContainerFacing implements ITileEntityProvider { + + //public static final PropertyBool COVERED = PropertyBool.create("covered"); + private int maxHeat; + + public BloomeryBase(Material material, String registryName, Integer maxHeat) { + super(material); + setUnlocalizedName(ModInfo.ForgecraftBlocks.BLOOMERY.getUnlocalizedName()); + setRegistryName(registryName); + setCreativeTab(ModInfo.TAB_FORGECRAFT); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); + setHardness(3.0f); + this.maxHeat=maxHeat; + } + + public int getMaxHeat() { + return maxHeat; + } + + public void setMaxHeat(int maxHeat) { + this.maxHeat = maxHeat; + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) + { + return new TileBloomery(); + } + + @Override + public void randomTick(World world, BlockPos pos, IBlockState state, Random random) + { + this.updateTick(world, pos, state, random); + if(!world.isRemote){ + if(state.getValue(PrimalStates.ACTIVE) == true) { + FireHelper.makeSmoke(world, pos, 10); + } + } + } + + @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) { + TileBloomery tile = (TileBloomery) world.getTileEntity(pos); + if (tile != null) { + ItemStack pItem = player.inventory.getCurrentItem(); + ItemStack tileItem = tile.getSlotStack(0); + ItemStack tileItem1 = tile.getSlotStack(1); + if(pItem.isEmpty()) { + + if(!player.isSneaking()){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true){ + Integer bloomeryHeat = tile.getHeat(); + Integer idealTemp = null; + Integer cookCounter = tile.getCookCounter(); + Integer idealCookTime = null; + Integer remainingTime = null; + + String stringBloomeryHeat = bloomeryHeat.toString(); + String stringIdealTemp = ""; + String stringRemainingTime = ""; + + BloomeryCrafting recipe = BloomeryCrafting.getRecipe(tile.getSlotStack(1)); + if(recipe != null) { + idealTemp = recipe.getHeatThreshold(); + idealCookTime = recipe.getIdealTime(); + stringIdealTemp = idealTemp.toString(); + remainingTime = idealCookTime - cookCounter; + stringRemainingTime = remainingTime.toString(); + + } + + ITextComponent itextcomponent = new TextComponentString("Current Temp: " + stringBloomeryHeat + " Ideal Temp: " + stringIdealTemp + " Ticks Remaining: " + stringRemainingTime); + player.sendStatusMessage(itextcomponent, true); + //System.out.println(pos); + return true; + } + } + } + if(tile.getSlotStack(0) != ItemStack.EMPTY) { + if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) { + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, true), 2); + tile.setHeat(100); + tile.markDirty(); + tile.updateBlock(); + return true; + } + } + if((!pItem.isEmpty()) && tile.isItemValidForSlot(0, pItem)) { + if (!tileItem.isEmpty()){ + if(pItem.getItem() == tileItem.getItem()){ + if(tileItem.getCount() < 64){ + if(tileItem.getCount() + pItem.getCount() <= 64){ + tileItem.grow(pItem.getCount()); + player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); + tile.markDirty(); + tile.updateBlock(); + return true; + } + if(tileItem.getCount() + pItem.getCount() > 64){ + pItem.setCount(64-pItem.getCount()); + tileItem.setCount(64); + tile.markDirty(); + tile.updateBlock(); + return true; + } + } + } + } + if(tileItem.isEmpty()) { + tile.setSlotStack(0, pItem); + player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); + return true; + } + } + + if((!pItem.isEmpty()) && tile.isItemValidForSlot(1, pItem)) { + if (!tileItem1.isEmpty()) { + return false; + } + if(tileItem1.isEmpty()){ + ItemStack tempItem = new ItemStack(pItem.getItem(), 1); + tile.setSlotStack(1, tempItem); + pItem.shrink(1); + return true; + } + } + if (player.isSneaking()) { + if (!tile.getSlotStack(0).isEmpty()) { + if(player.inventory.getCurrentItem().getItem() instanceof ItemSpade) { + ItemStack returnStack = tile.getSlotStack(0).copy(); + PlayerHelper.spawnItemOnPlayer(world, player, returnStack); + tile.clearSlot(0); + return true; + } + } + } + } + } + return false; + } + + + @Override + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) + { + int lightState =0; + if(state.getValue(PrimalStates.ACTIVE) == true){ + lightState = 10; + } + return lightState; + } + + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return 0; + } + + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return true; + } + + @Override + public boolean isFireSource(World world, BlockPos pos, EnumFacing side) + { + if(!world.isRemote){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE)==true){ + return true; + } + } + return false; + } + + @Override + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity ent) + { + if(ent instanceof EntityPlayer){ + if(state.getValue(PrimalStates.ACTIVE) == true){ + ent.setFire(1); + } + } + } + + /** + * Called serverside after this block is replaced with another in Chunk, but before the Tile Entity is updated + */ + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) + { + if (!world.isRemote && world.getGameRules().getBoolean("doTileDrops")) + { + TileBloomery tile = (TileBloomery) world.getTileEntity(pos); + if (tile !=null) + { + for (ItemStack stack : tile.getSlotList()) + { + if (stack != null) { + float offset = 0.7F; + double offsetX = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + double offsetY = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + double offsetZ = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + EntityItem item = new EntityItem(world, pos.getX() + offsetX, pos.getY() + offsetY, pos.getZ() + offsetZ, stack); + item.setDefaultPickupDelay(); + world.spawnEntity(item); + } + } + } + } + super.breakBlock(world, pos, state); + } + + @Override + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + { + if(!worldIn.isRemote) { + worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)), 2); + } + } + + @Override + public int getMetaFromState(IBlockState state) { + int i = 0; + + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 0; + return i; + } + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 1; + return i; + } + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 2; + return i; + } + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 3; + return i; + } + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 4; + return i; + } + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 5; + return i; + } + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 6; + return i; + } + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 7; + return i; + } + + return i; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing enumfacing; + Boolean active; + switch (meta & 7) + { + case 0: + enumfacing = EnumFacing.EAST; + active = false; + break; + case 1: + enumfacing = EnumFacing.WEST; + active = false; + break; + case 2: + enumfacing = EnumFacing.SOUTH; + active = false; + break; + case 3: + enumfacing = EnumFacing.NORTH; + active = false; + break; + case 4: + enumfacing = EnumFacing.EAST; + active = true; + break; + case 5: + enumfacing = EnumFacing.WEST; + active = true; + break; + case 6: + enumfacing = EnumFacing.SOUTH; + active = true; + break; + case 7: + enumfacing = EnumFacing.NORTH; + active = true; + break; + default: + enumfacing = EnumFacing.NORTH; + active = false; + } + + return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(active)); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE}); + } + + @Override + public boolean isFullCube(IBlockState state) + { + return false; + } + + @Override + public boolean isFullyOpaque(IBlockState state) + { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) + { + return true; + } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) + { + return EnumBlockRenderType.MODEL; + } + + @SideOnly(Side.CLIENT) + @SuppressWarnings("incomplete-switch") + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) + { + if(state.getValue(PrimalStates.ACTIVE) == true) + { + double d0 = (double)pos.getX() + 0.5D; + double d1 = (double)pos.getY() + 0.2D; + double d2 = (double)pos.getZ() + 0.5D; + double d3 = 0.52D; + double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.35); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.0, 0.075); + + if (rand.nextDouble() < 0.1D) + { + world.playSound((double)pos.getX() + 0.5D, (double)pos.getY(), (double)pos.getZ() + 0.5D, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + } + if(rand.nextInt(4) == 1){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 2){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 3){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 4){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + } + } +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index b357bd3e..876ef336 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -93,16 +93,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.EAST)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.EAST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -124,16 +121,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.WEST)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.WEST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -155,16 +149,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.SOUTH)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.SOUTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -186,16 +177,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.NORTH)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.NORTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -395,9 +383,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } @@ -412,9 +400,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } @@ -429,9 +417,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -446,9 +434,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.NORTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -460,7 +448,7 @@ public class PistonBellows extends CustomContainerFacing { double d1 = (double)pos.getY() + 0.2D; double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.25); + double d4 = ThreadLocalRandom.current().nextDouble(0.066, 0.33); double ySpeed = ThreadLocalRandom.current().nextDouble(0.05, 0.20); if(rand.nextInt(3) == 0){ 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 5c64bcc9..d90904b0 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 @@ -30,6 +30,7 @@ public class ModBlocks { public static Block firebox; public static Block bloomery; + public static Block bloomery_adobe; public static Block blockbreaker; public static Block pistonbellowsoak; @@ -88,7 +89,8 @@ public class ModBlocks { public static void init() { firebox = new Forge(Material.ROCK); - bloomery = new Bloomery(Material.ROCK, "bloomery"); + bloomery = new BloomeryBase(Material.ROCK, "bloomery", 1500); + bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 1560); blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); @@ -365,6 +367,7 @@ public class ModBlocks { public static void register() { registerBlock(firebox); registerBlock(bloomery); + registerBlock(bloomery_adobe); registerBlock(blockbreaker); registerBlock(pistonbellowsoak); 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 36ac03b4..91d88740 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 @@ -217,7 +217,7 @@ public class ModCrafting { new ItemStack(ModBlocks.emptycruciblehot, 1), new ItemStack(ModBlocks.emptycruciblecrackedhot, 1), new ItemStack(ModBlocks.emptycrucible, 1), - 2100, + 1450, 1600, 600, 0.25f, @@ -254,7 +254,7 @@ public class ModCrafting { new ItemStack(ModBlocks.hotcookedironcrucible, 1), new ItemStack(ModBlocks.failedironcruciblehot, 1), new ItemStack(ModBlocks.coolironcrucible, 1), - 1550, + 1400, 1200, 800, 0.33f, @@ -306,14 +306,14 @@ public class ModCrafting { new ItemStack(ModBlocks.hotcookedsteelcrucible, 1), new ItemStack(ModBlocks.failedsteelcrucible, 1), new ItemStack(ModBlocks.coolsteelcrucible, 1), - 1550, + 2100, 1500, 1000, 0.2f, 0.25f ); - //PLACE HOLDER FOR WOOTZ + //TODO PLACE HOLDER FOR WOOTZ /****************************************************************************** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java index 0cc59cc0..14a8d5f5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.Bloomery; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; @@ -25,7 +26,7 @@ public class TileBloomeryRender extends TileEntitySpecialRenderer BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); - if (state.getBlock() instanceof Bloomery) { + if (state.getBlock() instanceof BloomeryBase) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y + 0.0626D, z + 0.5D); 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 f89ce1cf..259ef3ac 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 @@ -2,6 +2,7 @@ package nmd.primal.forgecraft.tiles; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,10 +10,12 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.ParticleHelper; import nmd.primal.forgecraft.blocks.Bloomery; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucible; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.BloomeryCrafting; @@ -152,6 +155,26 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(stack.isEmpty()){ world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL1){ + if(this.getHeat() > 1210){ + this.setHeat(1200); + } + } + if(this.getSlotStack(0).getItem() == Items.COAL && this.getSlotStack(0).getMetadata() == 1){ + if(this.getHeat() > 1210){ + this.setHeat(1200); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL2){ + if(this.getHeat() > 1610){ + this.setHeat(1600); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL3){ + if(this.getHeat() > 3010){ + this.setHeat(3000); + } + } } if(state.getValue(PrimalStates.ACTIVE) == false){ if(h > 50){ @@ -161,6 +184,13 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(0); } } + if(world.getBlockState(pos).getBlock() instanceof BloomeryBase){ + BloomeryBase tempBlock = (BloomeryBase) world.getBlockState(pos).getBlock(); + if(this.getHeat() > tempBlock.getMaxHeat()){ + world.setBlockState(pos, Blocks.FIRE.getDefaultState(), 2); + //world.markTileEntityForRemoval(this); + } + } this.updateBlock(); this.markDirty(); } @@ -178,6 +208,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { return true; } } + if(stack.getItem() == PrimalItems.CHARCOAL1 + || stack.getItem() == PrimalItems.CHARCOAL2 + || stack.getItem() == PrimalItems.CHARCOAL3){ + return true; + } } if(index == 1){ if (stack.getItem() == ModItems.softcrucible) { diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json index 06470370..5062bb44 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json @@ -1,20 +1,12 @@ { "variants": { - "active=false,covered=false,facing=north": { "model": "forgecraft:bloomery" }, - "active=false,covered=false,facing=east": { "model": "forgecraft:bloomery", "y": 90 }, - "active=false,covered=false,facing=south": { "model": "forgecraft:bloomery", "y": 180 }, - "active=false,covered=false,facing=west": { "model": "forgecraft:bloomery", "y": 270 }, - "active=true,covered=false,facing=north": { "model": "forgecraft:bloomery_lit" }, - "active=true,covered=false,facing=east": { "model": "forgecraft:bloomery_lit", "y": 90 }, - "active=true,covered=false,facing=south": { "model": "forgecraft:bloomery_lit", "y": 180 }, - "active=true,covered=false,facing=west": { "model": "forgecraft:bloomery_lit", "y": 270 }, - "active=true,covered=true,facing=north": { "model": "forgecraft:bloomery_lit_covered" }, - "active=true,covered=true,facing=east": { "model": "forgecraft:bloomery_lit_covered", "y": 90 }, - "active=true,covered=true,facing=south": { "model": "forgecraft:bloomery_lit_covered", "y": 180 }, - "active=true,covered=true,facing=west": { "model": "forgecraft:bloomery_lit_covered", "y": 270 }, - "active=false,covered=true,facing=north": { "model": "forgecraft:bloomery_covered" }, - "active=false,covered=true,facing=east": { "model": "forgecraft:bloomery_covered", "y": 90 }, - "active=false,covered=true,facing=south": { "model": "forgecraft:bloomery_covered", "y": 180 }, - "active=false,covered=true,facing=west": { "model": "forgecraft:bloomery_covered", "y": 270 } + "active=false,facing=north": { "model": "forgecraft:bloomery" }, + "active=false,facing=east": { "model": "forgecraft:bloomery", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_lit" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_lit", "y": 270 } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json new file mode 100644 index 00000000..0523ca9d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=false,facing=north": { "model": "forgecraft:bloomery_adobe" }, + "active=false,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_adobe" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json new file mode 100644 index 00000000..e69de29b diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json index 367780ac..c9d9c7b0 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json @@ -3,14 +3,14 @@ "textures": { "particle": "blocks/stone_slab", "texture": "blocks/stone_slab", - "texture1": "items/adobebrick_dry", - "texture2": "blocks/adobebrick_mortar" + "texture1": "primal:items/adobebrick_dry", + "texture2": "primal:blocks/adobebrick_mortar" }, "elements": [ { "__comment": "1bricks1", - "from": [ 12.99901, -0.0005053292, 4.000048 ], - "to": [ 15.99901, 2.999495, 12.00005 ], + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -21,20 +21,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000094, -0.0009860025, 0.0004938607 ], - "to": [ 12.00009, 2.999014, 3.000494 ], - "faces": { - "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, - "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } - } - }, - { - "__comment": "1bricks3", - "from": [ 4.00069, 0.0002432953, 13.00012 ], - "to": [ 12.00069, 3.000243, 16.00012 ], + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -45,8 +33,8 @@ }, { "__comment": "1angle0", - "from": [ 3.999487, -0.0007641285, 0.0006402531 ], - "to": [ 6.999487, 2.999236, 5.50064 ], + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.9995, 2.9992, 5.500599 ], "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -58,8 +46,8 @@ }, { "__comment": "1angle1", - "from": [ -0.0005636247, -0.0002443944, 11.9997 ], - "to": [ 2.999436, 2.999756, 17.4997 ], + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -71,8 +59,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00041, -4.93704E-05, 10.00045 ], - "to": [ 17.00041, 2.999951, 15.50045 ], + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -84,8 +72,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999024, 0.0005986033, 1.99949 ], - "to": [ 12.99902, 3.000599, 7.49949 ], + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -97,8 +85,8 @@ }, { "__comment": "1bricks0", - "from": [ -9.055744E-05, 3.000279, 3.999157 ], - "to": [ 2.999909, 3.500279, 11.99916 ], + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -109,8 +97,8 @@ }, { "__comment": "1bricks1", - "from": [ 13.00085, 3.000046, 3.999763 ], - "to": [ 16.00085, 3.500046, 11.99976 ], + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -120,8 +108,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000787, 3.000445, -0.0008919159 ], - "to": [ 12.00079, 3.500445, 2.999108 ], + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, @@ -131,11 +119,10 @@ }, { "__comment": "1bricks3", - "from": [ 3.999659, 3.000034, 13.00047 ], - "to": [ 11.99966, 3.500034, 16.00047 ], + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, @@ -144,8 +131,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000662, 2.999949, -0.0003989271 ], - "to": [ 7.000662, 3.499949, 5.499601 ], + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -156,8 +143,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0001212467, 2.999675, 12.00085 ], - "to": [ 3.000121, 3.499675, 17.50085 ], + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -168,8 +155,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00047, 2.999647, 9.999364 ], - "to": [ 17.00047, 3.499647, 15.49936 ], + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -180,8 +167,8 @@ }, { "__comment": "1angle3", - "from": [ 10.00009, 3.000046, 1.999668 ], - "to": [ 13.00009, 3.500046, 7.499668 ], + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -192,8 +179,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999604, 3.500003, 2.000702 ], - "to": [ 12.9996, 6.500003, 7.500702 ], + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -204,8 +191,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0003809606, 3.499943, 4.000859 ], - "to": [ 2.999619, 6.499943, 12.00086 ], + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -215,8 +202,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.9992, 3.500882, 4.000113 ], - "to": [ 15.9992, 6.500882, 12.00011 ], + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -226,8 +213,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000336, 3.500118, 8.205499E-05 ], - "to": [ 12.00034, 6.500118, 3.000082 ], + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -237,8 +224,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000693, 3.500105, 13.00085 ], - "to": [ 12.00069, 6.500105, 16.00085 ], + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -248,8 +235,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000699, 3.499887, -0.0008279622 ], - "to": [ 7.000699, 6.499887, 5.499172 ], + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -260,8 +247,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0007967785, 3.500389, 12.00072 ], - "to": [ 3.000797, 6.500389, 17.50072 ], + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -272,8 +259,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99911, 3.500989, 9.999724 ], - "to": [ 16.99911, 6.500989, 15.49972 ], + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -284,8 +271,8 @@ }, { "__comment": "Box38", - "from": [ 2.000213, -0.0008939529, 2.000471 ], - "to": [ 14.00021, 0.999106, 14.00047 ], + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], "faces": { "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, @@ -297,8 +284,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99961, 6.999906, 9.999246 ], - "to": [ 16.99961, 9.999906, 15.49925 ], + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -309,8 +296,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000354, 6.500755, 0.0002160033 ], - "to": [ 7.000354, 7.000755, 5.500216 ], + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -321,8 +308,8 @@ }, { "__comment": "1angle1", - "from": [ -6.841531E-05, 6.500052, 12.00036 ], - "to": [ 2.999932, 7.000052, 17.50036 ], + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -333,8 +320,8 @@ }, { "__comment": "1angle2", - "from": [ 13.9995, 6.499704, 10.00027 ], - "to": [ 16.9995, 6.999704, 15.50027 ], + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -345,8 +332,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999094, 6.499113, 1.999741 ], - "to": [ 12.99909, 6.999113, 7.499742 ], + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -357,8 +344,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999537, 7.000202, 1.999252 ], - "to": [ 12.99954, 10.0002, 7.499252 ], + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -369,8 +356,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0005208423, 6.999842, 4.000673 ], - "to": [ 2.999479, 9.999842, 12.00067 ], + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -380,8 +367,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.99983, 6.999263, 3.9991 ], - "to": [ 15.99983, 9.999263, 11.9991 ], + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -391,8 +378,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000002, 7.000299, 0.0005580339 ], - "to": [ 12, 10.0003, 3.000558 ], + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -402,8 +389,8 @@ }, { "__comment": "1bricks3", - "from": [ 3.999525, 6.999219, 13.0002 ], - "to": [ 11.99953, 9.999219, 16.0002 ], + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -413,8 +400,8 @@ }, { "__comment": "1angle0", - "from": [ 3.999533, 7.000402, -0.0007474885 ], - "to": [ 6.999533, 10.0004, 5.499252 ], + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.9995, 10.0004, 5.4993 ], "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -425,8 +412,8 @@ }, { "__comment": "1angle1", - "from": [ -0.0004581314, 6.999415, 12.00066 ], - "to": [ 2.999542, 9.999415, 17.50066 ], + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.9994, 17.5007 ], "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -437,11 +424,9 @@ }, { "__comment": "1bricks3", - "from": [ 3.999568, 6.499929, 13.0007 ], - "to": [ 11.99957, 6.999929, 16.0007 ], + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], "faces": { - "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, @@ -450,8 +435,8 @@ }, { "__comment": "1bricks2", - "from": [ 3.999242, 6.500287, 0.000943925 ], - "to": [ 11.99924, 7.000287, 3.000944 ], + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, @@ -463,8 +448,8 @@ }, { "__comment": "1bricks1", - "from": [ 13.00068, 6.500669, 4.000465 ], - "to": [ 16.00068, 7.000669, 12.00047 ], + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -474,8 +459,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0001249014, 6.499167, 4.000904 ], - "to": [ 2.999875, 6.999167, 12.0009 ], + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -485,8 +470,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99999, 10.50039, 10.00029 ], - "to": [ 16.99999, 13.50039, 15.50029 ], + "from": [ 14, 10.5004, 10.0003 ], + "to": [ 17, 13.5004, 15.5003 ], "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -498,8 +483,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000172, 9.999103, -7.962191E-05 ], - "to": [ 7.000172, 10.4991, 5.49992 ], + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -510,8 +495,8 @@ }, { "__comment": "1angle1", - "from": [ -0.000348838, 10.00034, 11.99966 ], - "to": [ 2.999651, 10.50034, 17.49966 ], + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -522,8 +507,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00085, 9.999942, 9.999126 ], - "to": [ 17.00085, 10.49994, 15.49913 ], + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -534,8 +519,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999223, 10.00036, 2.000005 ], - "to": [ 12.99922, 10.50036, 7.500006 ], + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -546,8 +531,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999492, 10.49904, 1.999982 ], - "to": [ 12.99949, 13.49904, 7.499982 ], + "from": [ 9.999499, 10.499, 2 ], + "to": [ 12.9995, 13.499, 7.5 ], "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -559,8 +544,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0004085173, 10.50002, 3.999625 ], - "to": [ 2.999592, 13.50002, 11.99962 ], + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -571,8 +556,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.99937, 10.49956, 3.999873 ], - "to": [ 15.99937, 13.49956, 11.99987 ], + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -583,8 +568,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.00047, 10.49992, -3.377069E-05 ], - "to": [ 12.00047, 13.49992, 2.999966 ], + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -595,8 +580,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000349, 10.49983, 13.00097 ], - "to": [ 12.00035, 13.49983, 16.00097 ], + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -607,8 +592,8 @@ }, { "__comment": "1angle0", - "from": [ 4.00019, 10.49973, -0.0006706055 ], - "to": [ 7.00019, 13.49973, 5.49933 ], + "from": [ 4.0002, 10.4997, -0.0007 ], + "to": [ 7.0002, 13.4997, 5.4993 ], "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -620,8 +605,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0003478897, 10.49929, 12.00031 ], - "to": [ 3.000348, 13.49929, 17.50031 ], + "from": [ 0.0003, 10.4993, 12.0003 ], + "to": [ 3.0003, 13.4993, 17.5003 ], "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -633,8 +618,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000114, 9.9997, 12.99927 ], - "to": [ 12.00011, 10.4997, 15.99927 ], + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, @@ -644,8 +629,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000282, 10.00081, -0.000869494 ], - "to": [ 12.00028, 10.50081, 2.99913 ], + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" } @@ -653,8 +638,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.9995, 9.999735, 3.999263 ], - "to": [ 15.9995, 10.49973, 11.99926 ], + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -664,14 +649,26 @@ }, { "__comment": "1bricks0", - "from": [ 0.000530083, 9.999576, 3.99995 ], - "to": [ 3.00053, 10.49958, 11.99995 ], + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 3.99914, 2.999619, 11.99914 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } } ], "display": { diff --git a/1.11/stoneanvil.json b/1.11/stoneanvil.json deleted file mode 100644 index 6bff1c13..00000000 --- a/1.11/stoneanvil.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "blocks/particle", - "texture": "blocks/texture", - "texture1": "blocks/texture1" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 0, 0, 0 ], - "to": [ 16, 14, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "scale": [ 0.5, 0.5, 0.5 ] - } - }, - "overrides": [ - ] -} \ No newline at end of file