Item and Block render of Personal Chest and Solar Neutron Activator

This commit is contained in:
aidancbrady committed 2016-05-11 07:29:43 -04:00
1 parent e0eb344394
commit f4023f8baf
5 files changed
+34 -632

No files matched your search

@@ -101,6 +101,7 @@ import mekanism.client.render.tileentity.RenderQuantumEntangloporter;
import mekanism.client.render.tileentity.RenderResistiveHeater;
import mekanism.client.render.tileentity.RenderSecurityDesk;
import mekanism.client.render.tileentity.RenderSeismicVibrator;
import mekanism.client.render.tileentity.RenderSolarNeutronActivator;
import mekanism.client.render.tileentity.RenderTeleporter;
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
import mekanism.client.render.tileentity.RenderThermoelectricBoiler;
@@ -234,7 +235,8 @@ public class ClientProxy extends CommonProxy
public static Map<String, ModelResourceLocation> basicResources = new HashMap<String, ModelResourceLocation>();
public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate",
"Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower"};
"Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest",
"solar_neutron_activator"};
@Override
public void loadConfiguration()
@@ -327,7 +329,7 @@ public class ClientProxy extends CommonProxy
//ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser());
ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier());
ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam());
GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator");
ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator());
GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator");
GameRegistry.registerTileEntity(TileEntityInductionCasing.class, "InductionCasing");
GameRegistry.registerTileEntity(TileEntityInductionPort.class, "InductionPort");
@@ -460,7 +462,7 @@ public class ClientProxy extends CommonProxy
}
}
if(type == MachineType.FLUID_TANK)
if(type == MachineType.FLUID_TANK || type == MachineType.PERSONAL_CHEST || type == MachineType.SOLAR_NEUTRON_ACTIVATOR)
{
properties = "inventory";
}
@@ -12,6 +12,7 @@ import mekanism.client.model.ModelFreeRunners;
import mekanism.client.model.ModelGasMask;
import mekanism.client.model.ModelJetpack;
import mekanism.client.model.ModelScubaTank;
import mekanism.client.model.ModelSolarNeutronActivator;
import mekanism.client.render.ctm.ModelChiselBlock;
import mekanism.client.render.tileentity.RenderBin;
import mekanism.client.render.tileentity.RenderFluidTank;
@@ -33,6 +34,7 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelChest;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -52,6 +54,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.fluids.Fluid;
import org.apache.commons.lang3.tuple.Pair;
import org.lwjgl.opengl.GL11;
public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
{
@@ -70,6 +73,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
public static ModelFreeRunners freeRunners = new ModelFreeRunners();
public static ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler();
public static ModelFlamethrower flamethrower = new ModelFlamethrower();
public static ModelChest personalChest = new ModelChest();
public static ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator();
public BakedCustomItemModel(IBakedModel model, ItemStack s)
{
@@ -116,6 +121,28 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
fluidTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5);
GlStateManager.popMatrix();
}
else if(machineType == MachineType.PERSONAL_CHEST)
{
GlStateManager.pushMatrix();
GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F);
GlStateManager.translate(-0.5F, -0.5F, -0.5F);
GlStateManager.translate(0, 1.0F, 1.0F);
GlStateManager.scale(1.0F, -1F, -1F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png"));
personalChest.renderAll();
GlStateManager.popMatrix();
}
else if(machineType == MachineType.SOLAR_NEUTRON_ACTIVATOR)
{
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.6F, 0.6F, 0.6F);
GL11.glTranslatef(0.0F, -0.55F, 0.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png"));
solarNeutronActivator.render(0.0625F);
}
return;
}