From 4e5ada44cf021fb42e83942e0dd22e61e1ce5dd3 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 18 Jun 2017 14:35:20 -0400 Subject: [PATCH] adobe forge, adobe bloomery, refactor forge bloomery stonetongs --- 1.11/gradle.properties | 4 +- .../java/nmd/primal/forgecraft/ModInfo.java | 4 +- .../primal/forgecraft/blocks/AnvilIron.java | 15 - .../primal/forgecraft/blocks/AnvilStone.java | 20 - .../primal/forgecraft/blocks/Bloomery.java | 455 ------------ .../forgecraft/blocks/BloomeryBase.java | 7 +- .../nmd/primal/forgecraft/blocks/Forge.java | 68 +- .../primal/forgecraft/blocks/IngotBall.java | 1 - .../forgecraft/blocks/PistonBellows.java | 33 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 17 +- .../primal/forgecraft/init/ModCrafting.java | 4 +- .../forgecraft/items/ItemStoneTongs.java | 7 +- .../items/weapons/CustomShield.java | 1 - .../renders/blocks/TileBloomeryRender.java | 1 - .../primal/forgecraft/tiles/TileBloomery.java | 12 +- .../primal/forgecraft/tiles/TileForge.java | 53 +- .../primal/forgecraft/util/AnvilHandler.java | 3 - .../forgecraft/util/BreakerHandler.java | 8 +- .../{bloomery.json => bloomery_brick.json} | 16 +- .../forgecraft/blockstates/firebox.json | 12 - .../forgecraft/blockstates/forge_adobe.json | 30 + .../forgecraft/blockstates/forge_brick.json | 12 + .../assets/forgecraft/lang/en_us.lang | 3 +- .../models/block/blockbreaker2.json | 200 ------ .../forgecraft/models/block/bloomery2.json | 0 .../models/block/bloomery_adobe_lit.json | 28 +- .../models/block/bloomery_brick.json | 676 ++++++++++++++++++ .../models/block/bloomery_brick_lit.json | 676 ++++++++++++++++++ .../models/block/bloomery_covered.json | 234 ------ .../models/block/bloomery_lit_covered.json | 234 ------ .../models/block/{firebox.json => forge.json} | 0 .../{firebox_lit.json => forge_lit.json} | 1 + .../forgecraft/models/item/forge_adobe.json | 8 + .../item/{firebox.json => forge_brick.json} | 2 +- .../textures/blocks/adobebrick_lit.png | Bin 802 -> 704 bytes .../forgecraft/textures/blocks/stone_slab.png | Bin 386 -> 414 bytes 1.11/src/main/resources/mcmod.info | 2 +- 37 files changed, 1554 insertions(+), 1293 deletions(-) delete mode 100644 1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java rename 1.11/src/main/resources/assets/forgecraft/blockstates/{bloomery.json => bloomery_brick.json} (77%) delete mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json rename 1.11/src/main/resources/assets/forgecraft/models/block/{firebox.json => forge.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/block/{firebox_lit.json => forge_lit.json} (99%) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json rename 1.11/src/main/resources/assets/forgecraft/models/item/{firebox.json => forge_brick.json} (76%) diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 49d3bb6e..e26fd815 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.30 -forge_version=13.20.0.2311 +mod_version=1.2.40 +forge_version=13.20.0.2315 mcp_mappings=snapshot_20170121 mc_version=1.11.2 diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index 7c5ec2a1..4297d66b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,9 +17,9 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.30"; + public static final String MOD_VERSION = "1.2.40"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; - public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" + "required-after:primal@[0.4,);"; + public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2315,);" + "required-after:primal@[0.4,);"; /** Mod Structures **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java index a8a090de..3807773f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java @@ -1,30 +1,15 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalItems; -import nmd.primal.core.api.PrimalMaterials; import nmd.primal.core.common.items.tools.WorkMallet; -import nmd.primal.forgecraft.CommonUtils; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.util.AnvilHandler; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java index 849172b7..5f99786c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java @@ -1,42 +1,22 @@ package nmd.primal.forgecraft.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.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.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalMaterials; import nmd.primal.core.common.items.tools.WorkMallet; import nmd.primal.forgecraft.CommonUtils; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.crafting.AnvilCrafting; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; -import nmd.primal.forgecraft.items.ForgeHammer; -import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileAnvil; -import nmd.primal.forgecraft.util.AnvilHandler; - -import java.util.concurrent.ThreadLocalRandom; /** * Created by mminaie on 3/4/17. 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 deleted file mode 100644 index 0de824a6..00000000 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java +++ /dev/null @@ -1,455 +0,0 @@ -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.Items; -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.PrimalItems; -import nmd.primal.core.api.PrimalStates; -import nmd.primal.core.common.crafting.FireSource; -import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.forgecraft.CommonUtils; -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 1/21/17. - */ -public class Bloomery extends CustomContainerFacing implements ITileEntityProvider { - - //public static final PropertyBool PrimalStates.ACTIVE = PropertyBool.create("PrimalStates.ACTIVE"); - public static final PropertyBool COVERED = PropertyBool.create("covered"); - - public Bloomery(Material material, String registryName) { - super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.BLOOMERY.getUnlocalizedName()); - setRegistryName(registryName); - //setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); - setCreativeTab(ModInfo.TAB_FORGECRAFT); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); - setHardness(3.0f); - } - - @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) { - makeSmoke(world, pos); - } - } - } - - @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)).withProperty(COVERED, Boolean.valueOf(false)), 2); - } - - } - - @Override - public int getMetaFromState(IBlockState state) { - int i = 0; - - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 0; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 1; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 2; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 3; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 4; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 5; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 6; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 7; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 8; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 9; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 10; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 11; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 12; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 13; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 14; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 15; - return i; - } - return i; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - - if (meta == 0){ - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 1) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 2) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 3) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 4) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 5) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 6) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 7) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 8) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 9) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 10) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 11) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 12) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 13) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 14) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 15) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - return iblockstate; - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE, COVERED}); - } - - @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]); - } - } - } -} \ No newline at end of file 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 index dbc673e6..88a525b8 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -3,7 +3,6 @@ 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; @@ -24,7 +23,6 @@ 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; @@ -34,8 +32,6 @@ 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. */ @@ -51,6 +47,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); + setResistance(5.0f); this.maxHeat=maxHeat; } @@ -74,7 +71,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr this.updateTick(world, pos, state, random); if(!world.isRemote){ if(state.getValue(PrimalStates.ACTIVE) == true) { - FireHelper.makeSmoke(world, pos, 10); + FireHelper.makeSmoke(world, pos, 50); } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 82a3958d..1ba4d64b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; 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; @@ -25,10 +24,9 @@ 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.PrimalItems; +import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.crafting.FireSource; import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileForge; @@ -45,19 +43,30 @@ import static nmd.primal.core.common.helper.FireHelper.makeSmoke; /** * Created by kitsu on 11/26/2016. */ -public class Forge extends CustomContainerFacing implements ITileEntityProvider/*, ITextComponent*/ { +public class Forge extends CustomContainerFacing implements ITileEntityProvider{ - public static final PropertyBool ACTIVE = PropertyBool.create("active"); + private int maxHeat; + //public static final PropertyBool PrimalStates.ACTIVE = PropertyBool.create("PrimalStates.ACTIVE"); protected static final AxisAlignedBB collideBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.99D, 1.0D); protected static final AxisAlignedBB boundBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - public Forge(Material material) { + public Forge(Material material, String name, Integer maxHeat) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.FIREBOX.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); + setUnlocalizedName(name); + setRegistryName(name); setCreativeTab(ModInfo.TAB_FORGECRAFT); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, Boolean.valueOf(false))); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); + setResistance(5.0f); + this.maxHeat=maxHeat; + } + + public int getMaxHeat() { + return maxHeat; + } + + public void setMaxHeat(int maxHeat) { + this.maxHeat = maxHeat; } @Override @@ -107,7 +116,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ } if(pItem.isEmpty()) { if(!player.isSneaking()){ - if(world.getBlockState(pos).getValue(ACTIVE) == true){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true){ Integer tempInt = tile.getHeat(); String tempString = tempInt.toString(); ITextComponent itextcomponent = new TextComponentString(tempString); @@ -118,7 +127,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ } } if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) { - world.setBlockState(pos, state.withProperty(ACTIVE, true), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, true), 2); tile.setHeat(100); tile.markDirty(); tile.updateBlock(); @@ -226,7 +235,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ { //if (!world.isRemote){ if(ent instanceof EntityPlayer){ - if(state.getValue(ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ ent.setFire(1); } } @@ -240,7 +249,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - if(state.getValue(ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ return 15; } return 0; @@ -264,7 +273,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ if(!world.isRemote){ TileForge tile = (TileForge) world.getTileEntity(pos); if(tile.getSlotStack(0) != ItemStack.EMPTY){ - if(world.getBlockState(pos).getValue(ACTIVE)==true){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE)==true){ return true; } } @@ -305,14 +314,14 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ /*@Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { IBlockState state = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer); - return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(ACTIVE, Boolean.valueOf(false)); + return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)); }*/ @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(ACTIVE, Boolean.valueOf(false)), 2); + worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)), 2); } } @@ -320,35 +329,35 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ public int getMetaFromState(IBlockState state) { int i = 0; - if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == false){ i = 0; return i; } - if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == false){ i = 1; return i; } - if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == false){ i = 2; return i; } - if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == false){ i = 3; return i; } - if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == true){ i = 4; return i; } - if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == true){ i = 5; return i; } - if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == true){ i = 6; return i; } - if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == true){ i = 7; return i; } @@ -360,9 +369,6 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ public IBlockState getStateFromMeta(int meta) { EnumFacing enumfacing; Boolean active; - - - switch (meta & 7) { case 0: @@ -402,12 +408,12 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ active = false; } - return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(ACTIVE, Boolean.valueOf(active)); + return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(active)); } @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {FACING, ACTIVE}); + return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE}); } @Override @@ -446,7 +452,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ { this.updateTick(world, pos, state, random); if(!world.isRemote){ - if(state.getValue(ACTIVE) == true) { + if(state.getValue(PrimalStates.ACTIVE) == true) { makeSmoke(world, pos); } } @@ -456,7 +462,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ @SuppressWarnings("incomplete-switch") public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - if(state.getValue(Forge.ACTIVE) == true) + if(state.getValue(PrimalStates.ACTIVE) == true) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY() + 0.96D; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java index 9b73dc79..d12a1756 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java @@ -3,7 +3,6 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.BlockDynamicLiquid; 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.EntityLivingBase; 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 876ef336..0dc0e6dc 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 @@ -18,7 +18,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.tiles.TileBloomery; import nmd.primal.forgecraft.tiles.TileForge; @@ -81,9 +80,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.NORTH) { BlockPos tempPos = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -109,9 +108,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.SOUTH) { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -137,9 +136,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.EAST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -165,9 +164,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.WEST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -377,9 +376,9 @@ public class PistonBellows extends CustomContainerFacing { if(state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) { if (state.getValue(PistonBellows.FACING) == EnumFacing.NORTH) { BlockPos tempPos = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } @@ -394,9 +393,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.SOUTH) { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } @@ -411,9 +410,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.EAST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -428,9 +427,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.WEST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { makeEmbers(world, tempPos, world.rand); } } 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 e341afd4..c9215714 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 @@ -28,7 +28,8 @@ import nmd.primal.forgecraft.tiles.TileAnvil; */ public class ModBlocks { - public static Block firebox; + public static Block forge_brick; + public static Block forge_adobe; public static Block bloomery_brick; public static Block bloomery_adobe; public static Block blockbreaker; @@ -88,8 +89,9 @@ public class ModBlocks { public static void init() { - firebox = new Forge(Material.ROCK); - bloomery_brick = new BloomeryBase(Material.ROCK, "bloomery", 5000); + forge_brick = new Forge(Material.ROCK, "forge_brick", 5000); + forge_adobe = new Forge(Material.ROCK, "forge_adobe", 5000); + bloomery_brick = new BloomeryBase(Material.ROCK, "bloomery_brick", 5000); bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 5000); blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); @@ -365,7 +367,8 @@ public class ModBlocks { public static void register() { - registerBlock(firebox); + registerBlock(forge_brick); + registerBlock(forge_adobe); registerBlock(bloomery_brick); registerBlock(bloomery_adobe); registerBlock(blockbreaker); @@ -430,7 +433,9 @@ public class ModBlocks { @SideOnly(Side.CLIENT) public static void registerRenders() { - registerRender(firebox); + registerRender(forge_brick); + registerRender(forge_adobe); + registerRender(blockbreaker); registerRender(pistonbellowsoak); registerRender(pistonbellowsjungle); @@ -438,8 +443,10 @@ public class ModBlocks { registerRender(pistonbellowsspruce); registerRender(pistonbellowsdarkoak); registerRender(pistonbellowsacacia); + registerRender(bloomery_brick); registerRender(bloomery_adobe); + registerRender(emptycrucible); registerRender(emptycruciblehot); registerRender(emptycruciblecracked); 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 5facb4a2..c81b3e29 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 @@ -24,8 +24,10 @@ public class ModCrafting { Random rand = new Random(); /***Forge***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_brick), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_adobe), + "X X", "XYX", "X X", 'X', PrimalItems.ADOBEBRICK_DRY, 'Y', Blocks.FURNACE); /***Bloomery***/ GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_brick), "X X", "X X", "XXX", 'X', Items.BRICK); 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 ea86f5c9..72fcb546 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 @@ -16,10 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.BloomeryBase; -import nmd.primal.forgecraft.blocks.Crucible; -import nmd.primal.forgecraft.blocks.CrucibleHot; -import nmd.primal.forgecraft.blocks.IngotBall; +import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileBaseCrucible; @@ -465,7 +462,7 @@ public class ItemStoneTongs extends Item { Pulls the Tool Parts from the Forge *****/ if(itemstack.getTagCompound().getInteger("type") == 0){ - if (world.getBlockState(pos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(pos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(pos); for (int i = 2; i < tile.getSlotListSize(); i++) { if (tile.getSlotStack(i).getItem().equals(ModItems.ironchunkhot)) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java index 47b3a8a7..7605a4cf 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.items.weapons; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; 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 14a8d5f5..dfcd7b2c 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 @@ -9,7 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; 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; 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 d7eb4433..95943013 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 @@ -12,17 +12,13 @@ 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; import nmd.primal.forgecraft.init.ModItems; -import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; import static nmd.primal.core.common.helper.FireHelper.makeSmoke; +import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; /** * Created by mminaie on 1/22/17. @@ -52,7 +48,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { BlockPos abovePos = new BlockPos(this.getPos().getX(), this.getPos().getY()+1, this.getPos().getZ()); if (world.getBlockState(this.getPos()).getValue(PrimalStates.ACTIVE)) { if (this.getSlotStack(0) == ItemStack.EMPTY) { - world.setBlockState(this.getPos(), state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(this.getPos(), state.withProperty(PrimalStates.ACTIVE, false), 2); this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } @@ -149,11 +145,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(h - 25); } if(h < 10 ){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } } if(stack.isEmpty()){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_FAIR){ if(this.getHeat() > 1610){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 25072568..12265a4f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.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.Item; import net.minecraft.item.ItemStack; @@ -10,12 +11,13 @@ 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.common.helper.CommonUtils; +import nmd.primal.core.api.PrimalItems; +import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.ForgeCrafting; -import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; import static nmd.primal.core.common.helper.FireHelper.makeSmoke; +import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; /** * Created by mminaie on 11/30/16. @@ -43,9 +45,9 @@ public class TileForge extends TileBaseSlot implements ITickable { this.iteration = 0; - if (world.getBlockState(this.getPos()).getValue(Forge.ACTIVE)) { + if (world.getBlockState(this.getPos()).getValue(PrimalStates.ACTIVE)) { if (this.getSlotStack(0) == ItemStack.EMPTY) { - world.setBlockState(this.getPos(), state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(this.getPos(), state.withProperty(PrimalStates.ACTIVE, false), 2); this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } @@ -59,7 +61,7 @@ public class TileForge extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 20); + Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 10); if(decrInt == 0) { decrInt = 1; } @@ -78,20 +80,40 @@ public class TileForge extends TileBaseSlot implements ITickable { } private void heatManager(Integer h, IBlockState state, ItemStack stack, World world, BlockPos pos){ - if(state.getValue(Forge.ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ if(!stack.isEmpty()) { if(h > 0) { this.setHeat(h - 25); } if(h < 10 ){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } } if(stack.isEmpty()){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_FAIR){ + if(this.getHeat() > 1610){ + this.setHeat(1600); + } + } + 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.CHARCOAL_GOOD){ + if(this.getHeat() > 2110){ + this.setHeat(2100); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_HIGH){ + if(this.getHeat() > 3510){ + this.setHeat(3500); + } } } - if(state.getValue(Forge.ACTIVE) == false){ + if(state.getValue(PrimalStates.ACTIVE) == false){ if(h > 50){ this.setHeat(h - 50); } @@ -99,6 +121,13 @@ public class TileForge extends TileBaseSlot implements ITickable { this.setHeat(0); } } + if(world.getBlockState(pos).getBlock() instanceof Forge){ + Forge tempBlock = (Forge) world.getBlockState(pos).getBlock(); + if(this.getHeat() > tempBlock.getMaxHeat()){ + world.setBlockState(pos, Blocks.FIRE.getDefaultState(), 2); + //world.markTileEntityForRemoval(this); + } + } this.updateBlock(); this.markDirty(); } @@ -223,8 +252,12 @@ public class TileForge extends TileBaseSlot implements ITickable { return true; } } + if(stack.getItem() == PrimalItems.CHARCOAL_GOOD + || stack.getItem() == PrimalItems.CHARCOAL_HIGH + || stack.getItem() == PrimalItems.CHARCOAL_FAIR){ + return true; + } } - return false; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java index 1aa23b55..b18bdbe9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -6,11 +6,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; @@ -28,7 +26,6 @@ import nmd.primal.forgecraft.tiles.TileAnvil; import java.util.concurrent.ThreadLocalRandom; import static nmd.primal.forgecraft.blocks.CustomContainerFacing.FACING; -import static sun.audio.AudioPlayer.player; /** * Created by mminaie on 6/10/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java index ce990aa9..49c445dc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java @@ -7,18 +7,14 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; -//import nmd.primal.forgecraft.CommonUtils; - -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.tiles.TileBreaker; -import nmd.primal.forgecraft.blocks.CustomContainerFacing.*; - -import java.util.concurrent.ThreadLocalRandom; import static nmd.primal.core.common.helper.CommonUtils.randomCheck; +//import nmd.primal.forgecraft.CommonUtils; + /** * Created by mminaie on 6/11/17. */ diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json similarity index 77% rename from 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json rename to 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json index 5062bb44..4a150eb1 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json @@ -1,12 +1,12 @@ { "variants": { - "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 } + "active=false,facing=north": { "model": "forgecraft:bloomery_brick" }, + "active=false,facing=east": { "model": "forgecraft:bloomery_brick", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery_brick", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery_brick", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_brick_lit" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_brick_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_brick_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_brick_lit", "y": 270 } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json b/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json deleted file mode 100644 index d7ddbb0d..00000000 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=false,facing=north": { "model": "forgecraft:firebox" }, - "active=false,facing=east": { "model": "forgecraft:firebox", "y": 90 }, - "active=false,facing=south": { "model": "forgecraft:firebox", "y": 180 }, - "active=false,facing=west": { "model": "forgecraft:firebox", "y": 270 }, - "active=true,facing=north": { "model": "forgecraft:firebox_lit" }, - "active=true,facing=east": { "model": "forgecraft:firebox_lit", "y": 90 }, - "active=true,facing=south": { "model": "forgecraft:firebox_lit", "y": 180 }, - "active=true,facing=west": { "model": "forgecraft:firebox_lit", "y": 270 } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json new file mode 100644 index 00000000..15ced0e0 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "variants": { + "active": { + "true": { + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick", + "texture1": "forgecraft:blocks/adobebrick_lit" + }, + "model": "forgecraft:forge_lit" + }, + "false": { + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick" + }, + "model": "forgecraft:forge" + } + }, + "facing": { + "north": {}, + "east": {"y": 90}, + "south": {"y": 180}, + "west":{"y": 270} + } + } +} + + diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json new file mode 100644 index 00000000..1cc8f09a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=false,facing=north": { "model": "forgecraft:forge" }, + "active=false,facing=east": { "model": "forgecraft:forge", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:forge", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:forge", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:forge_lit" }, + "active=true,facing=east": { "model": "forgecraft:forge_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:forge_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:forge_lit", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index debcf6f0..805bc0d5 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -1,7 +1,8 @@ itemGroup.forgecraft=ForgeCraft -tile.firebox.name=Forge +tile.forge_brick.name=Brick Forge +tile.forge_brick.name=Adobe Forge tile.bloomery.name=Bloomery tile.stoneanvil.name=Stone Anvil tile.pistonbellows.name=Wooden Piston Bellows diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json b/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json deleted file mode 100644 index e6350bda..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/e_texture", - "texture1": "blocks/checker_test", - "texture2": "blocks/e_texture" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 0, 0, 0 ], - "to": [ 6, 2, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, - "north": { "uv": [ 10, 14, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 14, 6, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 6, 0, 2 ], - "to": [ 10, 2, 16 ], - "faces": { - "down": { "uv": [ 6, 0, 10, 14 ], "texture": "#texture" }, - "up": { "uv": [ 6, 2, 10, 16 ], "texture": "#texture" }, - "north": { "uv": [ 6, 14, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6, 14, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 10, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 14, 6, 16 ], "texture": "#texture" }, - "south": { "uv": [ 10, 14, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX5", - "from": [ 6, 0, 0 ], - "to": [ 6.001, 2, 2 ], - "faces": { - "east": { "uv": [ 14, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX6", - "from": [ 10, 0, 0 ], - "to": [ 10.001, 2, 2 ], - "faces": { - "west": { "uv": [ 0, 14, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 0, 2, 8 ], - "to": [ 2, 4, 15 ], - "faces": { - "down": { "uv": [ 0, 1, 2, 8 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 2, 15 ], "texture": "#texture" }, - "north": { "uv": [ 14, 12, 16, 14 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "west": { "uv": [ 8, 12, 15, 14 ], "texture": "#texture" }, - "east": { "uv": [ 1, 12, 8, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 0, 4, 9 ], - "to": [ 2, 6, 14 ], - "faces": { - "down": { "uv": [ 0, 2, 2, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 14, 10, 16, 12 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10, 2, 12 ], "texture": "#texture" }, - "west": { "uv": [ 9, 10, 14, 12 ], "texture": "#texture" }, - "east": { "uv": [ 2, 10, 7, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 0, 6, 10 ], - "to": [ 2, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 6 ], "texture": "#texture" }, - "up": { "uv": [ 0, 10, 2, 13 ], "texture": "#texture" }, - "north": { "uv": [ 14, 8, 16, 10 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 2, 10 ], "texture": "#texture" }, - "west": { "uv": [ 10, 8, 13, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 14, 2, 8 ], - "to": [ 16, 4, 15 ], - "faces": { - "down": { "uv": [ 0, 0, 2, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 2, 16 ], "texture": "#texture" }, - "north": { "uv": [ 14, 12, 16, 14 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "west": { "uv": [ 9, 12, 16, 14 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 7, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 4, 9 ], - "to": [ 16, 6, 14 ], - "faces": { - "down": { "uv": [ 0, 1, 2, 6 ], "texture": "#texture" }, - "up": { "uv": [ 0, 10, 2, 15 ], "texture": "#texture" }, - "north": { "uv": [ 14, 10, 16, 12 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10, 2, 12 ], "texture": "#texture" }, - "west": { "uv": [ 10, 10, 15, 12 ], "texture": "#texture" }, - "east": { "uv": [ 1, 10, 6, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 14, 6, 10 ], - "to": [ 16, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 2, 2, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 11, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 14, 8, 16, 10 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 2, 10 ], "texture": "#texture" }, - "west": { "uv": [ 11, 8, 14, 10 ], "texture": "#texture" }, - "east": { "uv": [ 2, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 2, 6.5, 10.5 ], - "to": [ 14, 8, 12 ], - "faces": { - "down": { "uv": [ 2, 1, 14, 3 ], "texture": "#texture1" }, - "up": { "uv": [ 2, 13, 14, 15 ], "texture": "#texture1" }, - "north": { "uv": [ 2, 8, 14, 10 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 8, 14, 10 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube14", - "from": [ 2, 5.5, 12.5 ], - "to": [ 3, 11.5, 13.5 ], - "faces": { - "down": { "uv": [ 15, 2.5, 16, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 14, 0, 15, 1 ], "texture": "#texture" }, - "north": { "uv": [ 11.5, 0, 12.5, 6 ], "texture": "#texture" }, - "south": { "uv": [ 13, 0, 14, 6 ], "texture": "#texture" }, - "west": { "uv": [ 14, 0, 15, 6 ], "texture": "#texture" }, - "east": { "uv": [ 15, 0, 16, 6 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 1, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 1, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "translation": [ 0, 1, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ -90, -90, 0 ], - "translation": [ 0, 0, -3 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - } -} \ 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 deleted file mode 100644 index e69de29b..00000000 diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json index 0d6745cd..a45f44f0 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/stone_slab", - "texture": "blocks/stone_slab", + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab", "texture1": "primal:blocks/adobebrick", "texture2": "primal:blocks/adobebrick_mortar", "texture3": "forgecraft:blocks/adobebrick_lit" @@ -35,7 +35,7 @@ { "__comment": "1angle0", "from": [ 3.9995, -0.0008, 0.0006 ], - "to": [ 6.999499, 2.9992, 5.500599 ], + "to": [ 6.999498, 2.9992, 5.500599 ], "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -402,7 +402,7 @@ { "__comment": "1angle0", "from": [ 3.9995, 7.0004, -0.0007 ], - "to": [ 6.999499, 10.0004, 5.4993 ], + "to": [ 6.999498, 10.0004, 5.4993 ], "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -475,7 +475,7 @@ "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" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -536,7 +536,7 @@ "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" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -548,7 +548,7 @@ "from": [ -0.0004, 10.5, 3.9996 ], "to": [ 2.9996, 13.5, 11.9996 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -560,7 +560,7 @@ "from": [ 12.9994, 10.4996, 3.9999 ], "to": [ 15.9994, 13.4996, 11.9999 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -569,10 +569,10 @@ }, { "__comment": "1bricks2", - "from": [ 4.0005, 10.4999, 0 ], - "to": [ 12.0005, 13.4999, 3 ], + "from": [ 4, 10.5, 0 ], + "to": [ 12, 13.5, 3 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, @@ -584,7 +584,7 @@ "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 }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, @@ -597,7 +597,7 @@ "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" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -610,7 +610,7 @@ "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" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json new file mode 100644 index 00000000..3fab6759 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json @@ -0,0 +1,676 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/brick", + "texture": "forgecraft:blocks/brick", + "texture1": "forgecraft:blocks/brick", + "texture2": "forgecraft:blocks/brick", + "texture3": "forgecraft:blocks/brick_lit" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 12.999, 4, 15.999, 12 ], "texture": "#texture1" }, + "north": { "uv": [ 0.001000404, 13.0005, 3.001, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 12.999, 13.0005, 15.999, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 4.0001, 12.9995, 12.0001, 15.9995 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9999, 13.001, 11.9999, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0001, 13.001, 12.0001, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0005, 13.001, 3.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9995, 13.001, 15.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999499, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 3.999222, 10.49993, 6.999222, 15.99993 ], "texture": "#texture1" }, + "south": { "uv": [ 3.999222, 13.0008, 6.999222, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 7.073628E-05, 13.0008, 5.50007, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 10.49993, 13.0008, 15.99993, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "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, 0, 2.999362, 3.999788 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13.0002, 2.999362, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00021, 13.0002, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 13.0002, 3.999788, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 14, 0.4994345, 16, 5.999434 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 14, 13, 16, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00057, 13, 15.50057, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0.4994345, 13, 5.999434, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "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": [ 9.99894, 8.499646, 12.99893, 13.99965 ], "texture": "#texture1" }, + "north": { "uv": [ 3.00107, 12.9994, 6.00106, 15.9994 ], "texture": "#texture1" }, + "south": { "uv": [ 9.99894, 12.9994, 12.99893, 15.9994 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 12.9994, 7.500354, 15.9994 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499646, 12.9994, 13.99965, 15.9994 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "north": { "uv": [ 13.0001, 12.4997, 16, 12.9997 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 12.4997, 2.9999, 12.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9992, 12.4997, 11.9992, 12.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0008, 12.4997, 12.0008, 12.9997 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 0, 12.5, 2.9992, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0008, 12.5, 16, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9998, 12.5, 11.9998, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0002, 12.5, 12.0002, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 3.9992, 12.4996, 11.9992, 12.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0008, 12.4996, 12.0008, 12.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 12.4996, 2.9991, 12.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 13.0009, 12.4996, 16, 12.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], + "faces": { + "down": { "uv": [ 3.9997, 0, 11.9997, 2.9995 ], "texture": "#texture2" }, + "north": { "uv": [ 4.0003, 12.5, 12.0003, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9997, 12.5, 11.9997, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0005, 12.5, 16, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5, 2.9995, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000778, 12.5001, 7.000778, 13.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0002121299, 12.5001, 5.500212, 13.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49979, 12.5001, 15.99979, 13.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.00063649, 12.5003, 3.000637, 13.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00049, 12.5003, 16, 13.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5003, 3.999505, 13.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 12.5004, 1.999223, 13.0004 ], "texture": "#texture2" }, + "south": { "uv": [ 14.00078, 12.5004, 16, 13.0004 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 12.5004, 15.49993, 13.0004 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 12.5004, 6.000071, 13.0004 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000141, 12.5, 6.000141, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999859, 12.5, 12.99986, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 1.999717, 12.5, 7.499717, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 8.500283, 12.5, 14.00028, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 2.999787, 9.5, 5.999788, 12.5 ], "texture": "#texture1" }, + "south": { "uv": [ 10.00021, 9.5, 13.00021, 12.5 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000778, 9.5, 7.500778, 12.5 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499222, 9.5, 13.99922, 12.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0004, 9.5001, 16, 12.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 9.5001, 2.9996, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0009, 9.5001, 12.0009, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9991, 9.5001, 11.9991, 12.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 0.0008001328, 9.4991, 3.0008, 12.4991 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9992, 9.4991, 15.9992, 12.4991 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0001, 9.4991, 12.0001, 12.4991 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9999, 9.4991, 11.9999, 12.4991 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 3.9997, 9.4999, 11.9997, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 9.4999, 12.0003, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0001, 9.4999, 3.0001, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9999, 9.4999, 15.9999, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], + "faces": { + "north": { "uv": [ 3.9993, 9.4999, 11.9993, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0007, 9.4999, 12.0007, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0008, 9.4999, 16, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.4999, 2.9992, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": { + "south": { "uv": [ 4.00106, 9.5001, 7.00106, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 9.5001, 5.499929, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50007, 9.5001, 16, 12.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "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": { + "south": { "uv": [ 0.001060658, 9.499599, 3.001061, 12.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 11.99993, 9.499599, 16, 12.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.499599, 4.000071, 12.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 9.499001, 2.000424, 12.499 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99958, 9.499001, 16, 12.499 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 9.499001, 15.49914, 12.499 ], "texture": "#texture1" }, + "east": { "uv": [ 0.5008583, 9.499001, 6.000849, 12.499 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2.0002, 1.9995, 14.0002, 13.9995 ], "texture": "#texture1" }, + "up": { "uv": [ 2.0002, 2.0005, 14.0002, 14.0005 ], "texture": "#texture1" }, + "north": { "uv": [ 1.9998, 15.0009, 13.9998, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2.0002, 15.0009, 14.0002, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2.0005, 15.0009, 14.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 1.9995, 15.0009, 13.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 6.000101, 1.999717, 9.0001 ], "texture": "#texture1" }, + "south": { "uv": [ 14.00028, 6.000101, 16, 9.0001 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 6.000101, 15.49915, 9.0001 ], "texture": "#texture1" }, + "east": { "uv": [ 0.5008488, 6.000101, 6.000849, 9.0001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": { + "south": { "uv": [ 4.000142, 8.9992, 7.000142, 9.4992 ], "texture": "#texture2" }, + "west": { "uv": [ 0.000424311, 8.9992, 5.500424, 9.4992 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49958, 8.9992, 15.99958, 9.4992 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "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": { + "south": { "uv": [ 0.0002118418, 8.9999, 3.000213, 9.4999 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00035, 8.9999, 16, 9.4999 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 8.9999, 3.999647, 9.4999 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 9.000299, 2.000566, 9.500299 ], "texture": "#texture2" }, + "south": { "uv": [ 13.99943, 9.000299, 16, 9.500299 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999859, 9.000299, 15.49986, 9.500299 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5001411, 9.000299, 6.000141, 9.500299 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000849, 9.0009, 6.000849, 9.5009 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999151, 9.0009, 12.99915, 9.5009 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000424, 9.0009, 7.500425, 9.5009 ], "texture": "#texture2" }, + "east": { "uv": [ 8.499575, 9.0009, 13.99958, 9.5009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000848, 5.9998, 6.000849, 8.9998 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999151, 5.9998, 12.99915, 8.9998 ], "texture": "#texture1" }, + "west": { "uv": [ 1.999859, 5.9998, 7.499859, 8.9998 ], "texture": "#texture1" }, + "east": { "uv": [ 8.500141, 5.9998, 14.00014, 8.9998 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13.0005, 6.0002, 16, 9.0002 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 6.0002, 2.9995, 9.0002 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0007, 6.0002, 12.0007, 9.0002 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9993, 6.0002, 11.9993, 9.0002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 0.0002002716, 6.0007, 3.0002, 9.0007 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9998, 6.0007, 15.9998, 9.0007 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9991, 6.0007, 11.9991, 9.0007 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0009, 6.0007, 12.0009, 9.0007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0006, 5.9997, 3.0006, 8.999701 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9994, 5.9997, 15.9994, 8.999701 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 4.0005, 6.0008, 12.0005, 9.0008 ], "texture": "#texture1" }, + "south": { "uv": [ 3.9995, 6.0008, 11.9995, 9.0008 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0002, 6.0008, 16, 9.0008 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0008, 2.9998, 9.0008 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999499, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 5.9996, 7.000141, 8.999599 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.9996, 5.499152, 8.999599 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50085, 5.9996, 16, 8.999599 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0001414193, 6.0006, 3.000141, 9.0006 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00085, 6.0006, 16, 9.0006 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0006, 3.999151, 9.0006 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "north": { "uv": [ 4.0004, 9.0001, 12.0004, 9.5001 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9996, 9.0001, 11.9996, 9.5001 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0007, 9.0001, 16, 9.5001 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 9.0001, 2.9993, 9.5001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "north": { "uv": [ 4.0008, 8.999701, 12.0008, 9.499701 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9992, 8.999701, 11.9992, 9.499701 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0009, 8.999701, 3.0009, 9.499701 ], "texture": "#texture2" }, + "east": { "uv": [ 12.9991, 8.999701, 15.9991, 9.499701 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 0, 8.9993, 2.9993, 9.4993 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0007, 8.9993, 16, 9.4993 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0005, 8.9993, 12.00051, 9.4993 ], "texture": "#texture2" }, + "east": { "uv": [ 3.99949, 8.9993, 11.9995, 9.4993 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0001, 9.0008, 16, 9.5008 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 9.0008, 2.9999, 9.5008 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0009, 9.0008, 12.0009, 9.5008 ], "texture": "#texture2" }, + "east": { "uv": [ 3.9991, 9.0008, 11.9991, 9.5008 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "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": [ 13.99979, 10.00021, 16, 15.50021 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 2.4996, 2.000213, 5.4996 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99979, 2.4996, 16, 5.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00021, 2.4996, 15.50021, 5.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0.4997873, 2.4996, 5.999787, 5.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000212, 5.5009, 7.000212, 6.0009 ], "texture": "#texture2" }, + "west": { "uv": [ 7.056558E-05, 5.5009, 5.50007, 6.0009 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49993, 5.5009, 15.99993, 6.0009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0, 5.4997, 2.999575, 5.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 12, 5.4997, 16, 5.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 5.4997, 4, 5.9997 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 5.5001, 1.998797, 6.0001 ], "texture": "#texture2" }, + "south": { "uv": [ 14.0012, 5.5001, 16, 6.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 5.5001, 15.49993, 6.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 5.5001, 6.000071, 6.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000566, 5.4996, 6.000566, 5.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999434, 5.4996, 12.99943, 5.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000566, 5.4996, 7.500566, 5.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 8.499434, 5.4996, 13.99943, 5.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 9.999646, 2.000354, 12.99965, 7.500354 ], "texture": "#texture1" }, + "north": { "uv": [ 3.000353, 2.501, 6.000354, 5.501 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999646, 2.501, 12.99965, 5.501 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 2.501, 7.500354, 5.501 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499646, 2.501, 13.99965, 5.501 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], + "faces": { + "up": { "uv": [ 0, 3.999599, 2.9996, 11.9996 ], "texture": "#texture1" }, + "north": { "uv": [ 13.0004, 2.5, 16, 5.5 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 2.5, 2.9996, 5.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9996, 2.5, 11.9996, 5.5 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0004, 2.5, 12.0004, 5.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], + "faces": { + "up": { "uv": [ 12.9994, 3.9999, 15.9994, 11.9999 ], "texture": "#texture1" }, + "north": { "uv": [ 0.0005998611, 2.5004, 3.0006, 5.5004 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9994, 2.5004, 15.9994, 5.5004 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9999, 2.5004, 11.9999, 5.5004 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0001, 2.5004, 12.0001, 5.5004 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], + "faces": { + "up": { "uv": [ 4.0005, 0, 12.0005, 3 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9995, 2.5001, 11.9995, 5.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0005, 2.5001, 12.0005, 5.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5001, 3, 5.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 13, 2.5001, 16, 5.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], + "faces": { + "up": { "uv": [ 4.0003, 13.001, 12.0003, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9997, 2.5002, 11.9997, 5.5002 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 2.5002, 12.0003, 5.5002 ], "texture": "#texture1" }, + "west": { "uv": [ 13.001, 2.5002, 16, 5.5002 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5002, 2.999, 5.5002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": [ 4.000636, 0, 7.000636, 5.499646 ], "texture": "#texture1" }, + "south": { "uv": [ 4.000636, 2.5003, 7.000636, 5.5003 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5003, 5.499646, 5.5003 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50035, 2.5003, 16, 5.5003 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "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.0004245522, 12, 3.000425, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0.0004245522, 2.5007, 3.000425, 5.5007 ], "texture": "#texture1" }, + "west": { "uv": [ 12, 2.5007, 16, 5.5007 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5007, 4, 5.5007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "north": { "uv": [ 3.9999, 5.5003, 11.9999, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0001, 5.5003, 12.0001, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.9993, 5.5003, 15.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0.0006999969, 5.5003, 3.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "north": { "uv": [ 3.9997, 5.4992, 11.9997, 5.9992 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0003, 5.4992, 12.0003, 5.9992 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "north": { "uv": [ 0.0004997253, 5.50031, 3.0005, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 12.9995, 5.50031, 15.9995, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9993, 5.50031, 11.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0007, 5.50031, 12.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "north": { "uv": [ 12.9995, 5.5004, 15.9995, 6.000401 ], "texture": "#texture2" }, + "south": { "uv": [ 0.0005, 5.5004, 3.0005, 6.000401 ], "texture": "#texture2" }, + "west": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0.1, 1.1, -2.35 ] + }, + "firstperson_righthand": { + "translation": [ 0, 4, 0 ] + }, + "gui": { + "translation": [ 0, 4, 0 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 4, 0 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json new file mode 100644 index 00000000..71b830ba --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json @@ -0,0 +1,676 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/brick", + "texture": "forgecraft:blocks/brick", + "texture1": "forgecraft:blocks/brick", + "texture2": "forgecraft:blocks/brick", + "texture3": "forgecraft:blocks/brick_lit" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 12.999, 4, 15.999, 12 ], "texture": "#texture1" }, + "north": { "uv": [ 0.001000404, 13.0005, 3.001, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 12.999, 13.0005, 15.999, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 4.0001, 12.9995, 12.0001, 15.9995 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9999, 13.001, 11.9999, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0001, 13.001, 12.0001, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0005, 13.001, 3.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9995, 13.001, 15.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999497, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 3.999222, 10.49993, 6.99922, 15.99993 ], "texture": "#texture1" }, + "south": { "uv": [ 3.999222, 13.0008, 6.99922, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 7.073628E-05, 13.0008, 5.50007, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 10.49993, 13.0008, 15.99993, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "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, 0, 2.999362, 3.999788 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13.0002, 2.999362, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00021, 13.0002, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 13.0002, 3.999788, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 14, 0.4994345, 16, 5.999434 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 14, 13, 16, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00057, 13, 15.50057, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 0.4994345, 13, 5.999434, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "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": [ 9.99894, 8.499646, 12.99893, 13.99965 ], "texture": "#texture1" }, + "north": { "uv": [ 3.00107, 12.9994, 6.00106, 15.9994 ], "texture": "#texture1" }, + "south": { "uv": [ 9.99894, 12.9994, 12.99893, 15.9994 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 12.9994, 7.500354, 15.9994 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499646, 12.9994, 13.99965, 15.9994 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "north": { "uv": [ 13.0001, 12.4997, 16, 12.9997 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 12.4997, 2.9999, 12.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9992, 12.4997, 11.9992, 12.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0008, 12.4997, 12.0008, 12.9997 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 0, 12.5, 2.9992, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0008, 12.5, 16, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9998, 12.5, 11.9998, 13 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0002, 12.5, 12.0002, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 3.9992, 12.4996, 11.9992, 12.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0008, 12.4996, 12.0008, 12.9996 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 12.4996, 2.9991, 12.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 13.0009, 12.4996, 16, 12.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], + "faces": { + "down": { "uv": [ 3.9997, 0, 11.9997, 2.9995 ], "texture": "#texture2" }, + "north": { "uv": [ 4.0003, 12.5, 12.0003, 13 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9997, 12.5, 11.9997, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0005, 12.5, 16, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5, 2.9995, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000778, 12.5001, 7.000778, 13.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0002121299, 12.5001, 5.500212, 13.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49979, 12.5001, 15.99979, 13.0001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.00063649, 12.5003, 3.000637, 13.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00049, 12.5003, 16, 13.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5003, 3.999505, 13.0003 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 12.5004, 1.999223, 13.0004 ], "texture": "#texture2" }, + "south": { "uv": [ 14.00078, 12.5004, 16, 13.0004 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 12.5004, 15.49993, 13.0004 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 12.5004, 6.000071, 13.0004 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000141, 12.5, 6.000141, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999859, 12.5, 12.99986, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 1.999717, 12.5, 7.499717, 13 ], "texture": "#texture3" }, + "east": { "uv": [ 8.500283, 12.5, 14.00028, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 2.999787, 9.5, 5.999788, 12.5 ], "texture": "#texture1" }, + "south": { "uv": [ 10.00021, 9.5, 13.00021, 12.5 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000778, 9.5, 7.500778, 12.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499222, 9.5, 13.99922, 12.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0004, 9.5001, 16, 12.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 9.5001, 2.9996, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0009, 9.5001, 12.0009, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9991, 9.5001, 11.9991, 12.5001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 0.0008001328, 9.4991, 3.0008, 12.4991 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9992, 9.4991, 15.9992, 12.4991 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0001, 9.4991, 12.0001, 12.4991 ], "texture": "#texture3" }, + "east": { "uv": [ 3.9999, 9.4991, 11.9999, 12.4991 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 3.9997, 9.4999, 11.9997, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 9.4999, 12.0003, 12.4999 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0001, 9.4999, 3.0001, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9999, 9.4999, 15.9999, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], + "faces": { + "north": { "uv": [ 3.9993, 9.4999, 11.9993, 12.4999 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0007, 9.4999, 12.0007, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0008, 9.4999, 16, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.4999, 2.9992, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": { + "south": { "uv": [ 4.00106, 9.5001, 7.00106, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 9.5001, 5.499929, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50007, 9.5001, 16, 12.5001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "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": { + "south": { "uv": [ 0.001060658, 9.499599, 3.001061, 12.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 11.99993, 9.499599, 16, 12.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.499599, 4.000071, 12.4996 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 9.499001, 2.000424, 12.499 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99958, 9.499001, 16, 12.499 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 9.499001, 15.49914, 12.499 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5008583, 9.499001, 6.000849, 12.499 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2.0002, 1.9995, 14.0002, 13.9995 ], "texture": "#texture1" }, + "up": { "uv": [ 2.0002, 2.0005, 14.0002, 14.0005 ], "texture": "#texture3" }, + "north": { "uv": [ 1.9998, 15.0009, 13.9998, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2.0002, 15.0009, 14.0002, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2.0005, 15.0009, 14.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 1.9995, 15.0009, 13.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 6.000101, 1.999717, 9.0001 ], "texture": "#texture1" }, + "south": { "uv": [ 14.00028, 6.000101, 16, 9.0001 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 6.000101, 15.49915, 9.0001 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5008488, 6.000101, 6.000849, 9.0001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": { + "south": { "uv": [ 4.000142, 8.9992, 7.000142, 9.4992 ], "texture": "#texture2" }, + "west": { "uv": [ 0.000424311, 8.9992, 5.500424, 9.4992 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49958, 8.9992, 15.99958, 9.4992 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "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": { + "south": { "uv": [ 0.0002118418, 8.9999, 3.000213, 9.4999 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00035, 8.9999, 16, 9.4999 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 8.9999, 3.999647, 9.4999 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 9.000299, 2.000566, 9.500299 ], "texture": "#texture2" }, + "south": { "uv": [ 13.99943, 9.000299, 16, 9.500299 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999859, 9.000299, 15.49986, 9.500299 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5001411, 9.000299, 6.000141, 9.500299 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000849, 9.0009, 6.000849, 9.5009 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999151, 9.0009, 12.99915, 9.5009 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000424, 9.0009, 7.500425, 9.5009 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499575, 9.0009, 13.99958, 9.5009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000848, 5.9998, 6.000849, 8.9998 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999151, 5.9998, 12.99915, 8.9998 ], "texture": "#texture1" }, + "west": { "uv": [ 1.999859, 5.9998, 7.499859, 8.9998 ], "texture": "#texture3" }, + "east": { "uv": [ 8.500141, 5.9998, 14.00014, 8.9998 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13.0005, 6.0002, 16, 9.0002 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 6.0002, 2.9995, 9.0002 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0007, 6.0002, 12.0007, 9.0002 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9993, 6.0002, 11.9993, 9.0002 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 0.0002002716, 6.0007, 3.0002, 9.0007 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9998, 6.0007, 15.9998, 9.0007 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9991, 6.0007, 11.9991, 9.0007 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0009, 6.0007, 12.0009, 9.0007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0006, 5.9997, 3.0006, 8.999701 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9994, 5.9997, 15.9994, 8.999701 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 4.0005, 6.0008, 12.0005, 9.0008 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9995, 6.0008, 11.9995, 9.0008 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0002, 6.0008, 16, 9.0008 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0008, 2.9998, 9.0008 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999497, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 5.9996, 7.000139, 8.999599 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.9996, 5.499152, 8.999599 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50085, 5.9996, 16, 8.999599 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0001414193, 6.000601, 3.000141, 9.0006 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00085, 6.000601, 16, 9.0006 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.000601, 3.999151, 9.0006 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "north": { "uv": [ 4.0004, 9.0001, 12.0004, 9.5001 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9996, 9.0001, 11.9996, 9.5001 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0007, 9.0001, 16, 9.5001 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 9.0001, 2.9993, 9.5001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "north": { "uv": [ 4.0008, 8.999701, 12.0008, 9.499701 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9992, 8.999701, 11.9992, 9.499701 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0009, 8.999701, 3.0009, 9.499701 ], "texture": "#texture2" }, + "east": { "uv": [ 12.9991, 8.999701, 15.9991, 9.499701 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 0, 8.9993, 2.9993, 9.4993 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0007, 8.9993, 16, 9.4993 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0005, 8.9993, 12.00051, 9.4993 ], "texture": "#texture3" }, + "east": { "uv": [ 3.99949, 8.9993, 11.9995, 9.4993 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0001, 9.0008, 16, 9.5008 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 9.0008, 2.9999, 9.5008 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0009, 9.0008, 12.0009, 9.5008 ], "texture": "#texture2" }, + "east": { "uv": [ 3.9991, 9.0008, 11.9991, 9.5008 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "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": [ 12, 9.5, 15, 15 ], "texture": "#texture3" }, + "north": { "uv": [ 0, 2.4996, 2.000213, 5.4996 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99979, 2.4996, 16, 5.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00021, 2.4996, 15.50021, 5.4996 ], "texture": "#texture3" }, + "east": { "uv": [ 0.4997873, 2.4996, 5.999787, 5.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000212, 5.5009, 7.000212, 6.0009 ], "texture": "#texture2" }, + "west": { "uv": [ 7.056558E-05, 5.5009, 5.50007, 6.0009 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49993, 5.5009, 15.99993, 6.0009 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0, 5.4997, 2.999575, 5.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 12, 5.4997, 16, 5.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 5.4997, 4, 5.9997 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "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": [ 0, 5.5001, 1.998797, 6.0001 ], "texture": "#texture2" }, + "south": { "uv": [ 14.0012, 5.5001, 16, 6.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 5.5001, 15.49993, 6.0001 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5000706, 5.5001, 6.000071, 6.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 3.000566, 5.4996, 6.000566, 5.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999434, 5.4996, 12.99943, 5.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000566, 5.4996, 7.500566, 5.9996 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499434, 5.4996, 13.99943, 5.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "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": [ 13, 0, 16, 5.5 ], "texture": "#texture3" }, + "north": { "uv": [ 3.000353, 2.501, 6.000354, 5.501 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999646, 2.501, 12.99965, 5.501 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 2.501, 7.500354, 5.501 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499646, 2.501, 13.99965, 5.501 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], + "faces": { + "up": { "uv": [ 1, 4, 3.9996, 12 ], "texture": "#texture3" }, + "north": { "uv": [ 13.0004, 2.5, 16, 5.5 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 2.5, 2.9996, 5.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9996, 2.5, 11.9996, 5.5 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0004, 2.5, 12.0004, 5.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], + "faces": { + "up": { "uv": [ 12, 4, 15, 12 ], "texture": "#texture3" }, + "north": { "uv": [ 0.0005998611, 2.5004, 3.0006, 5.5004 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9994, 2.5004, 15.9994, 5.5004 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9999, 2.5004, 11.9999, 5.5004 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0001, 2.5004, 12.0001, 5.5004 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], + "faces": { + "up": { "uv": [ 4.0005, 0, 12.0005, 3 ], "texture": "#texture3" }, + "north": { "uv": [ 3.9995, 2.5001, 11.9995, 5.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0005, 2.5001, 12.0005, 5.5001 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 2.5001, 3, 5.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 13, 2.5001, 16, 5.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], + "faces": { + "up": { "uv": [ 4, 0, 12, 2.999 ], "texture": "#texture3", "rotation": 180 }, + "north": { "uv": [ 3.9997, 2.5002, 11.9997, 5.5002 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0003, 2.5002, 12.0003, 5.5002 ], "texture": "#texture1" }, + "west": { "uv": [ 13.001, 2.5002, 16, 5.5002 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5002, 2.999, 5.5002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "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": [ 2, 1, 5, 6.499646 ], "texture": "#texture3" }, + "south": { "uv": [ 4.000636, 2.5003, 7.000636, 5.5003 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5003, 5.499646, 5.5003 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50035, 2.5003, 16, 5.5003 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "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": [ 1, 11, 4, 15 ], "texture": "#texture3" }, + "south": { "uv": [ 0.0004245522, 2.5007, 3.000425, 5.5007 ], "texture": "#texture1" }, + "west": { "uv": [ 12, 2.5007, 16, 5.5007 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5007, 4, 5.5007 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "north": { "uv": [ 3.9999, 5.5003, 11.9999, 6.0003 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0001, 5.5003, 12.0001, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.9993, 5.5003, 15.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0.0006999969, 5.5003, 3.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "north": { "uv": [ 3.9997, 5.4992, 11.9997, 5.9992 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0003, 5.4992, 12.0003, 5.9992 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "north": { "uv": [ 0.0004997253, 5.50031, 3.0005, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 12.9995, 5.50031, 15.9995, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9993, 5.50031, 11.9993, 6.0003 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0007, 5.50031, 12.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "north": { "uv": [ 12.9995, 5.5004, 15.9995, 6.000401 ], "texture": "#texture2" }, + "south": { "uv": [ 0.0005, 5.5004, 3.0005, 6.000401 ], "texture": "#texture2" }, + "west": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture3" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0.1, 1.1, -2.35 ] + }, + "firstperson_righthand": { + "translation": [ 0, 4, 0 ] + }, + "gui": { + "translation": [ 0, 4, 0 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 4, 0 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json deleted file mode 100644 index 14bfb232..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/brick", - "texture": "forgecraft:blocks/brick", - "texture1": "forgecraft:blocks/brick_lit", - "texture2": "forgecraft:blocks/stone_slab", - "texture3": "forgecraft:blocks/stone_slab_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 2, 0, 2 ], - "to": [ 14, 1, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 0, 0, 3 ], - "to": [ 2, 14, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 13 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 13, 3 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 3, 0, 14 ], - "to": [ 13, 1, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 3, 0, 0 ], - "to": [ 13, 14, 2 ], - "faces": { - "down": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 12, 2 ], "texture": "#texture" }, - "north": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "east": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 0, 3 ], - "to": [ 16, 14, 13 ], - "faces": { - "down": { "uv": [ 14, 3, 16, 13 ], "texture": "#texture" }, - "up": { "uv": [ 2, 9, 12, 11 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "south": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" }, - "east": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 3, 1, 14 ], - "to": [ 4, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 13, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 13, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 13, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 12, 1, 14 ], - "to": [ 13, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 1 ], "texture": "#texture" }, - "up": { "uv": [ 3, 15, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 15, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 1, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 3, 3, 14 ], - "to": [ 13, 14, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 9, 13, 11 ], "texture": "#texture" }, - "north": { "uv": [ 2, 2, 12, 13 ], "texture": "#texture" }, - "south": { "uv": [ 3, 2, 13, 13 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 2, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 14 ], - "to": [ 3, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 13 ], - "to": [ 3, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 2 ], - "to": [ 3, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 1 ], - "to": [ 3, 14, 2 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 2 ], - "to": [ 15, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 1 ], - "to": [ 14, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 13 ], - "to": [ 14, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 13 ], - "to": [ 15, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "lid", - "from": [ -0.5, 14, 8 ], - "to": [ 11.5, 16, 20 ], - "rotation": { "origin": [ -0.5, 14, 8 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 2, 14, 14, 2 ], "texture": "#texture2" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture2" }, - "north": { "uv": [ 14, 9, 2, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 2, 4, 14, 6 ], "texture": "#texture2" }, - "west": { "uv": [ 4, 2, 6, 14 ], "texture": "#texture2", "rotation": 270 }, - "east": { "uv": [ 4, 1, 6, 13 ], "texture": "#texture2", "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json deleted file mode 100644 index 928109a3..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/brick", - "texture": "forgecraft:blocks/brick", - "texture1": "forgecraft:blocks/brick_lit", - "texture2": "forgecraft:blocks/stone_slab", - "texture3": "forgecraft:blocks/stone_slab_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 2, 0, 2 ], - "to": [ 14, 1, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, - "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 0, 0, 3 ], - "to": [ 2, 14, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 13 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 13, 3 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 13, 2, 15, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube4", - "from": [ 3, 0, 14 ], - "to": [ 13, 1, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 3, 0, 0 ], - "to": [ 13, 14, 2 ], - "faces": { - "down": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 12, 2 ], "texture": "#texture" }, - "north": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "east": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 0, 3 ], - "to": [ 16, 14, 13 ], - "faces": { - "down": { "uv": [ 14, 3, 16, 13 ], "texture": "#texture" }, - "up": { "uv": [ 2, 9, 12, 11 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 2, 15, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 3, 1, 14 ], - "to": [ 4, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 13, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 13, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 13, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 12, 1, 14 ], - "to": [ 13, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 1 ], "texture": "#texture" }, - "up": { "uv": [ 3, 15, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 15, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 1, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 3, 3, 14 ], - "to": [ 13, 14, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 9, 13, 11 ], "texture": "#texture" }, - "north": { "uv": [ 2, 2, 12, 13 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 2, 13, 13 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 2, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 14 ], - "to": [ 3, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 13 ], - "to": [ 3, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 2 ], - "to": [ 3, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 1 ], - "to": [ 3, 14, 2 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 2 ], - "to": [ 15, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 1 ], - "to": [ 14, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 13 ], - "to": [ 14, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 13 ], - "to": [ 15, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "lid", - "from": [ -0.5, 14, 8 ], - "to": [ 11.5, 16, 20 ], - "rotation": { "origin": [ -0.5, 14, 8 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 2, 14, 14, 2 ], "texture": "#texture3" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture3" }, - "north": { "uv": [ 14, 9, 2, 11 ], "texture": "#texture3" }, - "south": { "uv": [ 2, 4, 14, 6 ], "texture": "#texture3" }, - "west": { "uv": [ 4, 2, 6, 14 ], "texture": "#texture3", "rotation": 270 }, - "east": { "uv": [ 4, 1, 6, 13 ], "texture": "#texture3", "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/firebox.json b/1.11/src/main/resources/assets/forgecraft/models/block/forge.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/block/firebox.json rename to 1.11/src/main/resources/assets/forgecraft/models/block/forge.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json similarity index 99% rename from 1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json rename to 1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json index 17e1e1d1..f63373a2 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json @@ -1,6 +1,7 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { + "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick", "texture1": "forgecraft:blocks/brick_lit" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json new file mode 100644 index 00000000..06754e40 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick" + }, + "parent": "forgecraft:block/forge" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/firebox.json b/1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json similarity index 76% rename from 1.11/src/main/resources/assets/forgecraft/models/item/firebox.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json index 97bffee3..28e9008f 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/firebox.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json @@ -4,5 +4,5 @@ "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick" }, - "parent": "forgecraft:block/firebox" + "parent": "forgecraft:block/forge" } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png index 40cba9131eae21134700c372177756f25a33d4ae..65b6bc5b734c08d89da1dbf9a292348147a2ff04 100644 GIT binary patch delta 631 zcmV--0*L*h2EYZ7RDTc_E6ASb)BpeiO-V#SR5;5m(#=vEM-&C%uUoCrFdl>uAY%yS za%Gb&v&bvuLGof*=LwvjDu@l(7#mq&7!6{W&SJbib?!ZXq5u82>|h~`$MV@F-@Y)L zvMDGwJhbfZQzgzXgykoe4YSColH4{l@8#I@)Kk^M#kstH!hgk*pO1KKSz&J~-`w+h zm)#km5be)+Zdv!NSHkj4ejE)->J3*PgytQo6HfnTFY;naXwgYVB~LYB$!IEXCt-Cf zk2@Yq;qsh=D4e%wgf;ocLzZ{K`kiE}C-%e*aM!cB7d}_?k5uI8YYsc^4!BwJ{sTva zT)dK8pOUdD>3@5+3wiQVSl#k^D)0S5h=fjf_m<{{t43b@%KT9B5YaQQ$%#jlz5LKp zy&1@{A3moI%d;U2*xItr?>zS0^kQ9t(DBo_bM- z+|y#eVwCuF#rleIOWSc+5BY?Sn^rh`J5=7^OZsvEXMY7>Rzn_(Isct9>Zv0CoDRyW zI1rB)EU&2+lC6Te7=Za)`121gYEDX?OCE0Jt%+bP|Meu4--soLTZC3pRIk*$I?nx1hzc<);|9dk4z-xF(g=915MJv-%4Q%cMs@*G(% zX=|q6_wwAbiIU|tPa8tPXv2MCcSS0wri_ws^{>1h3zJ*9sTdc+>Z9C`{0}fy28O!x R0=@tM002ovPDHLkV1krGGphgq delta 730 zcmV<00ww*x1)>I!RDTCGA5QAg^#A|@uSrBfR5;58!E0_CRTzNb_k8Cv7vJKzsRK;~ z2&D8cD`00V1&N&?Bo=@WDkTC0grsd^#}nJ*nRDfN)ZO>r7Pme_JK=b<q}0Xf#bUl^I9|cWR5xf@qkYjF^-fK4UzJy!aod5*M|0+ zH)w%Gru*TZ_TLU44RZaOcDcZC62um&m7`b(Cy-U-lsnvKmnZ{?!gzNiNy1b@xSo*z z+F{6;Goh)s!@`xPQ-I!WTV_c1&lAh(d;W10+%q z^s5Td!s)&v95$pnl6|JVP}nh2NQ}G8>8CpqioEGDS`1@bQ@KdEJ>VR7>G}S^n9fM`hv1nxXKYtjg^MH0ejYxWkhC<*;R{cr{q*HGOsA! zll92y{eYWSRCS9V10s>+3U1~wQ%zY~)F>pYQF*{WWMn#bh*jhiaf=GFMkbb=gwhxE zszIAV?mUy_g6YZ-j|0ZmH0uUA915xk$~q(#s#6At77<0&6s#nQ(d_qu&`0FF#={QihwiMl8G8QL29+dUxs58qv5KnG&nYybcN M07*qoM6N<$g3>5qoB#j- diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png index 371793b63314fd3c36fe4ae28cd055e7bcc54913..1b1f1b2d447ff70ffe5070419ab771439165e27d 100644 GIT binary patch delta 341 zcmV-b0jmCj1D*qrQhx>#5HT_DIjqY700ApWL_t(I%Y9S3Zp0uEoJ1_hhd8;wf0pk^ zpKrDc>nt1rMN;^NTO2D}*|4zl;_d76<43Fj0BWf?7x%350DzKH>k}(5y1}|X=aIG* zK8)@EvF*5rTl+U$9Gfr4B=Vlk+x%FaK`~Q63JDWWtlNJfmp$nm_#Htb$g_0Vw{?~x;U}q)QQG* zAD#&GK|Pst&cc!w(Hi=DxG^KfsZ;$w{>?@$9=~g;FGnsA(q2QGv3&}( zVKC9qPDfQts3tqn<2>ZA&*$@_ssMn9z#074dj|mQy)#c$AvJ+XHQXI@&b+U+FviHc z@FTn4_l?$CCd@hE?ulfKf!;gz-dJlvA_8WHy?4Um6egH;U$W^>NRHnL9Wb@jXML=}@!8%Y)G4Jwo0774)LB5~)h z>q^@qB5BZx^D=P>6<1Zbdv4+R8Y>lUsjA}p?8qYWj|iMr*RA~pSh&@AU1$n|00000 LNkvXXu0mjfZ6=Z$ diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index fa8dfb56..cf05a795 100644 --- a/1.11/src/main/resources/mcmod.info +++ b/1.11/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.2.30", + "version": "1.2.40", "mcversion": "1.11.2", "url": "", "updateUrl": "",