Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Just about done with the Calcinator

Browse source
This commit is contained in:
pahimar 2014-01-11 18:47:17 -05:00
parent b07d70a84e
commit 07bd30b254
7 changed files with 78 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/main/java/com/pahimar/ee3/helper/ColourUtils.java → src/main/java/com/pahimar/ee3/client/helper/ColourUtils.java
View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.helper; package com.pahimar.ee3.client.helper;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -6,23 +6,6 @@ public class ColourUtils
{ {
private static final Pattern HEX_COLOUR_PATTERN = Pattern.compile("[0-9a-fA-F]{6}"); private static final Pattern HEX_COLOUR_PATTERN = Pattern.compile("[0-9a-fA-F]{6}");
@SuppressWarnings("unused")
public static byte[] convertHexColorToByteArray(String hexColor)
{
if (HEX_COLOUR_PATTERN.matcher(hexColor).matches())
{
byte[] colourByteArray = new byte[3];
colourByteArray[0] = (byte) Integer.parseInt(hexColor.substring(0, 2), 16);
colourByteArray[1] = (byte) Integer.parseInt(hexColor.substring(2, 4), 16);
colourByteArray[2] = (byte) Integer.parseInt(hexColor.substring(4, 6), 16);
return colourByteArray;
}
return null;
}
public static byte[] convertIntColourToByteArray(int intColour) public static byte[] convertIntColourToByteArray(int intColour)
{ {
byte[] colourByteArray = new byte[3]; byte[] colourByteArray = new byte[3];
@ -45,63 +28,6 @@ public class ColourUtils
return colourFloatArray; return colourFloatArray;
} }
public static float[] convertByteArrayToFloatArray(byte[] byteArray)
{
float[] colourFloatArray = new float[3];
colourFloatArray[0] = (float) byteArray[0] / 255F;
colourFloatArray[1] = (float) byteArray[1] / 255F;
colourFloatArray[2] = (float) byteArray[2] / 255F;
return colourFloatArray;
}
@SuppressWarnings("unused")
public static byte[] getBlendedColours(String firstColour, String secondColour)
{
byte[] firstColourByteArray = convertHexColorToByteArray(firstColour);
byte[] secondColourByteArray = convertHexColorToByteArray(secondColour);
if (firstColourByteArray != null && secondColourByteArray != null)
{
return getBlendedColours(firstColourByteArray, secondColourByteArray);
}
else
{
return null;
}
}
@SuppressWarnings("unused")
public static byte[] getBlendedColours(byte[] firstColour, byte[] secondColour)
{
byte[][] blendedColours = getByteBlendedColours(firstColour, secondColour, 3);
if (blendedColours.length == 3)
{
return blendedColours[1];
}
else
{
return null;
}
}
public static byte[][] getByteBlendedColours(String firstColour, String secondColour, int steps)
{
byte[] firstColourByteArray = convertHexColorToByteArray(firstColour);
byte[] secondColourByteArray = convertHexColorToByteArray(secondColour);
if (firstColourByteArray != null && secondColourByteArray != null)
{
return getByteBlendedColours(firstColourByteArray, secondColourByteArray, steps);
}
else
{
return null;
}
}
public static byte[][] getByteBlendedColours(byte[] firstColour, byte[] secondColour, int steps) public static byte[][] getByteBlendedColours(byte[] firstColour, byte[] secondColour, int steps)
{ {
if (firstColour.length == 3 && secondColour.length == 3 && steps > 0) if (firstColour.length == 3 && secondColour.length == 3 && steps > 0)
@ -150,21 +76,6 @@ public class ColourUtils
} }
} }
public static float[][] getFloatBlendedColours(String firstColour, String secondColour, int steps)
{
byte[] firstColourByteArray = convertHexColorToByteArray(firstColour);
byte[] secondColourByteArray = convertHexColorToByteArray(secondColour);
if (firstColourByteArray != null && secondColourByteArray != null)
{
return getFloatBlendedColours(firstColourByteArray, secondColourByteArray, steps);
}
else
{
return null;
}
}
public static float[][] getFloatBlendedColours(int firstColour, int secondColour, int steps) public static float[][] getFloatBlendedColours(int firstColour, int secondColour, int steps)
{ {
byte[] firstColourByteArray = convertIntColourToByteArray(firstColour); byte[] firstColourByteArray = convertIntColourToByteArray(firstColour);

38
src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.client.renderer.tileentity; package com.pahimar.ee3.client.renderer.tileentity;
import com.pahimar.ee3.client.helper.ColourUtils;
import com.pahimar.ee3.client.model.ModelCalcinator; import com.pahimar.ee3.client.model.ModelCalcinator;
import com.pahimar.ee3.helper.ColourUtils;
import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.lib.Textures;
import com.pahimar.ee3.tileentity.TileCalcinator; import com.pahimar.ee3.tileentity.TileCalcinator;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
@ -55,7 +55,9 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer
// Render // Render
modelCalcinator.renderPart("Calcinator"); modelCalcinator.renderPart("Calcinator");
if (tileCalcinator.dustStackSize > 0) int dustStackSize = tileCalcinator.leftStackSize + tileCalcinator.rightStackSize;
if (dustStackSize > 0)
{ {
GL11.glPushMatrix(); GL11.glPushMatrix();
@ -63,15 +65,15 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer
GL11.glRotatef(90F, 1F, 0F, 0F); GL11.glRotatef(90F, 1F, 0F, 0F);
GL11.glRotatef(-45F, 0F, 1F, 0F); GL11.glRotatef(-45F, 0F, 1F, 0F);
float[] dustColour = ColourUtils.convertByteArrayToFloatArray(new byte[]{tileCalcinator.dustColourRedChannel, tileCalcinator.dustColourGreenChannel, tileCalcinator.dustColourBlueChannel}); float[] dustColour = getBlendedDustColour(tileCalcinator.leftStackSize, tileCalcinator.leftStackColour, tileCalcinator.rightStackSize, tileCalcinator.rightStackColour);
GL11.glColor4f(dustColour[0], dustColour[1], dustColour[2], 1F); GL11.glColor4f(dustColour[0], dustColour[1], dustColour[2], 1F);
if (tileCalcinator.dustStackSize <= 32) if (dustStackSize <= 32)
{ {
GL11.glScalef(0.25F, 0.25F, 0.25F); GL11.glScalef(0.25F, 0.25F, 0.25F);
GL11.glTranslatef(0.0F, 2.20F, -2.1125F); GL11.glTranslatef(0.0F, 2.20F, -2.1125F);
} }
else if (tileCalcinator.dustStackSize <= 64) else if (dustStackSize <= 64)
{ {
GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glTranslatef(-0.0125F, 0.75F, -0.7125F); GL11.glTranslatef(-0.0125F, 0.75F, -0.7125F);
@ -90,4 +92,30 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
} }
private static float[] getBlendedDustColour(int leftStackSize, int leftStackColour, int rightStackSize, int rightStackColour)
{
if (leftStackSize > 0 && rightStackSize > 0)
{
int stackSizeStepRange = 8;
int factoredLeftStackSize = leftStackSize / stackSizeStepRange;
int factoredRightStackSize = rightStackSize / stackSizeStepRange;
float[][] blendedColours = ColourUtils.getFloatBlendedColours(leftStackColour, rightStackColour, 2 * stackSizeStepRange - 1);
return blendedColours[stackSizeStepRange + (factoredLeftStackSize - factoredRightStackSize)];
}
else if (leftStackSize > 0)
{
return ColourUtils.convertIntColourToFloatArray(leftStackColour);
}
else if (rightStackSize > 0)
{
return ColourUtils.convertIntColourToFloatArray(rightStackColour);
}
else
{
return new float[]{1F, 1F, 1F};
}
}
} }

32
src/main/java/com/pahimar/ee3/network/packet/PacketTileCalcinator.java
View file

@ -16,15 +16,15 @@ public class PacketTileCalcinator extends PacketEE
public byte orientation; public byte orientation;
public byte state; public byte state;
public String customName; public String customName;
public int dustStackSize; public int leftStackSize, leftStackColour;
public byte redChannel, greenChannel, blueChannel; public int rightStackSize, rightStackColour;
public PacketTileCalcinator() public PacketTileCalcinator()
{ {
super(PacketTypeHandler.TILE_CALCINATOR, true); super(PacketTypeHandler.TILE_CALCINATOR, true);
} }
public PacketTileCalcinator(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int dustStackSize, byte redChannel, byte greenChannel, byte blueChannel) public PacketTileCalcinator(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int leftStackSize, int leftStackColour, int rightStackSize, int rightStackColour)
{ {
super(PacketTypeHandler.TILE_CALCINATOR, true); super(PacketTypeHandler.TILE_CALCINATOR, true);
this.x = x; this.x = x;
@ -33,10 +33,10 @@ public class PacketTileCalcinator extends PacketEE
this.orientation = (byte) orientation.ordinal(); this.orientation = (byte) orientation.ordinal();
this.state = state; this.state = state;
this.customName = customName; this.customName = customName;
this.dustStackSize = dustStackSize; this.leftStackSize = leftStackSize;
this.redChannel = redChannel; this.leftStackColour = leftStackColour;
this.greenChannel = greenChannel; this.rightStackSize = rightStackSize;
this.blueChannel = blueChannel; this.rightStackColour = rightStackColour;
} }
@Override @Override
@ -48,10 +48,10 @@ public class PacketTileCalcinator extends PacketEE
data.writeByte(orientation); data.writeByte(orientation);
data.writeByte(state); data.writeByte(state);
data.writeUTF(customName); data.writeUTF(customName);
data.writeInt(dustStackSize); data.writeInt(leftStackSize);
data.writeByte(redChannel); data.writeInt(leftStackColour);
data.writeByte(greenChannel); data.writeInt(rightStackSize);
data.writeByte(blueChannel); data.writeInt(rightStackColour);
} }
@Override @Override
@ -63,15 +63,15 @@ public class PacketTileCalcinator extends PacketEE
orientation = data.readByte(); orientation = data.readByte();
state = data.readByte(); state = data.readByte();
customName = data.readUTF(); customName = data.readUTF();
dustStackSize = data.readInt(); leftStackSize = data.readInt();
redChannel = data.readByte(); leftStackColour = data.readInt();
greenChannel = data.readByte(); rightStackSize = data.readInt();
blueChannel = data.readByte(); rightStackColour = data.readInt();
} }
@Override @Override
public void execute(INetworkManager manager, Player player) public void execute(INetworkManager manager, Player player)
{ {
EquivalentExchange3.proxy.handleTileCalcinatorPacket(x, y, z, ForgeDirection.getOrientation(orientation), state, customName, dustStackSize, redChannel, greenChannel, blueChannel); EquivalentExchange3.proxy.handleTileCalcinatorPacket(x, y, z, ForgeDirection.getOrientation(orientation), state, customName, leftStackSize, leftStackColour, rightStackSize, rightStackColour);
} }
} }

