mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Remove unused commands in .obj and .mtl files, remove Electric Pump and Fluidic Plenisher TESRs
This commit is contained in:
1 parent
9af9adb56d
commit
ac7f2f9783
12 files changed
+34
-470
No files matched your search
@@ -84,10 +84,8 @@ import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber;
|
||||
import mekanism.client.render.tileentity.RenderConfigurableMachine;
|
||||
import mekanism.client.render.tileentity.RenderDigitalMiner;
|
||||
import mekanism.client.render.tileentity.RenderDynamicTank;
|
||||
import mekanism.client.render.tileentity.RenderElectricPump;
|
||||
import mekanism.client.render.tileentity.RenderEnergyCube;
|
||||
import mekanism.client.render.tileentity.RenderFluidTank;
|
||||
import mekanism.client.render.tileentity.RenderFluidicPlenisher;
|
||||
import mekanism.client.render.tileentity.RenderGasTank;
|
||||
import mekanism.client.render.tileentity.RenderLogisticalSorter;
|
||||
import mekanism.client.render.tileentity.RenderPersonalChest;
|
||||
@@ -293,7 +291,6 @@ public class ClientProxy extends CommonProxy
|
||||
ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine<TileEntityMetallurgicInfuser>());
|
||||
ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank());
|
||||
ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube());
|
||||
ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump());
|
||||
ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest());
|
||||
ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank());
|
||||
ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank());
|
||||
@@ -309,7 +306,6 @@ public class ClientProxy extends CommonProxy
|
||||
ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator());
|
||||
ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine<TileEntityPRC>());
|
||||
ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank());
|
||||
ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher());
|
||||
ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator());
|
||||
ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine());
|
||||
ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater());
|
||||
@@ -371,7 +367,6 @@ public class ClientProxy extends CommonProxy
|
||||
registerItemRender(MekanismItems.Substrate);
|
||||
registerItemRender(MekanismItems.Polyethene);
|
||||
registerItemRender(MekanismItems.BioFuel);
|
||||
// registerItemRender(MekanismItems.GlowPanel);
|
||||
registerItemRender(MekanismItems.Flamethrower);
|
||||
registerItemRender(MekanismItems.GaugeDropper);
|
||||
registerItemRender(MekanismItems.FactoryInstaller);
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
package mekanism.client.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelElectricPump extends ModelBase
|
||||
{
|
||||
ModelRenderer pumpRingTop;
|
||||
ModelRenderer pumpPortTop;
|
||||
ModelRenderer pumpCasing;
|
||||
ModelRenderer pumpBase;
|
||||
ModelRenderer powerPort;
|
||||
ModelRenderer powerConnector;
|
||||
ModelRenderer powerConnectorFrame4;
|
||||
ModelRenderer powerConnectorFrame3;
|
||||
ModelRenderer powerConnectorFrame2;
|
||||
ModelRenderer powerConnectorFrame1;
|
||||
ModelRenderer pipeToggleBack;
|
||||
ModelRenderer pipeToggleRingBack;
|
||||
ModelRenderer pipeTogglePortBack;
|
||||
ModelRenderer pipeToggleLeft;
|
||||
ModelRenderer pipeToggleRingLeft;
|
||||
ModelRenderer pipeTogglePortLeft;
|
||||
ModelRenderer pipeToggleRight;
|
||||
ModelRenderer pipeToggleRingRight;
|
||||
ModelRenderer pipeTogglePortRight;
|
||||
ModelRenderer pumpPipe;
|
||||
|
||||
public ModelElectricPump()
|
||||
{
|
||||
textureWidth = 128;
|
||||
textureHeight = 64;
|
||||
|
||||
pumpRingTop = new ModelRenderer(this, 68, 9);
|
||||
pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
pumpRingTop.setRotationPoint(-4F, 10F, -4F);
|
||||
pumpRingTop.setTextureSize(128, 64);
|
||||
pumpRingTop.mirror = true;
|
||||
setRotation(pumpRingTop, 0F, 0F, 0F);
|
||||
pumpPortTop = new ModelRenderer(this, 68, 0);
|
||||
pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
pumpPortTop.setRotationPoint(-4F, 8F, -4F);
|
||||
pumpPortTop.setTextureSize(128, 64);
|
||||
pumpPortTop.mirror = true;
|
||||
setRotation(pumpPortTop, 0F, 0F, 0F);
|
||||
pumpCasing = new ModelRenderer(this, 0, 0);
|
||||
pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7);
|
||||
pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F);
|
||||
pumpCasing.setTextureSize(128, 64);
|
||||
pumpCasing.mirror = true;
|
||||
setRotation(pumpCasing, 0F, 0F, 0F);
|
||||
pumpBase = new ModelRenderer(this, 28, 0);
|
||||
pumpBase.addBox(0F, 0F, 0F, 6, 15, 6);
|
||||
pumpBase.setRotationPoint(-3F, 9F, -3F);
|
||||
pumpBase.setTextureSize(128, 64);
|
||||
pumpBase.mirror = true;
|
||||
setRotation(pumpBase, 0F, 0F, 0F);
|
||||
powerPort = new ModelRenderer(this, 38, 29);
|
||||
powerPort.addBox(0F, 0F, 0F, 8, 8, 1);
|
||||
powerPort.setRotationPoint(-4F, 12F, -8F);
|
||||
powerPort.setTextureSize(128, 64);
|
||||
powerPort.mirror = true;
|
||||
setRotation(powerPort, 0F, 0F, 0F);
|
||||
powerConnector = new ModelRenderer(this, 0, 29);
|
||||
powerConnector.addBox(0F, 0F, 0F, 5, 5, 4);
|
||||
powerConnector.setRotationPoint(-2.5F, 13.5F, -7F);
|
||||
powerConnector.setTextureSize(128, 64);
|
||||
powerConnector.mirror = true;
|
||||
setRotation(powerConnector, 0F, 0F, 0F);
|
||||
powerConnectorFrame4 = new ModelRenderer(this, 38, 21);
|
||||
powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4);
|
||||
powerConnectorFrame4.setRotationPoint(2F, 18F, -7F);
|
||||
powerConnectorFrame4.setTextureSize(128, 64);
|
||||
powerConnectorFrame4.mirror = true;
|
||||
setRotation(powerConnectorFrame4, 0F, 0F, 0F);
|
||||
powerConnectorFrame3 = new ModelRenderer(this, 38, 21);
|
||||
powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4);
|
||||
powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F);
|
||||
powerConnectorFrame3.setTextureSize(128, 64);
|
||||
powerConnectorFrame3.mirror = true;
|
||||
setRotation(powerConnectorFrame3, 0F, 0F, 0F);
|
||||
powerConnectorFrame2 = new ModelRenderer(this, 38, 21);
|
||||
powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4);
|
||||
powerConnectorFrame2.setRotationPoint(2F, 13F, -7F);
|
||||
powerConnectorFrame2.setTextureSize(128, 64);
|
||||
powerConnectorFrame2.mirror = true;
|
||||
setRotation(powerConnectorFrame2, 0F, 0F, 0F);
|
||||
powerConnectorFrame1 = new ModelRenderer(this, 38, 21);
|
||||
powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4);
|
||||
powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F);
|
||||
powerConnectorFrame1.setTextureSize(128, 64);
|
||||
powerConnectorFrame1.mirror = true;
|
||||
setRotation(powerConnectorFrame1, 0F, 0F, 0F);
|
||||
pipeToggleBack = new ModelRenderer(this, 0, 19);
|
||||
pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4);
|
||||
pipeToggleBack.setRotationPoint(-3F, 13F, 3F);
|
||||
pipeToggleBack.setTextureSize(128, 64);
|
||||
pipeToggleBack.mirror = true;
|
||||
setRotation(pipeToggleBack, 0F, 0F, 0F);
|
||||
pipeToggleRingBack = new ModelRenderer(this, 18, 30);
|
||||
pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1);
|
||||
pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F);
|
||||
pipeToggleRingBack.setTextureSize(128, 64);
|
||||
pipeToggleRingBack.mirror = true;
|
||||
setRotation(pipeToggleRingBack, 0F, 0F, 0F);
|
||||
pipeTogglePortBack = new ModelRenderer(this, 20, 21);
|
||||
pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1);
|
||||
pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F);
|
||||
pipeTogglePortBack.setTextureSize(128, 64);
|
||||
pipeTogglePortBack.mirror = true;
|
||||
setRotation(pipeTogglePortBack, 0F, 0F, 0F);
|
||||
pipeToggleLeft = new ModelRenderer(this, 34, 38);
|
||||
pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6);
|
||||
pipeToggleLeft.setRotationPoint(3F, 13F, -3F);
|
||||
pipeToggleLeft.setTextureSize(128, 64);
|
||||
pipeToggleLeft.mirror = true;
|
||||
setRotation(pipeToggleLeft, 0F, 0F, 0F);
|
||||
pipeToggleRingLeft = new ModelRenderer(this, 18, 38);
|
||||
pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7);
|
||||
pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F);
|
||||
pipeToggleRingLeft.setTextureSize(128, 64);
|
||||
pipeToggleRingLeft.mirror = true;
|
||||
setRotation(pipeToggleRingLeft, 0F, 0F, 0F);
|
||||
pipeTogglePortLeft = new ModelRenderer(this, 0, 38);
|
||||
pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8);
|
||||
pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F);
|
||||
pipeTogglePortLeft.setTextureSize(128, 64);
|
||||
pipeTogglePortLeft.mirror = true;
|
||||
setRotation(pipeTogglePortLeft, 0F, 0F, 0F);
|
||||
pipeToggleRight = new ModelRenderer(this, 34, 38);
|
||||
pipeToggleRight.mirror = true;
|
||||
pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6);
|
||||
pipeToggleRight.setRotationPoint(-7F, 13F, -3F);
|
||||
pipeToggleRight.setTextureSize(128, 64);
|
||||
setRotation(pipeToggleRight, 0F, 0F, 0F);
|
||||
pipeToggleRingRight = new ModelRenderer(this, 18, 38);
|
||||
pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7);
|
||||
pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F);
|
||||
pipeToggleRingRight.setTextureSize(128, 64);
|
||||
pipeToggleRingRight.mirror = true;
|
||||
setRotation(pipeToggleRingRight, 0F, 0F, 0F);
|
||||
pipeTogglePortRight = new ModelRenderer(this, 0, 38);
|
||||
pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8);
|
||||
pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F);
|
||||
pipeTogglePortRight.setTextureSize(128, 64);
|
||||
pipeTogglePortRight.mirror = true;
|
||||
setRotation(pipeTogglePortRight, 0F, 0F, 0F);
|
||||
pumpPipe = new ModelRenderer(this, 52, 0);
|
||||
pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4);
|
||||
pumpPipe.setRotationPoint(-2F, 24F, -2F);
|
||||
pumpPipe.setTextureSize(128, 64);
|
||||
pumpPipe.mirror = true;
|
||||
setRotation(pumpPipe, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void render(float size)
|
||||
{
|
||||
pumpRingTop.render(size);
|
||||
pumpPortTop.render(size);
|
||||
pumpCasing.render(size);
|
||||
pumpBase.render(size);
|
||||
powerPort.render(size);
|
||||
powerConnector.render(size);
|
||||
powerConnectorFrame4.render(size);
|
||||
powerConnectorFrame3.render(size);
|
||||
powerConnectorFrame2.render(size);
|
||||
powerConnectorFrame1.render(size);
|
||||
/*pipeToggleBack.render(size);
|
||||
pipeToggleRingBack.render(size);
|
||||
pipeTogglePortBack.render(size);
|
||||
pipeToggleLeft.render(size);
|
||||
pipeToggleRingLeft.render(size);
|
||||
pipeTogglePortLeft.render(size);
|
||||
pipeToggleRight.render(size);
|
||||
pipeToggleRingRight.render(size);
|
||||
pipeTogglePortRight.render(size);
|
||||
pumpPipe.render(size);*/
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
{
|
||||
model.rotateAngleX = x;
|
||||
model.rotateAngleY = y;
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
}
|
||||
@@ -1,149 +0,0 @@
|
||||
package mekanism.client.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelFluidicPlenisher extends ModelBase
|
||||
{
|
||||
ModelRenderer bearingRight;
|
||||
ModelRenderer ringTank;
|
||||
ModelRenderer portTop;
|
||||
ModelRenderer portBack;
|
||||
ModelRenderer Connector;
|
||||
ModelRenderer pipeToggle;
|
||||
ModelRenderer ringTop;
|
||||
ModelRenderer ringBottom;
|
||||
ModelRenderer tank;
|
||||
ModelRenderer bearingLeft;
|
||||
ModelRenderer connectorRing;
|
||||
ModelRenderer rod4;
|
||||
ModelRenderer rod3;
|
||||
ModelRenderer rod2;
|
||||
ModelRenderer rod1;
|
||||
|
||||
public ModelFluidicPlenisher()
|
||||
{
|
||||
textureWidth = 64;
|
||||
textureHeight = 64;
|
||||
|
||||
bearingRight = new ModelRenderer(this, 44, 26);
|
||||
bearingRight.mirror = true;
|
||||
bearingRight.addBox(0F, 0F, 0F, 1, 4, 4);
|
||||
bearingRight.setRotationPoint(4F, 14F, -2F);
|
||||
bearingRight.setTextureSize(64, 64);
|
||||
setRotation(bearingRight, 0F, 0F, 0F);
|
||||
ringTank = new ModelRenderer(this, 0, 32);
|
||||
ringTank.addBox(0F, 0F, 0F, 11, 1, 11);
|
||||
ringTank.setRotationPoint(-5.5F, 10F, -5.5F);
|
||||
ringTank.setTextureSize(64, 64);
|
||||
ringTank.mirror = true;
|
||||
setRotation(ringTank, 0F, 0F, 0F);
|
||||
portTop = new ModelRenderer(this, 0, 21);
|
||||
portTop.addBox(0F, 0F, 0F, 10, 1, 10);
|
||||
portTop.setRotationPoint(-5F, 8F, -5F);
|
||||
portTop.setTextureSize(64, 64);
|
||||
portTop.mirror = true;
|
||||
setRotation(portTop, 0F, 0F, 0F);
|
||||
portBack = new ModelRenderer(this, 36, 0);
|
||||
portBack.addBox(0F, 0F, 0F, 8, 8, 1);
|
||||
portBack.setRotationPoint(-4F, 12F, 7F);
|
||||
portBack.setTextureSize(64, 64);
|
||||
portBack.mirror = true;
|
||||
setRotation(portBack, 0F, 0F, 0F);
|
||||
Connector = new ModelRenderer(this, 36, 9);
|
||||
Connector.addBox(0F, 0F, 0F, 5, 5, 4);
|
||||
Connector.setRotationPoint(-2.5F, 13.5F, 3F);
|
||||
Connector.setTextureSize(64, 64);
|
||||
Connector.mirror = true;
|
||||
setRotation(Connector, 0F, 0F, 0F);
|
||||
pipeToggle = new ModelRenderer(this, 32, 44);
|
||||
pipeToggle.addBox(0F, 0F, 0F, 6, 8, 6);
|
||||
pipeToggle.setRotationPoint(-3F, 24F, -3F);
|
||||
pipeToggle.setTextureSize(64, 64);
|
||||
pipeToggle.mirror = true;
|
||||
setRotation(pipeToggle, 0F, 0F, 0F);
|
||||
ringTop = new ModelRenderer(this, 0, 44);
|
||||
ringTop.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
ringTop.setRotationPoint(-4F, 9F, -4F);
|
||||
ringTop.setTextureSize(64, 64);
|
||||
ringTop.mirror = true;
|
||||
setRotation(ringTop, 0F, 0F, 0F);
|
||||
ringBottom = new ModelRenderer(this, 0, 53);
|
||||
ringBottom.addBox(0F, 0F, 0F, 8, 1, 8);
|
||||
ringBottom.setRotationPoint(-4F, 23F, -4F);
|
||||
ringBottom.setTextureSize(64, 64);
|
||||
ringBottom.mirror = true;
|
||||
setRotation(ringBottom, 0F, 0F, 0F);
|
||||
tank = new ModelRenderer(this, 0, 0);
|
||||
tank.addBox(0F, 0F, 0F, 9, 12, 9);
|
||||
tank.setRotationPoint(-4.5F, 11F, -4.5F);
|
||||
tank.setTextureSize(64, 64);
|
||||
tank.mirror = true;
|
||||
setRotation(tank, 0F, 0F, 0F);
|
||||
bearingLeft = new ModelRenderer(this, 44, 26);
|
||||
bearingLeft.addBox(0F, 0F, 0F, 1, 4, 4);
|
||||
bearingLeft.setRotationPoint(-5F, 14F, -2F);
|
||||
bearingLeft.setTextureSize(64, 64);
|
||||
bearingLeft.mirror = true;
|
||||
setRotation(bearingLeft, 0F, 0F, 0F);
|
||||
connectorRing = new ModelRenderer(this, 40, 18);
|
||||
connectorRing.addBox(0F, 0F, 0F, 7, 7, 1);
|
||||
connectorRing.setRotationPoint(-3.5F, 12.5F, 5F);
|
||||
connectorRing.setTextureSize(64, 64);
|
||||
connectorRing.mirror = true;
|
||||
setRotation(connectorRing, 0F, 0F, 0F);
|
||||
rod4 = new ModelRenderer(this, 0, 0);
|
||||
rod4.addBox(0F, 0F, 0F, 1, 1, 3);
|
||||
rod4.setRotationPoint(2F, 18F, 4F);
|
||||
rod4.setTextureSize(64, 64);
|
||||
rod4.mirror = true;
|
||||
setRotation(rod4, 0F, 0F, 0F);
|
||||
rod3 = new ModelRenderer(this, 0, 0);
|
||||
rod3.addBox(0F, 0F, 0F, 1, 1, 3);
|
||||
rod3.setRotationPoint(-3F, 18F, 4F);
|
||||
rod3.setTextureSize(64, 64);
|
||||
rod3.mirror = true;
|
||||
setRotation(rod3, 0F, 0F, 0F);
|
||||
rod2 = new ModelRenderer(this, 0, 0);
|
||||
rod2.addBox(0F, 0F, 0F, 1, 1, 3);
|
||||
rod2.setRotationPoint(2F, 13F, 4F);
|
||||
rod2.setTextureSize(64, 64);
|
||||
rod2.mirror = true;
|
||||
setRotation(rod2, 0F, 0F, 0F);
|
||||
rod1 = new ModelRenderer(this, 0, 0);
|
||||
rod1.addBox(0F, 0F, 0F, 1, 1, 3);
|
||||
rod1.setRotationPoint(-3F, 13F, 4F);
|
||||
rod1.setTextureSize(64, 64);
|
||||
rod1.mirror = true;
|
||||
setRotation(rod1, 0F, 0F, 0F);
|
||||
}
|
||||
|
||||
public void render(float size)
|
||||
{
|
||||
bearingRight.render(size);
|
||||
ringTank.render(size);
|
||||
portTop.render(size);
|
||||
portBack.render(size);
|
||||
Connector.render(size);
|
||||
//pipeToggle.render(size);
|
||||
ringTop.render(size);
|
||||
ringBottom.render(size);
|
||||
tank.render(size);
|
||||
bearingLeft.render(size);
|
||||
connectorRing.render(size);
|
||||
rod4.render(size);
|
||||
rod3.render(size);
|
||||
rod2.render(size);
|
||||
rod1.render(size);
|
||||
}
|
||||
|
||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||
{
|
||||
model.rotateAngleX = x;
|
||||
model.rotateAngleY = y;
|
||||
model.rotateAngleZ = z;
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package mekanism.client.render.tileentity;
|
||||
|
||||
import mekanism.client.model.ModelElectricPump;
|
||||
import mekanism.common.tile.TileEntityElectricPump;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderElectricPump extends TileEntitySpecialRenderer<TileEntityElectricPump>
|
||||
{
|
||||
private ModelElectricPump model = new ModelElectricPump();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntityElectricPump tileEntity, double x, double y, double z, float partialTick, int destroyStage)
|
||||
{
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F);
|
||||
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png"));
|
||||
|
||||
switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/
|
||||
{
|
||||
case 2: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break;
|
||||
case 3: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break;
|
||||
case 4: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break;
|
||||
case 5: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break;
|
||||
}
|
||||
|
||||
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
|
||||
model.render(0.0625F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package mekanism.client.render.tileentity;
|
||||
|
||||
import mekanism.client.model.ModelFluidicPlenisher;
|
||||
import mekanism.common.tile.TileEntityFluidicPlenisher;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class RenderFluidicPlenisher extends TileEntitySpecialRenderer<TileEntityFluidicPlenisher>
|
||||
{
|
||||
private ModelFluidicPlenisher model = new ModelFluidicPlenisher();
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntityFluidicPlenisher tileEntity, double x, double y, double z, float partialTick, int destroyStage)
|
||||
{
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F);
|
||||
|
||||
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png"));
|
||||
|
||||
switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/
|
||||
{
|
||||
case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break;
|
||||
case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break;
|
||||
case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break;
|
||||
case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break;
|
||||
}
|
||||
|
||||
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
|
||||
model.render(0.0625F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
}
|
||||
@@ -63,7 +63,6 @@ import mekanism.common.item.ItemPortableTeleporter;
|
||||
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
|
||||
import mekanism.common.tile.TileEntityAdvancedElectricMachine;
|
||||
import mekanism.common.tile.TileEntityAdvancedFactory;
|
||||
import mekanism.common.tile.TileEntityAmbientAccumulator;
|
||||
import mekanism.common.tile.TileEntityBin;
|
||||
import mekanism.common.tile.TileEntityBoilerCasing;
|
||||
import mekanism.common.tile.TileEntityBoilerValve;
|
||||
@@ -95,9 +94,6 @@ import mekanism.common.tile.TileEntityFormulaicAssemblicator;
|
||||
import mekanism.common.tile.TileEntityFuelwoodHeater;
|
||||
import mekanism.common.tile.TileEntityGasTank;
|
||||
import mekanism.common.tile.TileEntityInductionCasing;
|
||||
import mekanism.common.tile.TileEntityInductionCell;
|
||||
import mekanism.common.tile.TileEntityInductionPort;
|
||||
import mekanism.common.tile.TileEntityInductionProvider;
|
||||
import mekanism.common.tile.TileEntityLaserAmplifier;
|
||||
import mekanism.common.tile.TileEntityLaserTractorBeam;
|
||||
import mekanism.common.tile.TileEntityLogisticalSorter;
|
||||
@@ -115,7 +111,6 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tile.TileEntitySecurityDesk;
|
||||
import mekanism.common.tile.TileEntitySeismicVibrator;
|
||||
import mekanism.common.tile.TileEntitySolarNeutronActivator;
|
||||
import mekanism.common.tile.TileEntityStructuralGlass;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
import mekanism.common.tile.TileEntityThermalEvaporationController;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -164,7 +159,6 @@ public class CommonProxy implements IGuiProvider
|
||||
GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser");
|
||||
GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank");
|
||||
GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube");
|
||||
GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump");
|
||||
GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest");
|
||||
GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank");
|
||||
GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve");
|
||||
@@ -182,7 +176,6 @@ public class CommonProxy implements IGuiProvider
|
||||
GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator");
|
||||
GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank");
|
||||
GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher");
|
||||
GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator");
|
||||
GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator");
|
||||
GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater");
|
||||
|
||||
@@ -84,7 +84,9 @@ import mekanism.common.tile.TileEntityChemicalInfuser;
|
||||
import mekanism.common.tile.TileEntityChemicalOxidizer;
|
||||
import mekanism.common.tile.TileEntityChemicalWasher;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import mekanism.common.tile.TileEntityElectricPump;
|
||||
import mekanism.common.tile.TileEntityElectrolyticSeparator;
|
||||
import mekanism.common.tile.TileEntityFluidicPlenisher;
|
||||
import mekanism.common.tile.TileEntityFuelwoodHeater;
|
||||
import mekanism.common.tile.TileEntityInductionCasing;
|
||||
import mekanism.common.tile.TileEntityInductionCell;
|
||||
@@ -788,11 +790,9 @@ public class Mekanism
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i),
|
||||
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
|
||||
));
|
||||
/*
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i),
|
||||
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
|
||||
));
|
||||
*/
|
||||
}
|
||||
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i),
|
||||
@@ -1202,6 +1202,8 @@ public class Mekanism
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser");
|
||||
GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator");
|
||||
GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump");
|
||||
GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher");
|
||||
|
||||
//Load tile entities that have special renderers.
|
||||
proxy.registerSpecialTileEntities();
|
||||
|
||||
@@ -259,20 +259,19 @@ public class BlockStateBasic extends ExtendedBlockState
|
||||
{
|
||||
EnumFacing facing = state.getValue(BlockStateFacing.facingProperty);
|
||||
|
||||
if(type.canRotateTo(facing))
|
||||
if(!type.canRotateTo(facing))
|
||||
{
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
facing = EnumFacing.NORTH;
|
||||
}
|
||||
else {
|
||||
return new ModelResourceLocation("builtin/missing", "missing");
|
||||
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
}
|
||||
|
||||
if(type.tiers)
|
||||
|
||||
@@ -433,20 +433,19 @@ public class BlockStateMachine extends ExtendedBlockState
|
||||
{
|
||||
EnumFacing facing = state.getValue(BlockStateFacing.facingProperty);
|
||||
|
||||
if(type.canRotateTo(facing))
|
||||
if(!type.canRotateTo(facing))
|
||||
{
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
facing = EnumFacing.NORTH;
|
||||
}
|
||||
else {
|
||||
return new ModelResourceLocation("builtin/missing", "missing");
|
||||
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
}
|
||||
|
||||
if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY)
|
||||
|
||||
@@ -231,20 +231,19 @@ public class BlockStateGenerator extends ExtendedBlockState
|
||||
{
|
||||
EnumFacing facing = state.getValue(BlockStateFacing.facingProperty);
|
||||
|
||||
if(type.canRotateTo(facing))
|
||||
if(!type.canRotateTo(facing))
|
||||
{
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
facing = EnumFacing.NORTH;
|
||||
}
|
||||
else {
|
||||
return new ModelResourceLocation("builtin/missing", "missing");
|
||||
|
||||
if(builder.length() > 0)
|
||||
{
|
||||
builder.append(",");
|
||||
}
|
||||
|
||||
builder.append(BlockStateFacing.facingProperty.getName());
|
||||
builder.append("=");
|
||||
builder.append(facing.getName());
|
||||
}
|
||||
|
||||
if(builder.length() == 0)
|
||||
|
||||
Reference in new issue
Block a user