mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Got more CTM stuff rendering
This commit is contained in:
1 parent
d8760b842f
commit
98c57960d1
8 files changed
+44
-251
No files matched your search
@@ -9,6 +9,7 @@ import mekanism.api.MekanismConfig.client;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.energy.IEnergizedItem;
|
||||
import mekanism.api.energy.IStrictEnergyStorage;
|
||||
import mekanism.client.render.ctm.CTMBlockRenderContext;
|
||||
import mekanism.client.render.ctm.CTMData;
|
||||
import mekanism.client.render.ctm.ICTMBlock;
|
||||
import mekanism.common.Mekanism;
|
||||
@@ -26,6 +27,7 @@ import mekanism.common.base.ISustainedInventory;
|
||||
import mekanism.common.base.ISustainedTank;
|
||||
import mekanism.common.base.ITierItem;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.states.BlockStateBasic;
|
||||
import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
|
||||
import mekanism.common.block.states.BlockStateFacing;
|
||||
import mekanism.common.block.states.BlockStateMachine;
|
||||
@@ -74,6 +76,7 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
@@ -154,6 +157,21 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
|
||||
}
|
||||
|
||||
public abstract MachineBlock getMachineBlock();
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos)
|
||||
{
|
||||
if(stateIn.getBlock() == null || stateIn.getBlock().getMaterial() == Material.air)
|
||||
{
|
||||
return stateIn;
|
||||
}
|
||||
|
||||
IExtendedBlockState state = (IExtendedBlockState)stateIn;
|
||||
CTMBlockRenderContext ctx = new CTMBlockRenderContext(w, pos);
|
||||
|
||||
return state.withProperty(BlockStateBasic.ctmProperty, ctx);
|
||||
}
|
||||
|
||||
public BlockState createBlockState()
|
||||
{
|
||||
@@ -220,88 +238,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister register)
|
||||
{
|
||||
BASE_ICON = register.registerIcon("mekanism:SteelCasing");
|
||||
DefIcon def = DefIcon.getAll(BASE_ICON).setOverrides(false);
|
||||
|
||||
switch(blockType)
|
||||
{
|
||||
case MACHINE_BLOCK_1:
|
||||
ctms[11][0] = new CTMData("ctm/Teleporter", this, Arrays.asList(11)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(7)).registerIcons(register);
|
||||
|
||||
MekanismRenderer.loadDynamicTextures(register, "enrichment_chamber/" + MachineType.ENRICHMENT_CHAMBER.name, icons[0], def);
|
||||
MekanismRenderer.loadDynamicTextures(register, "osmium_compressor/" + MachineType.OSMIUM_COMPRESSOR.name, icons[1], def);
|
||||
MekanismRenderer.loadDynamicTextures(register, "combiner/" + MachineType.COMBINER.name, icons[2], def);
|
||||
MekanismRenderer.loadDynamicTextures(register, "crusher/" + MachineType.CRUSHER.name, icons[3], def);
|
||||
|
||||
for(RecipeType type : RecipeType.values())
|
||||
{
|
||||
MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()],
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5).setOverrides(false));
|
||||
MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()],
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5).setOverrides(false));
|
||||
MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()],
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0).setOverrides(false),
|
||||
DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5).setOverrides(false));
|
||||
}
|
||||
|
||||
MekanismRenderer.loadDynamicTextures(register, "purification_chamber/" + MachineType.PURIFICATION_CHAMBER.name, icons[9], def);
|
||||
MekanismRenderer.loadDynamicTextures(register, "energized_smelter/" + MachineType.ENERGIZED_SMELTER.name, icons[10], def);
|
||||
icons[11][0] = ctms[11][0].mainTextureData.icon;
|
||||
|
||||
break;
|
||||
case MACHINE_BLOCK_2:
|
||||
MekanismRenderer.loadDynamicTextures(register, "chemical_injection_chamber/" + MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def);
|
||||
MekanismRenderer.loadDynamicTextures(register, "precision_sawmill/" + MachineType.PRECISION_SAWMILL.name, icons[5], def);
|
||||
|
||||
break;
|
||||
case MACHINE_BLOCK_3:
|
||||
icons[0][0] = BASE_ICON;
|
||||
icons[2][0] = BASE_ICON;
|
||||
MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3]);
|
||||
icons[4][0] = BASE_ICON;
|
||||
MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5]);
|
||||
MekanismRenderer.loadDynamicTextures(register, "fuelwood_heater/" + MachineType.FUELWOOD_HEATER.name, icons[6]);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(ItemStack stack, int side)
|
||||
{
|
||||
MachineType type = MachineType.get(stack);
|
||||
ItemBlockMachine item = (ItemBlockMachine)stack.getItem();
|
||||
|
||||
if(type == MachineType.BASIC_FACTORY)
|
||||
{
|
||||
return factoryIcons[0][item.getRecipeType(stack)][side];
|
||||
}
|
||||
else if(type == MachineType.ADVANCED_FACTORY)
|
||||
{
|
||||
return factoryIcons[1][item.getRecipeType(stack)][side];
|
||||
}
|
||||
else if(type == MachineType.ELITE_FACTORY)
|
||||
{
|
||||
return factoryIcons[2][item.getRecipeType(stack)][side];
|
||||
}
|
||||
|
||||
return getIcon(side, stack.getItemDamage());
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
|
||||
{
|
||||
@@ -448,107 +384,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int side, int meta)
|
||||
{
|
||||
switch(blockType)
|
||||
{
|
||||
case MACHINE_BLOCK_1:
|
||||
switch(meta)
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 9:
|
||||
case 10:
|
||||
return icons[meta][side];
|
||||
default:
|
||||
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
|
||||
}
|
||||
case MACHINE_BLOCK_2:
|
||||
switch(meta)
|
||||
{
|
||||
case 3:
|
||||
case 5:
|
||||
return icons[meta][side];
|
||||
default:
|
||||
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
|
||||
}
|
||||
case MACHINE_BLOCK_3:
|
||||
switch(meta)
|
||||
{
|
||||
case 3:
|
||||
case 5:
|
||||
case 6:
|
||||
return icons[meta][side];
|
||||
default:
|
||||
return icons[meta][0] != null ? icons[meta][0] : BASE_ICON;
|
||||
}
|
||||
default:
|
||||
return BASE_ICON;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(IBlockAccess world, BlockPos pos, int side)
|
||||
{
|
||||
int meta = world.getBlockMetadata(pos);
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos);
|
||||
|
||||
switch(blockType)
|
||||
{
|
||||
case MACHINE_BLOCK_1:
|
||||
switch(meta)
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 9:
|
||||
case 10:
|
||||
boolean active = MekanismUtils.isActive(world, pos);
|
||||
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
TileEntityFactory factory = (TileEntityFactory)tileEntity;
|
||||
active = MekanismUtils.isActive(world, pos);
|
||||
|
||||
return factoryIcons[factory.tier.ordinal()][factory.recipeType.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
default:
|
||||
return icons[meta][0];
|
||||
}
|
||||
case MACHINE_BLOCK_2:
|
||||
switch(meta)
|
||||
{
|
||||
case 3:
|
||||
case 5:
|
||||
boolean active = MekanismUtils.isActive(world, pos);
|
||||
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
default:
|
||||
return icons[meta][0];
|
||||
}
|
||||
case MACHINE_BLOCK_3:
|
||||
switch(meta)
|
||||
{
|
||||
case 3:
|
||||
case 5:
|
||||
case 6:
|
||||
boolean active = MekanismUtils.isActive(world, pos);
|
||||
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
|
||||
default:
|
||||
return icons[meta][0];
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
*/
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state)
|
||||
{
|
||||
@@ -1274,22 +1109,4 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
|
||||
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
@Override
|
||||
public CTMData getCTMData(IBlockAccess world, BlockPos pos, int meta)
|
||||
{
|
||||
if(ctms[meta][1] != null && MekanismUtils.isActive(world, pos))
|
||||
{
|
||||
return ctms[meta][1];
|
||||
}
|
||||
|
||||
return ctms[meta][0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldRenderBlock(IBlockAccess world, BlockPos pos, int meta)
|
||||
{
|
||||
return !MachineType.get(this, meta).hasModel;
|
||||
}*/
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user