10
src/main/java/com/pahimar/ee3/proxy/ClientProxy.java
View file

@ -159,7 +159,7 @@ public class ClientProxy extends CommonProxy
} }
@Override @Override
public void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int dustStackSize, byte redChannel, byte greenChannel, byte blueChannel) public void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int leftStackSize, int leftStackColour, int rightStackSize, int rightStackColour)
{ {
World world = FMLClientHandler.instance().getClient().theWorld; World world = FMLClientHandler.instance().getClient().theWorld;
TileEntity tileEntity = world.getBlockTileEntity(x, y, z); TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
@ -168,10 +168,10 @@ public class ClientProxy extends CommonProxy
if (tileEntity instanceof TileCalcinator) if (tileEntity instanceof TileCalcinator)
{ {
((TileCalcinator) tileEntity).dustStackSize = dustStackSize; ((TileCalcinator) tileEntity).leftStackSize = leftStackSize;
((TileCalcinator) tileEntity).dustColourRedChannel = redChannel; ((TileCalcinator) tileEntity).leftStackColour = leftStackColour;
((TileCalcinator) tileEntity).dustColourGreenChannel = greenChannel; ((TileCalcinator) tileEntity).rightStackSize = rightStackSize;
((TileCalcinator) tileEntity).dustColourBlueChannel = blueChannel; ((TileCalcinator) tileEntity).rightStackColour = rightStackColour;
world.updateAllLightTypes(x, y, z); world.updateAllLightTypes(x, y, z);
} }
} }

