From 4d339531356762c3d8352fcc8c69cf4e8b842309 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 19 Jun 2017 07:55:57 -0400 Subject: [PATCH] model issues and refactoring --- .../java/nmd/primal/forgecraft/ModInfo.java | 47 ------- .../blocks/{ => Anvil}/AnvilBase.java | 7 +- .../blocks/{ => Anvil}/AnvilIron.java | 2 +- .../blocks/{ => Anvil}/AnvilSteel.java | 2 +- .../blocks/{ => Anvil}/AnvilStone.java | 2 +- .../forgecraft/blocks/BloomeryBase.java | 4 +- .../nmd/primal/forgecraft/blocks/Breaker.java | 4 +- .../primal/forgecraft/blocks/CastingForm.java | 123 ++++++++++++++++++ .../blocks/{ => Crucibles}/Crucible.java | 2 +- .../blocks/{ => Crucibles}/CrucibleHot.java | 2 +- .../blocks/CustomContainerFacing.java | 6 +- .../nmd/primal/forgecraft/blocks/Forge.java | 4 +- .../forgecraft/blocks/PistonBellows.java | 46 ++++--- .../nmd/primal/forgecraft/init/ModBlocks.java | 9 ++ .../primal/forgecraft/init/ModCrafting.java | 14 +- .../nmd/primal/forgecraft/init/ModItems.java | 17 ++- .../nmd/primal/forgecraft/init/ModTiles.java | 1 + .../nmd/primal/forgecraft/items/BaseItem.java | 4 +- .../forgecraft/items/BaseMultiItem.java | 3 +- .../forgecraft/items/ItemBellowsHandle.java | 15 --- .../forgecraft/items/ItemForgingManual.java | 5 +- .../forgecraft/items/ItemSoftCrucible.java | 5 +- .../forgecraft/items/ItemStoneTongs.java | 2 + .../nmd/primal/forgecraft/items/ItemTest.java | 5 +- .../forgecraft/items/weapons/Musket.java | 3 +- .../renders/blocks/TileAnvilRender.java | 4 +- .../blocks/TilePistonBellowsRender.java | 17 +-- .../primal/forgecraft/tiles/TileBloomery.java | 2 +- .../forgecraft/tiles/TileCastingForm.java | 38 ++++++ .../forgecraft/tiles/TilePistonBellows.java | 7 +- .../forgecraft/blockstates/castingform.json | 12 ++ .../forgecraft/models/block/castingform.json | 47 ++++++- .../forgecraft/models/block/castingform2.json | 111 ++++++++++++++++ .../forgecraft/models/item/castingmud.json | 52 ++++++++ 34 files changed, 477 insertions(+), 147 deletions(-) rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Anvil}/AnvilBase.java (96%) rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Anvil}/AnvilIron.java (98%) rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Anvil}/AnvilSteel.java (61%) rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Anvil}/AnvilStone.java (98%) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Crucibles}/Crucible.java (99%) rename 1.11/src/main/java/nmd/primal/forgecraft/blocks/{ => Crucibles}/CrucibleHot.java (98%) delete mode 100644 1.11/src/main/java/nmd/primal/forgecraft/items/ItemBellowsHandle.java create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/tiles/TileCastingForm.java create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/castingform.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/castingform2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/castingmud.json 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 fd0dd8b1..c59851d4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -27,53 +27,6 @@ public class ModInfo { //public static final String GUI_FACTORY = "nmd.primal.forgecraft.gui.GuiFactory"; //public static final String UPDATE_JSON = ""; - public enum ForgecraftItems { - TEST("test", "itemtest"), - BELLOWSHANDLE("bellowshandle", "bellowshandle"), - STONETONGS("stonetongs", "stonetongs"), - SOFTCRUCIBLE("softcrucible", "softcrucible"), - FORGINGMANUAL("forgingmanual","forgingmanual"); - - private String unlocalizedName; - private String registryName; - - ForgecraftItems(String unlocalizedName, String registryName) { - this.unlocalizedName = unlocalizedName; - this.registryName = registryName; - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - public String getRegistryName() { - return registryName; - } - - } - - public enum ForgecraftBlocks { - FIREBOX("firebox", "firebox"), - PISTONBELLOWS("pistonbellows", "pistonbellows"), - BLOOMERY("bloomery", "bloomery"), - EMPTYCRUCIBLE("emptycrucible", "emptycrucible"); - - private String unlocalizedName; - private String registryName; - - ForgecraftBlocks(String unlocalizedName, String registryName) { - this.unlocalizedName = unlocalizedName; - this.registryName = registryName; - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - public String getRegistryName() { - return registryName; - } - - } - /** Creative Tabs **/ public static CreativeTabs TAB_FORGECRAFT = new CreativeTabs(MOD_ID) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilBase.java similarity index 96% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilBase.java index be19f230..8d0fc7de 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilBase.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Anvil; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -15,6 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.util.AnvilHandler; @@ -26,9 +27,7 @@ public abstract class AnvilBase extends CustomContainerFacing implements AnvilHa private boolean anvil; public AnvilBase(Material material, String registryName, Float hardness, Boolean anvil) { - super(material); - setUnlocalizedName(registryName); - setRegistryName(registryName); + super(material, registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setHardness(hardness); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilIron.java similarity index 98% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilIron.java index 3807773f..a2affcdc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilIron.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Anvil; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilSteel.java similarity index 61% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilSteel.java index c820430d..4c096ba2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilSteel.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilSteel.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Anvil; /** * Created by mminaie on 6/10/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java similarity index 98% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java index 5f99786c..4592f5f9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Anvil; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; 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 88a525b8..c33bbd28 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 @@ -41,9 +41,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr private int maxHeat; public BloomeryBase(Material material, String registryName, Integer maxHeat) { - super(material); - setUnlocalizedName(registryName); - setRegistryName(registryName); + super(material, registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Breaker.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Breaker.java index da131f84..1367d7c2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Breaker.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Breaker.java @@ -29,9 +29,7 @@ import nmd.primal.forgecraft.util.BreakerHandler; public class Breaker extends CustomContainerFacing implements BreakerHandler { public Breaker(Material material, String registryName, Float hardness) { - super(material); - setUnlocalizedName(registryName); - setRegistryName(registryName); + super(material, registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, false)); setHardness(hardness); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java new file mode 100644 index 00000000..4c9f3b05 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java @@ -0,0 +1,123 @@ +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.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.forgecraft.tiles.TileCastingForm; + +import javax.annotation.Nullable; + +/** + * Created by mminaie on 6/19/17. + */ +public class CastingForm extends CustomContainerFacing { + + public CastingForm(Material material, String registryName) { + super(material, registryName); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) { + return new TileCastingForm(); + } + + @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()), 2); + //} + } + + @Override + public int getMetaFromState(IBlockState state) { + int i = 0; + + if( state.getValue(FACING) == EnumFacing.EAST) { + i = 0; + return i; + } + if( state.getValue(FACING) == EnumFacing.WEST) { + i = 1; + return i; + } + if( state.getValue(FACING) == EnumFacing.SOUTH){ + i = 2; + return i; + } + if( state.getValue(FACING) == EnumFacing.NORTH){ + i = 3; + return i; + } + return i; + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + IBlockState iblockstate = this.getDefaultState(); + + if (meta == 0){ + iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST); + } + if (meta == 1) { + iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST); + } + if (meta == 2) { + iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH); + } + if (meta == 3) { + iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH); + } + return iblockstate; + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] {FACING}); + } + + @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; + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java similarity index 99% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java index 1f98dd68..bb5c276e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/Crucible.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Crucibles; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/CrucibleHot.java similarity index 98% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/CrucibleHot.java index fb36c150..1231a36a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/CrucibleHot.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.blocks; +package nmd.primal.forgecraft.blocks.Crucibles; import net.minecraft.block.Block; import net.minecraft.block.BlockDynamicLiquid; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CustomContainerFacing.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CustomContainerFacing.java index 248bad8a..b0e191b2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CustomContainerFacing.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CustomContainerFacing.java @@ -13,9 +13,13 @@ public abstract class CustomContainerFacing extends BlockContainer { public static final PropertyDirection FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL); - protected CustomContainerFacing(Material material) + protected CustomContainerFacing(Material material, String registryName) { super(material); + this.setRegistryName(registryName); + this.setUnlocalizedName(registryName); + this.setHardness(3.0f); + this.setResistance(4.0f); } protected CustomContainerFacing(Material material, MapColor color) 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 1ba4d64b..009da53f 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 @@ -51,9 +51,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider{ protected static final AxisAlignedBB boundBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); public Forge(Material material, String name, Integer maxHeat) { - super(material); - setUnlocalizedName(name); - setRegistryName(name); + super(material, name); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); 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 0dc0e6dc..c8613d79 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 @@ -26,12 +26,14 @@ import nmd.primal.forgecraft.tiles.TilePistonBellows; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; +import static nmd.primal.core.api.PrimalStates.ACTIVE; + /** * Created by mminaie on 1/1/17. */ public class PistonBellows extends CustomContainerFacing { - public static final PropertyBool ACTIVE = PropertyBool.create("active"); + //public static final PropertyBool ACTIVE = PropertyBool.create("active"); //protected static final AxisAlignedBB collideBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.99D, 1.0D); protected static final AxisAlignedBB boundBoxNorth = new AxisAlignedBB(0.1875D, 0.0D, 0.0D, 1.0D, 12 / 16D, 1.0D); protected static final AxisAlignedBB boundBoxSouth = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.8125D, 12 / 16D, 1.0D); @@ -39,11 +41,7 @@ public class PistonBellows extends CustomContainerFacing { protected static final AxisAlignedBB boundBoxWest = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 12 / 16D, 0.8125D); public PistonBellows(Material material, String registryName) { - super(material); - - setUnlocalizedName(ModInfo.ForgecraftBlocks.PISTONBELLOWS.getUnlocalizedName()); - //setRegistryName(ModInfo.ForgecraftBlocks.PISTONBELLOWS.getRegistryName()); - setRegistryName(registryName); + super(material, registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); @@ -70,7 +68,7 @@ public class PistonBellows extends CustomContainerFacing { public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if(!world.isRemote){ //System.out.println(state.getValue(PistonBellows.FACING)); - if(state.getValue(this.ACTIVE) == false) { + if(state.getValue(ACTIVE) == false) { world.setBlockState(pos, state.withProperty(ACTIVE, true), 2); //world.playSound(pos, ForgecraftSounds.PISTON_BELLOWS, SoundCategory.BLOCKS, 1.0f, 1.0f); //world.playSound((double)pos.getX(), (double)pos.getY(), (double)pos.getZ(), ModSounds.PISTON_BELLOWS, SoundCategory.BLOCKS, 1.0f, 1.0f, true); @@ -82,7 +80,7 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(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); @@ -94,7 +92,7 @@ public class PistonBellows extends CustomContainerFacing { } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.EAST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); @@ -110,7 +108,7 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(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); @@ -122,7 +120,7 @@ public class PistonBellows extends CustomContainerFacing { } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.WEST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); @@ -138,7 +136,7 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(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); @@ -150,7 +148,7 @@ public class PistonBellows extends CustomContainerFacing { } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.SOUTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); @@ -166,7 +164,7 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(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); @@ -178,7 +176,7 @@ public class PistonBellows extends CustomContainerFacing { } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.NORTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); @@ -373,18 +371,18 @@ public class PistonBellows extends CustomContainerFacing { public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - if(state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) { + if(state.getValue(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() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } @@ -395,13 +393,13 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } @@ -412,13 +410,13 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -429,13 +427,13 @@ public class PistonBellows extends CustomContainerFacing { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { makeEmbers(world, tempPos, world.rand); } } if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.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 c9215714..45c3f611 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 @@ -20,6 +20,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.common.items.tools.WorkMallet; import nmd.primal.forgecraft.blocks.*; +import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; +import nmd.primal.forgecraft.blocks.Anvil.AnvilIron; +import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.Crucibles.Crucible; +import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; import nmd.primal.forgecraft.items.ForgeHammer; import nmd.primal.forgecraft.tiles.TileAnvil; @@ -33,6 +38,7 @@ public class ModBlocks { public static Block bloomery_brick; public static Block bloomery_adobe; public static Block blockbreaker; + public static Block castingform; public static Block pistonbellowsoak; public static Block pistonbellowsjungle; @@ -94,6 +100,7 @@ public class ModBlocks { 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); + castingform = new CastingForm(Material.WOOD, "castingform"); pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); pistonbellowsjungle = new PistonBellows(Material.WOOD, "pistonbellowsjungle"); @@ -372,6 +379,7 @@ public class ModBlocks { registerBlock(bloomery_brick); registerBlock(bloomery_adobe); registerBlock(blockbreaker); + registerBlock(castingform); registerBlock(pistonbellowsoak); registerBlock(pistonbellowsjungle); @@ -435,6 +443,7 @@ public class ModBlocks { public static void registerRenders() { registerRender(forge_brick); registerRender(forge_adobe); + registerRender(castingform); registerRender(blockbreaker); registerRender(pistonbellowsoak); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index c81b3e29..035b327a 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 @@ -48,20 +48,20 @@ public class ModCrafting { /***Wooden PistonBellows***/ GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsoak), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 0), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 0), 'Y', ModItems.bellowshandle); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsspruce), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 1), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 1), 'Y', ModItems.bellowshandle); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsbirch), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 2), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 2), 'Y', ModItems.bellowshandle); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsjungle), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 3), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 3), 'Y', ModItems.bellowshandle); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsacacia), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 4), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 4), 'Y', ModItems.bellowshandle); GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsdarkoak), "XXX", "X Y", "XXX", - 'X', new ItemStack(Blocks.PLANKS, 1, 5), 'Y', ModItems.pistonbellows); + 'X', new ItemStack(Blocks.PLANKS, 1, 5), 'Y', ModItems.bellowshandle); /***Bellows Handle***/ - GameRegistry.addShapedRecipe(new ItemStack(ModItems.pistonbellows), + GameRegistry.addShapedRecipe(new ItemStack(ModItems.bellowshandle), "X X", "X X", " X ", 'X', Items.STICK); /***Tongs***/ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 8d552839..0c953ee1 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -29,10 +29,11 @@ import nmd.primal.forgecraft.items.weapons.CustomSword; public class ModItems { //public static Item test; - public static Item pistonbellows; + public static Item bellowshandle; public static Item forgehammer; public static Item softcrucible; public static Item stonetongs; + public static Item castingmud; public static Item ironingotballhot; public static Item ironchunkhot; @@ -66,7 +67,6 @@ public class ModItems { public static Item wootzhoehead; - public static Item ironpickaxe; public static Item ironaxe; public static Item ironshovel; @@ -103,12 +103,15 @@ public class ModItems { public static void init() { //OBJLoader.INSTANCE.addDomain(ModInfo.MOD_ID); - pistonbellows = new ItemBellowsHandle(); - softcrucible = new ItemSoftCrucible(); + //pistonbellows = new ItemBellowsHandle("pistonbellows"); + bellowshandle = new BaseItem("bellowshandle"); + softcrucible = new ItemSoftCrucible("softcrucible"); stonetongs = new ItemStoneTongs("stonetongs"); forgehammer = new ForgeHammer("forgehammer"); + castingmud = new BaseItem("castingmud"); //matchlockmusket = new Musket("matchlock_musket"); + /********** TOOL PARTS **********/ @@ -181,7 +184,8 @@ public class ModItems { } public static void register() { - GameRegistry.register(pistonbellows); + GameRegistry.register(castingmud); + GameRegistry.register(bellowshandle); GameRegistry.register(softcrucible); GameRegistry.register(stonetongs); GameRegistry.register(forgehammer); @@ -253,7 +257,8 @@ public class ModItems { @SideOnly(Side.CLIENT) public static void registerRenders() { - registerRender(pistonbellows); + registerRender(castingmud); + registerRender(bellowshandle); registerRender(softcrucible); registerRender(forgehammer); registerRender(ironingotballhot); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java index b2dd3373..dd511ffd 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java @@ -16,6 +16,7 @@ public class ModTiles { registerTileEntity(TileBaseCrucible.class, "basecrucible"); registerTileEntity(TileAnvil.class, "anvil"); registerTileEntity(TileBreaker.class, "breaker"); + registerTileEntity(TileCastingForm.class, "castingform"); } private static void registerTileEntity(Class tile_class, String baseName) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java index f392966a..39be305c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java @@ -8,8 +8,10 @@ import nmd.primal.forgecraft.ModInfo; */ public class BaseItem extends Item { - public BaseItem() + public BaseItem(String registryName) { + this.setRegistryName(registryName); + this.setUnlocalizedName(registryName); this.setCreativeTab(ModInfo.TAB_FORGECRAFT); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java index 233c5972..f1d190d6 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java @@ -11,8 +11,7 @@ public class BaseMultiItem extends BaseItem { private int ID; public BaseMultiItem( String registryName, Item.ToolMaterial material, Integer ID) { - setUnlocalizedName(registryName); - setRegistryName(registryName); + super(registryName); mat = material; this.ID = ID; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemBellowsHandle.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemBellowsHandle.java deleted file mode 100644 index c884fe0c..00000000 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemBellowsHandle.java +++ /dev/null @@ -1,15 +0,0 @@ -package nmd.primal.forgecraft.items; - -import nmd.primal.forgecraft.ModInfo; - -/** - * Created by mminaie on 1/7/17. - */ -public class ItemBellowsHandle extends BaseItem { - - public ItemBellowsHandle() { - setUnlocalizedName(ModInfo.ForgecraftItems.BELLOWSHANDLE.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftItems.BELLOWSHANDLE.getRegistryName()); - } - -} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java index 7fd00a36..86d734f2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java @@ -14,9 +14,8 @@ import nmd.primal.forgecraft.ModInfo; */ public class ItemForgingManual extends BaseItem { - public ItemForgingManual() { - setUnlocalizedName(ModInfo.ForgecraftItems.FORGINGMANUAL.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftItems.FORGINGMANUAL.getRegistryName()); + public ItemForgingManual(String name) { + super(name); } public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java index 5ceb4457..d66a2b51 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemSoftCrucible.java @@ -7,9 +7,8 @@ import nmd.primal.forgecraft.ModInfo; */ public class ItemSoftCrucible extends BaseItem { - public ItemSoftCrucible() { - setUnlocalizedName(ModInfo.ForgecraftItems.SOFTCRUCIBLE.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftItems.SOFTCRUCIBLE.getRegistryName()); + public ItemSoftCrucible(String name) { + super(name); } } 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 72fcb546..b8147732 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 @@ -17,6 +17,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.blocks.*; +import nmd.primal.forgecraft.blocks.Crucibles.Crucible; +import nmd.primal.forgecraft.blocks.Crucibles.CrucibleHot; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileBaseCrucible; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java index 00830493..9a539c35 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java @@ -6,10 +6,7 @@ package nmd.primal.forgecraft.items; public class ItemTest extends BaseItem { public ItemTest(String string) { - setUnlocalizedName(string); - setRegistryName(string); - - + super(string); } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java index e2374d66..803df52d 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -23,8 +23,7 @@ import javax.annotation.Nullable; public class Musket extends BaseItem{ public Musket(String name) { - this.setUnlocalizedName(name); - this.setRegistryName(name); + super(name); this.setCreativeTab(ModInfo.TAB_FORGECRAFT); this.setMaxStackSize(1); this.setNoRepair(); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index 7d88304c..277f1c3c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -14,8 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import nmd.primal.core.api.PrimalItems; -import nmd.primal.forgecraft.blocks.AnvilBase; -import nmd.primal.forgecraft.blocks.AnvilStone; +import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; +import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java index 0b47ba07..6cf5ff24 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TilePistonBellowsRender.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.blocks.PistonBellows; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TilePistonBellows; @@ -44,43 +45,43 @@ public class TilePistonBellowsRender extends TileEntitySpecialRenderer slotList = NonNullList.withSize(100, ItemStack.EMPTY); + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java index 524ef07b..1ab4a66a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java @@ -4,8 +4,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; import net.minecraft.world.World; +import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.blocks.PistonBellows; +import static nmd.primal.core.api.PrimalStates.ACTIVE; + /** * Created by mminaie on 1/5/17. */ @@ -21,7 +24,7 @@ public class TilePistonBellows extends BaseTile implements ITickable{ if (!world.isRemote) { World world = this.getWorld(); IBlockState state = world.getBlockState(this.pos); - if (world.getBlockState(this.getPos()).getValue(PistonBellows.ACTIVE)) { + if (world.getBlockState(this.getPos()).getValue(ACTIVE)) { iteration++; if(iteration <= 15){ animateIteration++; @@ -37,7 +40,7 @@ public class TilePistonBellows extends BaseTile implements ITickable{ if(iteration > 31){ iteration = 0; animateIteration = 0; - world.setBlockState(this.getPos(), state.withProperty(PistonBellows.ACTIVE, false), 3); + world.setBlockState(this.getPos(), state.withProperty(ACTIVE, false), 3); } //System.out.println("Iterating"); diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/castingform.json b/1.11/src/main/resources/assets/forgecraft/blockstates/castingform.json new file mode 100644 index 00000000..63e461f0 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/castingform.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "parent": "forgecraft:castingform" + }, + "variants": { + "facing=north": { "model": "forgecraft:castingform" }, + "facing=east": { "model": "forgecraft:castingform", "y": 90 }, + "facing=south": { "model": "forgecraft:castingform", "y": 180 }, + "facing=west": { "model": "forgecraft:castingform", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/castingform.json b/1.11/src/main/resources/assets/forgecraft/models/block/castingform.json index 89916bab..e0c0356a 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/castingform.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/castingform.json @@ -61,6 +61,51 @@ "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }, "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } } + }, + { + "__comment": "Box6", + "from": [ 7.5, 5, 0 ], + "to": [ 8.5, 6, 1 ], + "faces": { + "up": { "uv": [ 7.5, 0, 8.5, 1 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 0, 10, 1, 11 ], "texture": "#texture" }, + "east": { "uv": [ 15, 10, 16, 11 ], "texture": "#texture" } + } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 1.5 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "thirdperson_lefthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 1.5 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "translation": [ 0, 2, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "translation": [ 0, 2, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "gui": { + "rotation": [ 30, 225, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 90, 0, 180 ], + "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/castingform2.json b/1.11/src/main/resources/assets/forgecraft/models/block/castingform2.json new file mode 100644 index 00000000..e0c0356a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/castingform2.json @@ -0,0 +1,111 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "items/test" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 2, 0 ], + "to": [ 3, 5, 16 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 16 ], "texture": "#texture" }, + "north": { "uv": [ 13, 11, 16, 14 ], "texture": "#texture" }, + "south": { "uv": [ 0, 11, 3, 14 ], "texture": "#texture" }, + "west": { "uv": [ 0, 11, 16, 14 ], "texture": "#texture" }, + "east": { "uv": [ 0, 11, 16, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 13, 2, 0 ], + "to": [ 16, 5, 16 ], + "faces": { + "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 11, 3, 14 ], "texture": "#texture" }, + "south": { "uv": [ 13, 11, 16, 14 ], "texture": "#texture" }, + "west": { "uv": [ 0, 11, 16, 14 ], "texture": "#texture" }, + "east": { "uv": [ 0, 11, 16, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box5", + "from": [ 3, 2, 0 ], + "to": [ 13, 5, 3 ], + "faces": { + "up": { "uv": [ 3, 0, 13, 3 ], "texture": "#texture" }, + "north": { "uv": [ 3, 11, 13, 14 ], "texture": "#texture" }, + "south": { "uv": [ 3, 11, 13, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box5", + "from": [ 3, 2, 13 ], + "to": [ 13, 5, 16 ], + "faces": { + "up": { "uv": [ 3, 13, 13, 16 ], "texture": "#texture" }, + "north": { "uv": [ 3, 11, 13, 14 ], "texture": "#texture" }, + "south": { "uv": [ 3, 11, 13, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box6", + "from": [ 7.5, 5, 0 ], + "to": [ 8.5, 6, 1 ], + "faces": { + "up": { "uv": [ 7.5, 0, 8.5, 1 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 10, 8.5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 0, 10, 1, 11 ], "texture": "#texture" }, + "east": { "uv": [ 15, 10, 16, 11 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 1.5 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "thirdperson_lefthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 1.5 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "translation": [ 0, 2, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "translation": [ 0, 2, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "gui": { + "rotation": [ 30, 225, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 90, 0, 180 ], + "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/item/castingmud.json b/1.11/src/main/resources/assets/forgecraft/models/item/castingmud.json new file mode 100644 index 00000000..cfcf840c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/castingmud.json @@ -0,0 +1,52 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 7, 0, 7 ], + "to": [ 9, 2, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" }, + "north": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" }, + "west": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" }, + "east": { "uv": [ 7, 7, 9, 9 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 0, -90, 55 ], + "translation": [ 0, 4, -5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, -90, 55 ], + "translation": [ 0, 4, -5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 0, 4, -5 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 0, 4, -5 ] + }, + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 5, 0 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "translation": [ 0, 6, 0 ] + } + } +} \ No newline at end of file