Code upload
no real changes
This commit is contained in:
parent
4e37d9bba4
commit
4efc554934
5 changed files with 23 additions and 25 deletions
|
@ -553,7 +553,7 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
|
||||||
public int onReceiveLiquid(int type, int vol, byte side) {
|
public int onReceiveLiquid(int type, int vol, byte side) {
|
||||||
if(type == 1)
|
if(type == 1)
|
||||||
{
|
{
|
||||||
int rejectedElectricity = Math.max((this.waterStored + vol) - 14, 0);
|
int rejectedElectricity = Math.max((this.waterStored + vol) - this.getLiquidCapacity(1), 0);
|
||||||
this.waterStored += vol - rejectedElectricity;
|
this.waterStored += vol - rejectedElectricity;
|
||||||
return rejectedElectricity;
|
return rejectedElectricity;
|
||||||
}
|
}
|
||||||
|
@ -592,8 +592,6 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public int onProduceLiquid(int type, int maxVol, int side) {
|
public int onProduceLiquid(int type, int maxVol, int side) {
|
||||||
if(count == 10 || count == 20)
|
|
||||||
{
|
|
||||||
if(type == 0)
|
if(type == 0)
|
||||||
{
|
{
|
||||||
if(steamStored > maxVol)
|
if(steamStored > maxVol)
|
||||||
|
@ -602,7 +600,6 @@ public class TileEntityBoiler extends TileEntityMachine implements IInventory, I
|
||||||
return maxVol;
|
return maxVol;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,14 +110,14 @@ public class ItemPipe extends Item implements ITextureProvider
|
||||||
int var3 = par1ItemStack.getItemDamage();
|
int var3 = par1ItemStack.getItemDamage();
|
||||||
switch(var3)
|
switch(var3)
|
||||||
{
|
{
|
||||||
case 1: return "waterPipe";
|
|
||||||
case 0: return "steamPipe";
|
case 0: return "steamPipe";
|
||||||
case 2: return "22";
|
case 1: return "waterPipe";
|
||||||
case 3: return "22";
|
case 2: return "lavaPipe";
|
||||||
case 4: return "22";
|
case 3: return "oilPipe";
|
||||||
case 5: return "22";
|
case 4: return "fuelPipe";
|
||||||
|
case 5: return "airPipe";
|
||||||
|
default: return "Pipe";
|
||||||
}
|
}
|
||||||
return this.getItemName();
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getTextureFile() {
|
public String getTextureFile() {
|
||||||
|
|
|
@ -22,11 +22,11 @@ public class RenderPipe extends TileEntitySpecialRenderer
|
||||||
{
|
{
|
||||||
case 0: bindTextureByName("/eui/SteamPipe.png");break;
|
case 0: bindTextureByName("/eui/SteamPipe.png");break;
|
||||||
case 1: bindTextureByName("/eui/WaterPipe.png");break;
|
case 1: bindTextureByName("/eui/WaterPipe.png");break;
|
||||||
case 2: bindTextureByName("/eui/lavaPipe.png");break;
|
//case 2: bindTextureByName("/eui/lavaPipe.png");break;
|
||||||
case 3: bindTextureByName("/eui/oilPipe.png");break;
|
//case 3: bindTextureByName("/eui/oilPipe.png");break;
|
||||||
case 4: bindTextureByName("/eui/fuelPipe.png");break;
|
//case 4: bindTextureByName("/eui/fuelPipe.png");break;
|
||||||
case 5: bindTextureByName("/eui/airPipe.png");break;
|
//case 5: bindTextureByName("/eui/airPipe.png");break;
|
||||||
default: break;
|
default:bindTextureByName("/eui/DefaultPipe.png"); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
averageElectricity = averageElectricity/connectedConductors;
|
averageElectricity = Math.max(averageElectricity/connectedConductors,0);
|
||||||
if(connectedUnits > 0)
|
if(connectedUnits > 0)
|
||||||
{
|
{
|
||||||
for(byte i = 0; i < 6; i++)
|
for(byte i = 0; i < 6; i++)
|
||||||
|
|
|
@ -16,6 +16,7 @@ public class mod_BasicPipes extends NetworkMod {
|
||||||
public static Block pipe = new net.minecraft.src.eui.pipes.BlockPipe(pipeID).setBlockName("pipe");
|
public static Block pipe = new net.minecraft.src.eui.pipes.BlockPipe(pipeID).setBlockName("pipe");
|
||||||
public static Item parts = new net.minecraft.src.eui.pipes.ItemParts(partID);
|
public static Item parts = new net.minecraft.src.eui.pipes.ItemParts(partID);
|
||||||
public static Item itemPipes = new net.minecraft.src.eui.pipes.ItemPipe(ppipeID);
|
public static Item itemPipes = new net.minecraft.src.eui.pipes.ItemPipe(ppipeID);
|
||||||
|
public static Item gauge = new net.minecraft.src.eui.pipes.ItemGuage(ppipeID+1);
|
||||||
@Override
|
@Override
|
||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
// TODO change version on each update ;/
|
// TODO change version on each update ;/
|
||||||
|
@ -38,15 +39,15 @@ public class mod_BasicPipes extends NetworkMod {
|
||||||
ModLoader.registerBlock(pipe);
|
ModLoader.registerBlock(pipe);
|
||||||
ModLoader.registerTileEntity(net.minecraft.src.eui.pipes.TileEntityPipe.class, "pipe", new RenderPipe());
|
ModLoader.registerTileEntity(net.minecraft.src.eui.pipes.TileEntityPipe.class, "pipe", new RenderPipe());
|
||||||
//Names
|
//Names
|
||||||
|
ModLoader.addName((new ItemStack(gauge, 1, 0)), "guage");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 0)), "Steam");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 0)), "SteamPipe");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 1)), "Water");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 1)), "WaterPipe");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 2)), "Lava");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 2)), "LavaPipe");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 3)), "Oil");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 3)), "OilPipe");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 4)), "Fuel");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 4)), "FuelPipe");
|
||||||
ModLoader.addName((new ItemStack(itemPipes, 1, 5)), "Air");
|
ModLoader.addName((new ItemStack(itemPipes, 1, 5)), "AirPipe");
|
||||||
ModLoader.addName((new ItemStack(parts, 1, 0)), "BronzeTube");
|
ModLoader.addName((new ItemStack(parts, 1, 0)), "BronzeTube");
|
||||||
ModLoader.addName((new ItemStack(parts, 1, 1)), "ObbyTube");
|
ModLoader.addName((new ItemStack(parts, 1, 1)), "IronTube");
|
||||||
ModLoader.addName((new ItemStack(parts, 1, 2)), "LeatherSeal");
|
ModLoader.addName((new ItemStack(parts, 1, 2)), "LeatherSeal");
|
||||||
ModLoader.addName((new ItemStack(parts, 1, 3)), "ObsidianTube");
|
ModLoader.addName((new ItemStack(parts, 1, 3)), "ObsidianTube");
|
||||||
ModLoader.addName((new ItemStack(parts, 1, 4)), "SlimeSeal");
|
ModLoader.addName((new ItemStack(parts, 1, 4)), "SlimeSeal");
|
||||||
|
|
Loading…
Reference in a new issue