model issues and refactoring
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package nmd.primal.forgecraft.blocks;
|
||||
package nmd.primal.forgecraft.blocks.Anvil;
|
||||
|
||||
/**
|
||||
* Created by mminaie on 6/10/17.
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
123
1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java
Normal file
123
1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java
Normal file
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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***/
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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<? extends TileEntity> tile_class, String baseName) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -6,10 +6,7 @@ package nmd.primal.forgecraft.items;
|
||||
public class ItemTest extends BaseItem {
|
||||
|
||||
public ItemTest(String string) {
|
||||
setUnlocalizedName(string);
|
||||
setRegistryName(string);
|
||||
|
||||
|
||||
super(string);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<TilePisto
|
||||
if (state.getValue(PistonBellows.FACING) == EnumFacing.NORTH) {
|
||||
|
||||
GL11.glRotated(0, 0.0F, 1.0F, 0.0F);
|
||||
if (state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) {
|
||||
if (state.getValue(PrimalStates.ACTIVE) == Boolean.TRUE) {
|
||||
//System.out.println(tile.getAnimation());
|
||||
GL11.glTranslated(0.0D, 0, (double) tile.getAnimation() / 25);
|
||||
}
|
||||
ItemStack stackToRender = new ItemStack(ModItems.pistonbellows, 1);
|
||||
ItemStack stackToRender = new ItemStack(ModItems.bellowshandle, 1);
|
||||
renderItem.renderItem(stackToRender, renderItem.getItemModelMesher().getItemModel(stackToRender));
|
||||
}
|
||||
if (state.getValue(PistonBellows.FACING) == EnumFacing.SOUTH) {
|
||||
//GL11.glPushMatrix();
|
||||
GL11.glRotated(180, 0.0F, 1.0F, 0.0F);
|
||||
if (state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) {
|
||||
if (state.getValue(PrimalStates.ACTIVE) == Boolean.TRUE) {
|
||||
//System.out.println(tile.getAnimation());
|
||||
GL11.glTranslated(0.0D, 0, (double) tile.getAnimation() / 25);
|
||||
}
|
||||
ItemStack stackToRender = new ItemStack(ModItems.pistonbellows, 1);
|
||||
ItemStack stackToRender = new ItemStack(ModItems.bellowshandle, 1);
|
||||
renderItem.renderItem(stackToRender, renderItem.getItemModelMesher().getItemModel(stackToRender));
|
||||
//GL11.glPopMatrix();
|
||||
}
|
||||
if (state.getValue(PistonBellows.FACING) == EnumFacing.EAST) {
|
||||
//GL11.glPushMatrix();
|
||||
GL11.glRotated(270, 0.0F, 1.0F, 0.0F);
|
||||
if (state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) {
|
||||
if (state.getValue(PrimalStates.ACTIVE) == Boolean.TRUE) {
|
||||
//System.out.println(tile.getAnimation());
|
||||
GL11.glTranslated(0.0D, 0, (double) tile.getAnimation() / 25);
|
||||
}
|
||||
ItemStack stackToRender = new ItemStack(ModItems.pistonbellows, 1);
|
||||
ItemStack stackToRender = new ItemStack(ModItems.bellowshandle, 1);
|
||||
renderItem.renderItem(stackToRender, renderItem.getItemModelMesher().getItemModel(stackToRender));
|
||||
//GL11.glPopMatrix();
|
||||
}
|
||||
if (state.getValue(PistonBellows.FACING) == EnumFacing.WEST) {
|
||||
//GL11.glPushMatrix();
|
||||
GL11.glRotated(90, 0.0F, 1.0F, 0.0F);
|
||||
if (state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) {
|
||||
if (state.getValue(PrimalStates.ACTIVE) == Boolean.TRUE) {
|
||||
//System.out.println(tile.getAnimation());
|
||||
GL11.glTranslated(0.0D, 0, (double) tile.getAnimation() / 25);
|
||||
}
|
||||
ItemStack stackToRender = new ItemStack(ModItems.pistonbellows, 1);
|
||||
ItemStack stackToRender = new ItemStack(ModItems.bellowshandle, 1);
|
||||
renderItem.renderItem(stackToRender, renderItem.getItemModelMesher().getItemModel(stackToRender));
|
||||
//GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.world.World;
|
||||
import nmd.primal.core.api.PrimalItems;
|
||||
import nmd.primal.core.api.PrimalStates;
|
||||
import nmd.primal.forgecraft.blocks.BloomeryBase;
|
||||
import nmd.primal.forgecraft.blocks.Crucible;
|
||||
import nmd.primal.forgecraft.blocks.Crucibles.Crucible;
|
||||
import nmd.primal.forgecraft.crafting.BloomeryCrafting;
|
||||
import nmd.primal.forgecraft.init.ModItems;
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package nmd.primal.forgecraft.tiles;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
||||
/**
|
||||
* Created by mminaie on 6/19/17.
|
||||
*/
|
||||
public class TileCastingForm extends TileBaseSlot {
|
||||
|
||||
double[] normalX = {0.125,0.3125,0.5,0.6875,0.875};
|
||||
|
||||
public double getNormalX(Integer x) {
|
||||
return normalX[x];
|
||||
}
|
||||
|
||||
double[] normalZ = {0.125,0.3125,0.5,0.6875,0.875};
|
||||
|
||||
public double getNormalZ(Integer z) {
|
||||
return normalZ[z];
|
||||
}
|
||||
|
||||
double[] reverseX = {0.875,0.6875,0.5,0.3125,0.125};
|
||||
|
||||
public double getReverseX(Integer x) {
|
||||
return reverseX[x];
|
||||
}
|
||||
|
||||
double[] reverseZ = {0.875,0.6875,0.5,0.3125,0.125};
|
||||
|
||||
public double getReverseZ(Integer z) {
|
||||
return reverseZ[z];
|
||||
}
|
||||
|
||||
|
||||
public NonNullList<ItemStack> slotList = NonNullList.<ItemStack>withSize(100, ItemStack.EMPTY);
|
||||
|
||||
}
|
||||
@@ -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");
|
||||
|
||||
@@ -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 }
|
||||
}
|
||||
}
|
||||
@@ -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 ]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 ]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 ]
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user