2
src/main/java/com/pahimar/ee3/proxy/IProxy.java
View file

@ -29,7 +29,7 @@ public interface IProxy
public abstract void handleTileWithItemPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int itemID, int metaData, int stackSize, int color); public abstract void handleTileWithItemPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int itemID, int metaData, int stackSize, int color);
public abstract void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int dustStackSize, byte redChannel, byte greenChannel, byte blueChannel); public abstract void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int leftStackSize, int leftStackColour, int rightStackSize, int rightStackColour);
public abstract void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit); public abstract void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit);
} }

2
src/main/java/com/pahimar/ee3/proxy/ServerProxy.java
View file

@ -70,7 +70,7 @@ public class ServerProxy extends CommonProxy
// NOOP // NOOP
} }
public void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int dustStackSize, byte redChannel, byte greenChannel, byte blueChannel) public void handleTileCalcinatorPacket(int x, int y, int z, ForgeDirection orientation, byte state, String customName, int leftStackSize, int leftStackColour, int rightStackSize, int rightStackColour)
{ {
// NOOP // NOOP
} }

73
src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java
View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.tileentity; package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.helper.ColourUtils; import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler; import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileCalcinator; import com.pahimar.ee3.network.packet.PacketTileCalcinator;
@ -39,8 +39,8 @@ public class TileCalcinator extends TileEE implements IInventory
public int fuelBurnTime; // The fuel value for the currently burning fuel public int fuelBurnTime; // The fuel value for the currently burning fuel
public int itemCookTime; // How long the current item has been "cooking" public int itemCookTime; // How long the current item has been "cooking"
public int dustStackSize; public int leftStackSize, leftStackColour;
public byte dustColourRedChannel, dustColourGreenChannel, dustColourBlueChannel; public int rightStackSize, rightStackColour;
public TileCalcinator() public TileCalcinator()
{ {
@ -215,7 +215,6 @@ public class TileCalcinator extends TileEE implements IInventory
// Start "cooking" a new item, if we can // Start "cooking" a new item, if we can
if (this.deviceCookTime == 0 && this.canCalcinate()) if (this.deviceCookTime == 0 && this.canCalcinate())
{ {
// TODO Effect burn speed by fuel quality
this.fuelBurnTime = this.deviceCookTime = TileEntityFurnace.getItemBurnTime(this.inventory[FUEL_INVENTORY_INDEX]); this.fuelBurnTime = this.deviceCookTime = TileEntityFurnace.getItemBurnTime(this.inventory[FUEL_INVENTORY_INDEX]);
if (this.deviceCookTime > 0) if (this.deviceCookTime > 0)
@ -263,6 +262,7 @@ public class TileCalcinator extends TileEE implements IInventory
this.onInventoryChanged(); this.onInventoryChanged();
this.state = this.deviceCookTime > 0 ? (byte) 1 : (byte) 0; this.state = this.deviceCookTime > 0 ? (byte) 1 : (byte) 0;
this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType().blockID, 1, this.state); this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType().blockID, 1, this.state);
// TODO Send stack sizes and colours on update
} }
} }
@ -369,56 +369,25 @@ public class TileCalcinator extends TileEE implements IInventory
} }
} }
public int getCombinedOutputSize()
{
int result = 0;
if (this.inventory[OUTPUT_LEFT_INVENTORY_INDEX] != null)
{
result += this.inventory[OUTPUT_LEFT_INVENTORY_INDEX].stackSize;
}
if (this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX] != null)
{
result += this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX].stackSize;
}
return result;
}
@SideOnly(Side.CLIENT)
public byte[] getBlendedDustColour()
{
if (inventory[OUTPUT_LEFT_INVENTORY_INDEX] != null && inventory[OUTPUT_RIGHT_INVENTORY_INDEX] != null)
{
int leftStackColour = inventory[OUTPUT_LEFT_INVENTORY_INDEX].getItem().getColorFromItemStack(inventory[OUTPUT_LEFT_INVENTORY_INDEX], 1);
int rightStackColour = inventory[OUTPUT_RIGHT_INVENTORY_INDEX].getItem().getColorFromItemStack(inventory[OUTPUT_RIGHT_INVENTORY_INDEX], 1);
int stackSizeStepRange = 8;
int leftStackSize = inventory[OUTPUT_LEFT_INVENTORY_INDEX].stackSize / stackSizeStepRange;
int rightStackSize = inventory[OUTPUT_RIGHT_INVENTORY_INDEX].stackSize / stackSizeStepRange;
byte[][] blendedByteColours = ColourUtils.getByteBlendedColours(ColourUtils.convertIntColourToByteArray(leftStackColour), ColourUtils.convertIntColourToByteArray(rightStackColour), 2 * stackSizeStepRange - 1);
return blendedByteColours[stackSizeStepRange + (leftStackSize - rightStackSize)];
}
else if (inventory[OUTPUT_LEFT_INVENTORY_INDEX] != null)
{
return ColourUtils.convertIntColourToByteArray(inventory[OUTPUT_LEFT_INVENTORY_INDEX].getItem().getColorFromItemStack(inventory[OUTPUT_LEFT_INVENTORY_INDEX], 1));
}
else if (inventory[OUTPUT_RIGHT_INVENTORY_INDEX] != null)
{
return ColourUtils.convertIntColourToByteArray(inventory[OUTPUT_RIGHT_INVENTORY_INDEX].getItem().getColorFromItemStack(inventory[OUTPUT_RIGHT_INVENTORY_INDEX], 1));
}
else
{
return new byte[]{(byte) 255, (byte) 255, (byte) 255};
}
}
@Override @Override
public Packet getDescriptionPacket() public Packet getDescriptionPacket()
{ {
byte[] colourChannels = getBlendedDustColour(); int leftStackSize = 0;
return PacketTypeHandler.populatePacket(new PacketTileCalcinator(xCoord, yCoord, zCoord, orientation, state, customName, getCombinedOutputSize(), colourChannels[0], colourChannels[1], colourChannels[2])); int leftStackColour = Integer.parseInt(Colours.PURE_WHITE, 16);
if (this.inventory[OUTPUT_LEFT_INVENTORY_INDEX] != null)
{
leftStackSize = this.inventory[OUTPUT_LEFT_INVENTORY_INDEX].stackSize;
leftStackColour = this.inventory[OUTPUT_LEFT_INVENTORY_INDEX].getItem().getColorFromItemStack(this.inventory[OUTPUT_LEFT_INVENTORY_INDEX], 1);
}
int rightStackSize = 0;
int rightStackColour = Integer.parseInt(Colours.PURE_WHITE, 16);
if (this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX] != null)
{
rightStackSize = this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX].stackSize;
rightStackColour = this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX].getItem().getColorFromItemStack(this.inventory[OUTPUT_RIGHT_INVENTORY_INDEX], 1);
}
return PacketTypeHandler.populatePacket(new PacketTileCalcinator(xCoord, yCoord, zCoord, orientation, state, customName, leftStackSize, leftStackColour, rightStackSize, rightStackColour));
} }
} }