tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work on textures

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-22 20:27:27 -05:00
parent cc46bebc43
commit 649f128d76
16 changed files with 101 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/mekanism/induction/client/model/ModelMultimeter.java
View file

@ -5,7 +5,6 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelMultimeter extends ModelBase
{
// fields
ModelRenderer Base;
ModelRenderer secPanel;
ModelRenderer arm;
@ -56,14 +55,14 @@ public class ModelMultimeter extends ModelBase
setRotation(infopanel, 0F, 0F, 0F);
}
public void render(float f5)
public void render(float size)
{
Base.render(f5);
secPanel.render(f5);
arm.render(f5);
button.render(f5);
arm2.render(f5);
infopanel.render(f5);
Base.render(size);
secPanel.render(size);
arm.render(size);
button.render(size);
arm2.render(size);
infopanel.render(size);
}
private void setRotation(ModelRenderer model, float x, float y, float z)

21
common/mekanism/induction/client/render/BlockRenderingHandler.java
View file

@ -3,11 +3,14 @@
*/
package mekanism.induction.client.render;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.induction.common.block.BlockBattery;
import mekanism.induction.common.block.BlockEMContractor;
import mekanism.induction.common.block.BlockMultimeter;
import mekanism.induction.common.block.BlockTesla;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
@ -37,8 +40,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.5, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderTesla.TEXTURE_BOTTOM);
RenderTesla.MODEL_BOTTOM.render(0.0625f);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TeslaBottom.png"));
RenderTesla.bottom.render(0.0625f);
GL11.glPopMatrix();
}
else if (block instanceof BlockEMContractor)
@ -46,8 +49,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.5, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderEMContractor.TEXTURE);
RenderEMContractor.MODEL.render(0.0625f);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectromagneticContractor.png"));
RenderEMContractor.model.render(0.0625f);
GL11.glPopMatrix();
}
else if (block instanceof BlockBattery)
@ -55,8 +58,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.42, 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBattery.TEXTURE);
RenderBattery.MODEL.render(0.0625f);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Battery.png"));
RenderBattery.model.render(0.0625f);
GL11.glPopMatrix();
}
else if (block instanceof BlockMultimeter)
@ -64,8 +67,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
GL11.glRotatef(180, 0, 1, 0);
GL11.glTranslated(0, -1, -0.7);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderMultimeter.TEXTURE);
RenderMultimeter.MODEL.render(0.0625f);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Multimeter.png"));
RenderMultimeter.model.render(0.0625f);
GL11.glPopMatrix();
}
}
@ -75,8 +78,6 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
{
if (block instanceof BlockBattery)
{
// FMLClientHandler.instance().getClient().renderEngine.bindTexture(RenderBattery.TEXTURE);
return true;
}

111
common/mekanism/induction/client/render/RenderBattery.java
View file

@ -6,6 +6,8 @@ package mekanism.induction.client.render;
import java.util.Random;
import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.induction.client.model.ModelBattery;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.tileentity.TileEntityBattery;
@ -37,10 +39,8 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderBattery extends TileEntitySpecialRenderer
{
public static final ResourceLocation TEXTURE = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "battery.png");
public static final ResourceLocation TEXTURE_MULTI = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "battery_multi.png");
public static final ModelBattery MODEL = new ModelBattery();
public static final ModelBattery model = new ModelBattery();
private EntityItem fakeBattery;
private Random random = new Random();
protected RenderManager renderManager;
@ -48,112 +48,109 @@ public class RenderBattery extends TileEntitySpecialRenderer
@Override
public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
if (((TileEntityBattery) t).structure.isMultiblock)
if(((TileEntityBattery)t).structure.isMultiblock)
{
this.bindTexture(TEXTURE_MULTI);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BatteryOn.png"));
}
else
{
this.bindTexture(TEXTURE);
else {
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Battery.png"));
}
MODEL.render(0.0625f);
/*
* GL11.glScalef(0.0625f, 0.0625f, 0.0625f); batteryModel.renderAll();
*/
model.render(0.0625f);
GL11.glPopMatrix();
if (Minecraft.getMinecraft().gameSettings.fancyGraphics)
if(Minecraft.getMinecraft().gameSettings.fancyGraphics)
{
if (this.fakeBattery == null)
if(fakeBattery == null)
{
this.fakeBattery = new EntityItem(t.worldObj, 0, 0, 0, new ItemStack(Mekanism.EnergyTablet));
this.fakeBattery.age = 10;
fakeBattery = new EntityItem(t.worldObj, 0, 0, 0, new ItemStack(Mekanism.EnergyTablet));
fakeBattery.age = 10;
}
if (this.renderManager == null)
if(renderManager == null)
{
this.renderManager = RenderManager.instance;
renderManager = RenderManager.instance;
}
int renderAmount = Math.min(((TileEntityBattery) t).clientCells, 16);
int renderAmount = Math.min(((TileEntityBattery)t).clientCells, 16);
if (renderAmount == 0)
if(renderAmount == 0)
{
return;
}
for (int i = 2; i < 6; i++)
for(int i = 2; i < 6; i++)
{
ForgeDirection direction = ForgeDirection.getOrientation(i);
for (int slot = 0; slot < 4; slot++)
for(int slot = 0; slot < 4; slot++)
{
Vector3 sideVec = new Vector3(t).modifyPositionFromSide(correctSide(direction));
Block block = Block.blocksList[sideVec.getBlockID(t.worldObj)];
if (block != null && block.isOpaqueCube())
if(block != null && block.isOpaqueCube())
{
continue;
}
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5f, (float) y + 0.7f, (float) z + 0.5f);
GL11.glTranslatef((float)x + 0.5F, (float)y + 0.7F, (float)z + 0.5F);
float translateX = 0;
float translateY = 0;
switch (slot)
switch(slot)
{
case 0:
translateX = 0.25f;
translateX = 0.25F;
break;
case 1:
translateX = 0.25f;
translateY = -0.5f;
translateX = 0.25F;
translateY = -0.5F;
break;
case 2:
translateX = -0.25f;
translateY = -0.5f;
translateX = -0.25F;
translateY = -0.5F;
break;
case 3:
translateX = -0.25f;
translateX = -0.25F;
break;
}
switch (direction)
switch(direction)
{
case NORTH:
GL11.glTranslatef(-0.5f, 0, 0);
GL11.glTranslatef(-0.5F, 0, 0);
GL11.glTranslatef(0, translateY, translateX);
GL11.glRotatef(90, 0, 1, 0);
break;
case SOUTH:
GL11.glTranslatef(0, 0, -0.5f);
GL11.glTranslatef(0, 0, -0.5F);
GL11.glTranslatef(translateX, translateY, 0);
break;
case WEST:
GL11.glTranslatef(0.5f, 0, 0);
GL11.glTranslatef(0.5F, 0, 0);
GL11.glTranslatef(0, translateY, translateX);
GL11.glRotatef(90, 0, 1, 0);
break;
case EAST:
GL11.glTranslatef(0, 0, 0.5f);
GL11.glTranslatef(0, 0, 0.5F);
GL11.glTranslatef(translateX, translateY, 0);
break;
}
GL11.glScalef(0.5f, 0.5f, 0.5f);
GL11.glScalef(0.4F, 0.4F, 0.4F);
GL11.glTranslatef(0.0F, -0.15F, 0.0F);
this.renderItemSimple(this.fakeBattery);
renderItemSimple(fakeBattery);
GL11.glPopMatrix();
if (--renderAmount <= 0)
if(--renderAmount <= 0)
{
return;
}
@ -164,7 +161,7 @@ public class RenderBattery extends TileEntitySpecialRenderer
private ForgeDirection correctSide(ForgeDirection side)
{
switch (side)
switch(side)
{
case NORTH:
return ForgeDirection.WEST;
@ -181,16 +178,16 @@ public class RenderBattery extends TileEntitySpecialRenderer
public void renderItemSimple(EntityItem entityItem)
{
if (entityItem != null)
if(entityItem != null)
{
Tessellator tessellator = Tessellator.instance;
ItemStack itemStack = entityItem.getEntityItem();
for (int k = 0; k < itemStack.getItem().getRenderPasses(itemStack.getItemDamage()); ++k)
for(int k = 0; k < itemStack.getItem().getRenderPasses(itemStack.getItemDamage()); ++k)
{
Icon icon = itemStack.getItem().getIcon(itemStack, k);
if (icon == null)
if(icon == null)
{
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
ResourceLocation resourcelocation = texturemanager.getResourceLocation(entityItem.getEntityItem().getItemSpriteNumber());
@ -216,30 +213,28 @@ public class RenderBattery extends TileEntitySpecialRenderer
GL11.glTranslatef(-f9, -f10, -((f12 + f11) * b0 / 2.0F));
for (int kj = 0; kj < b0; ++kj)
for(int kj = 0; kj < b0; ++kj)
{
// Makes items offset when in 3D, like when in 2D, looks much better. Considered
// a
// vanilla bug...
if (kj > 0)
if(kj > 0)
{
float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F;
float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F;
float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F;
GL11.glTranslatef(x, y, f12 + f11);
}
else
{
else {
GL11.glTranslatef(0f, 0f, f12 + f11);
}
if (itemstack.getItemSpriteNumber() == 0)
if(itemstack.getItemSpriteNumber() == 0)
{
this.bindTexture(TextureMap.locationBlocksTexture);
bindTexture(TextureMap.locationBlocksTexture);
}
else
{
this.bindTexture(TextureMap.locationItemsTexture);
else {
bindTexture(TextureMap.locationItemsTexture);
}
GL11.glColor4f(1, 1, 1, 1.0F);
@ -255,12 +250,14 @@ public class RenderBattery extends TileEntitySpecialRenderer
public byte getMiniItemCount(ItemStack stack)
{
byte ret = 1;
if (stack.stackSize > 1)
if(stack.stackSize > 1)
ret = 2;
if (stack.stackSize > 15)
if(stack.stackSize > 15)
ret = 3;
if (stack.stackSize > 31)
if(stack.stackSize > 31)
ret = 4;
return ret;
}
}

24
common/mekanism/induction/client/render/RenderEMContractor.java
View file

@ -1,6 +1,8 @@
package mekanism.induction.client.render;
import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.induction.client.model.ModelEMContractor;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
@ -12,10 +14,8 @@ import org.lwjgl.opengl.GL11;
public class RenderEMContractor extends TileEntitySpecialRenderer
{
public static final ModelEMContractor MODEL = new ModelEMContractor(false);
public static final ModelEMContractor model = new ModelEMContractor(false);
public static final ModelEMContractor MODEL_SPIN = new ModelEMContractor(true);
public static final ResourceLocation TEXTURE = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "em_contractor.png");
public static final ResourceLocation TEXTURE_PUSH = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "em_contractor_push.png");
@Override
public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)
@ -25,7 +25,7 @@ public class RenderEMContractor extends TileEntitySpecialRenderer
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
switch (((TileEntityEMContractor) t).getFacing())
switch(((TileEntityEMContractor) t).getFacing())
{
case DOWN:
GL11.glRotatef(180, 0, 0, 1);
@ -51,22 +51,20 @@ public class RenderEMContractor extends TileEntitySpecialRenderer
break;
}
if (((TileEntityEMContractor) t).suck)
if(((TileEntityEMContractor)t).suck)
{
this.bindTexture(TEXTURE);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectromagneticContractor.png"));
}
else
{
this.bindTexture(TEXTURE_PUSH);
else {
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectromagneticContractorOn.png"));
}
if (((TileEntityEMContractor) t).canFunction() && !Mekanism.proxy.isPaused())
if(((TileEntityEMContractor)t).canFunction() && !Mekanism.proxy.isPaused())
{
MODEL_SPIN.render(0.0625f);
}
else
{
MODEL.render(0.0625f);
else {
model.render(0.0625f);
}
GL11.glPopMatrix();

13
common/mekanism/induction/client/render/RenderMultimeter.java
View file

@ -1,5 +1,7 @@
package mekanism.induction.client.render;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.induction.client.model.ModelMultimeter;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
@ -25,9 +27,8 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderMultimeter extends TileEntitySpecialRenderer
{
public static final ModelMultimeter MODEL = new ModelMultimeter();
public static final ResourceLocation TEXTURE = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "multimeter.png");
public static final ModelMultimeter model = new ModelMultimeter();
@Override
public void renderTileEntityAt(TileEntity t, double x, double y, double z, float var8)
{
@ -63,9 +64,9 @@ public class RenderMultimeter extends TileEntitySpecialRenderer
GL11.glRotatef(90, 1, 0, 0);
break;
}
this.bindTexture(TEXTURE);
MODEL.render(0.0625f);
this.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Multimeter.png"));
model.render(0.0625f);
GL11.glPopMatrix();

23
common/mekanism/induction/client/render/RenderTesla.java
View file

@ -3,6 +3,8 @@
*/
package mekanism.induction.client.render;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.induction.client.model.ModelTeslaBottom;
import mekanism.induction.client.model.ModelTeslaMiddle;
import mekanism.induction.client.model.ModelTeslaTop;
@ -23,12 +25,9 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderTesla extends TileEntitySpecialRenderer
{
public static final ResourceLocation TEXTURE_BOTTOM = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "tesla_bottom.png");
public static final ResourceLocation TEXTURE_MIDDLE = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "tesla_middle.png");
public static final ResourceLocation TEXTURE_TOP = new ResourceLocation(MekanismInduction.DOMAIN, MekanismInduction.MODEL_TEXTURE_DIRECTORY + "tesla_top.png");
public static final ModelTeslaBottom MODEL_BOTTOM = new ModelTeslaBottom();
public static final ModelTeslaMiddle MODEL_MIDDLE = new ModelTeslaMiddle();
public static final ModelTeslaTop MODEL_TOP = new ModelTeslaTop();
public static final ModelTeslaBottom bottom = new ModelTeslaBottom();
public static final ModelTeslaMiddle middle = new ModelTeslaMiddle();
public static final ModelTeslaTop top = new ModelTeslaTop();
@Override
public void renderTileEntityAt(TileEntity t, double x, double y, double z, float f)
@ -40,16 +39,16 @@ public class RenderTesla extends TileEntitySpecialRenderer
switch (t.getBlockMetadata())
{
default:
this.bindTexture(TEXTURE_BOTTOM);
MODEL_BOTTOM.render(0.0625f);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TeslaBottom.png"));
bottom.render(0.0625f);
break;
case 1:
this.bindTexture(TEXTURE_MIDDLE);
MODEL_MIDDLE.render(0.0625f);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TeslaMiddle.png"));
middle.render(0.0625f);
break;
case 2:
this.bindTexture(TEXTURE_TOP);
MODEL_TOP.render(0.0625f);
bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "TeslaTop.png"));
top.render(0.0625f);
break;
}

6
common/mekanism/induction/common/MekanismInduction.java
View file

@ -39,12 +39,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class MekanismInduction implements IModule
{
public static final String MAJOR_VERSION = "@MAJOR@";
public static final String MINOR_VERSION = "@MINOR@";
public static final String REVISION_VERSION = "@REVIS@";
public static final String BUILD_VERSION = "@BUILD@";
public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVISION_VERSION;
@Instance("MekanismInduction")
public static MekanismInduction instance;

BIN
resources/assets/mekanism/render/battery.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/assets/mekanism/render/battery_multi.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
resources/assets/mekanism/render/em_contractor.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/assets/mekanism/render/em_contractor_push.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
resources/assets/mekanism/render/insulation.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
resources/assets/mekanism/render/multimeter.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
resources/assets/mekanism/render/tesla_bottom.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/assets/mekanism/render/tesla_middle.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
resources/assets/mekanism/render/tesla_top.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 966 B