Finished Chemical Infuser rendering, added in recipes for new machines (including Combiner which means there may be a tiny conflict if you’ve already started on the name change @unpairedbracket)
Also…happy new year everyone :)
This commit is contained in:
Aidan Brady
parent
c1e40be9ad
commit
692a8a0412
3 changed files with 66 additions and 23 deletions
|
|
@ -4,6 +4,7 @@ import java.util.HashMap;
|
|||
import java.util.Map;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.client.model.ModelChemicalInfuser;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
||||
|
|
@ -32,22 +33,52 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer
|
|||
renderAModelAt((TileEntityChemicalInfuser)tileEntity, x, y, z, partialTick);
|
||||
}
|
||||
|
||||
@SuppressWarnings("incomplete-switch")
|
||||
private void renderAModelAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick)
|
||||
{
|
||||
render(false, x, y, z, tileEntity);
|
||||
|
||||
/*if(tileEntity.gasTank.getGas() != null)
|
||||
if(tileEntity.leftTank.getGas() != null)
|
||||
{
|
||||
push();
|
||||
|
||||
GL11.glTranslatef((float)x, (float)y, (float)z);
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.gasTank.getStored()/tileEntity.gasTank.getMaxGas());
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.leftTank.getStored()/tileEntity.leftTank.getMaxGas());
|
||||
bindTexture(MekanismRenderer.getBlocksTexture());
|
||||
getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.gasTank.getGas().getGas()).render();
|
||||
getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.leftTank.getGas().getGas()).render();
|
||||
GL11.glColor4f(1, 1, 1, 1);
|
||||
|
||||
pop();
|
||||
}*/
|
||||
}
|
||||
|
||||
if(tileEntity.rightTank.getGas() != null)
|
||||
{
|
||||
push();
|
||||
|
||||
switch(ForgeDirection.getOrientation(tileEntity.facing))
|
||||
{
|
||||
case NORTH:
|
||||
GL11.glTranslatef(-0.4375F, 0, 0);
|
||||
break;
|
||||
case SOUTH:
|
||||
GL11.glTranslatef(0.4375F, 0, 0);
|
||||
break;
|
||||
case EAST:
|
||||
GL11.glTranslatef(0, 0, -0.4375F);
|
||||
break;
|
||||
case WEST:
|
||||
GL11.glTranslatef(0, 0, 0.4375F);
|
||||
break;
|
||||
}
|
||||
|
||||
GL11.glTranslatef((float)x, (float)y, (float)z);
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.rightTank.getStored()/tileEntity.rightTank.getMaxGas());
|
||||
bindTexture(MekanismRenderer.getBlocksTexture());
|
||||
getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.rightTank.getGas().getGas()).render();
|
||||
GL11.glColor4f(1, 1, 1, 1);
|
||||
|
||||
pop();
|
||||
}
|
||||
|
||||
render(true, x, y, z, tileEntity);
|
||||
}
|
||||
|
|
@ -116,46 +147,46 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer
|
|||
{
|
||||
case NORTH:
|
||||
{
|
||||
toReturn.minX = 0.125 + offset;
|
||||
toReturn.minX = 0.625 + offset;
|
||||
toReturn.minY = 0.0625 + offset;
|
||||
toReturn.minZ = 0.3125 + offset;
|
||||
toReturn.minZ = 0.625 + offset;
|
||||
|
||||
toReturn.maxX = 0.5 - offset;
|
||||
toReturn.maxX = 0.8125 - offset;
|
||||
toReturn.maxY = 0.9375 - offset;
|
||||
toReturn.maxZ = 0.6875 - offset;
|
||||
toReturn.maxZ = 0.8125 - offset;
|
||||
break;
|
||||
}
|
||||
case SOUTH:
|
||||
{
|
||||
toReturn.minX = 0.5 + offset;
|
||||
toReturn.minX = 0.1875 + offset;
|
||||
toReturn.minY = 0.0625 + offset;
|
||||
toReturn.minZ = 0.3125 + offset;
|
||||
toReturn.minZ = 0.1875 + offset;
|
||||
|
||||
toReturn.maxX = 0.875 - offset;
|
||||
toReturn.maxX = 0.375 - offset;
|
||||
toReturn.maxY = 0.9375 - offset;
|
||||
toReturn.maxZ = 0.6875 - offset;
|
||||
toReturn.maxZ = 0.375 - offset;
|
||||
break;
|
||||
}
|
||||
case WEST:
|
||||
{
|
||||
toReturn.minX = 0.3125 + offset;
|
||||
toReturn.minX = 0.625 + offset;
|
||||
toReturn.minY = 0.0625 + offset;
|
||||
toReturn.minZ = 0.5 + offset;
|
||||
toReturn.minZ = 0.1875 + offset;
|
||||
|
||||
toReturn.maxX = 0.6875 - offset;
|
||||
toReturn.maxX = 0.8125 - offset;
|
||||
toReturn.maxY = 0.9375 - offset;
|
||||
toReturn.maxZ = 0.875 - offset;
|
||||
toReturn.maxZ = 0.375 - offset;
|
||||
break;
|
||||
}
|
||||
case EAST:
|
||||
{
|
||||
toReturn.minX = 0.3125 + offset;
|
||||
toReturn.minX = 0.1875 + offset;
|
||||
toReturn.minY = 0.0625 + offset;
|
||||
toReturn.minZ = 0.125 + offset;
|
||||
toReturn.minZ = 0.625 + offset;
|
||||
|
||||
toReturn.maxX = 0.6875 - offset;
|
||||
toReturn.maxX = 0.375 - offset;
|
||||
toReturn.maxY = 0.9375 - offset;
|
||||
toReturn.maxZ = 0.5 - offset;
|
||||
toReturn.maxZ = 0.8125 - offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -416,7 +416,7 @@ public class Mekanism
|
|||
"COC", "OTO", "COC", Character.valueOf('C'), "circuitBasic", Character.valueOf('O'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('T'), TeleportationCore
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 9), new Object[] {
|
||||
"CAC", "ERE", "CAC", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('R'), new ItemStack(BasicBlock, 1, 8)
|
||||
"CAC", "ERE", "CAC", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('R'), new ItemStack(MachineBlock, 1, 0)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Configurator), new Object[] {
|
||||
" L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Item.stick
|
||||
|
|
@ -483,6 +483,18 @@ public class Mekanism
|
|||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(ScubaTank.getEmptyItem(), new Object[] {
|
||||
" C ", "ATA", "SSS", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('S'), "ingotSteel"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 1), new Object[] {
|
||||
"ACA", "ERG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MachineBlock, 1, 13), Character.valueOf('A'), EnrichedAlloy
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 2), new Object[] {
|
||||
"ACA", "GRG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), EnrichedAlloy
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 3), new Object[] {
|
||||
"ACA", "GRF", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('F'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('A'), EnrichedAlloy
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 4), new Object[] {
|
||||
"ACA", "ERE", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('R'), new ItemStack(MachineBlock, 1, 9)
|
||||
}));
|
||||
|
||||
for(RecipeType type : RecipeType.values())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1091,8 +1091,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
ROTARY_CONDENSENTRATOR(Mekanism.machineBlock2ID, 0, "RotaryCondensentrator", 7, 20000, TileEntityRotaryCondensentrator.class, true),
|
||||
CHEMICAL_OXIDIZER(Mekanism.machineBlock2ID, 1, "ChemicalOxidizer", 29, 20000, TileEntityChemicalOxidizer.class, true),
|
||||
CHEMICAL_INFUSER(Mekanism.machineBlock2ID, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true),
|
||||
CHEMICAL_COMBINER(Mekanism.machineBlock2ID, 4, "ChemicalCombiner", 32, 20000, TileEntityChemicalCombiner.class, false),
|
||||
CHEMICAL_INJECTION_CHAMBER(Mekanism.machineBlock2ID, 3, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, false);
|
||||
CHEMICAL_COMBINER(Mekanism.machineBlock2ID, 3, "ChemicalCombiner", 32, 20000, TileEntityChemicalCombiner.class, false),
|
||||
CHEMICAL_INJECTION_CHAMBER(Mekanism.machineBlock2ID, 4, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, false);
|
||||
|
||||
public int typeId;
|
||||
public int meta;
|
||||
|
|
|
|||
Loading…
Reference in a new issue