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

v4.3 Release

Browse source 
*Gave all items and blocks their own special creative tab.
*Removed items and blocks from MC creative tabs.
*Buffed energy system to fix energy duplication glitch.
*Polished Power Unit and Generator GUIs.
This commit is contained in:
Aidan Brady 2012-10-29 21:13:40 -04:00
parent 1be888ca88
commit e885dd64d4
26 changed files with 99 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/net/uberkat/obsidian/common/BlockGenerator.java
View file

@ -18,7 +18,7 @@ public class BlockGenerator extends BlockContainer
super(id, Material.iron);
setHardness(3.5F);
setResistance(8F);
setCreativeTab(CreativeTabs.tabDecorations);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
setRequiresSelfNotify();
}

2
src/common/net/uberkat/obsidian/common/BlockMachine.java
View file

@ -27,7 +27,7 @@ public class BlockMachine extends BlockContainer
super(id, Material.iron);
setHardness(3.5F);
setResistance(8F);
setCreativeTab(CreativeTabs.tabDecorations);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
setRequiresSelfNotify();
}

2
src/common/net/uberkat/obsidian/common/BlockMulti.java
View file

@ -25,7 +25,7 @@ public class BlockMulti extends Block
super(i, Material.iron);
setHardness(5F);
setResistance(10F);
setCreativeTab(CreativeTabs.tabBlock);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
setRequiresSelfNotify();
}

2
src/common/net/uberkat/obsidian/common/BlockOre.java
View file

@ -19,7 +19,7 @@ public class BlockOre extends Block
super(i, Material.rock);
setHardness(3F);
setResistance(5F);
setCreativeTab(CreativeTabs.tabBlock);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
setRequiresSelfNotify();
}

2
src/common/net/uberkat/obsidian/common/BlockPowerUnit.java
View file

@ -26,7 +26,7 @@ public class BlockPowerUnit extends BlockContainer
super(id, Material.iron);
setHardness(2F);
setResistance(4F);
setCreativeTab(CreativeTabs.tabDecorations);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
setRequiresSelfNotify();
}

16
src/common/net/uberkat/obsidian/common/CreativeTabOI.java Normal file
View file

@ -0,0 +1,16 @@
package net.uberkat.obsidian.common;
import net.minecraft.src.*;
public class CreativeTabOI extends CreativeTabs
{
public CreativeTabOI()
{
super("tabObsidian");
}
public ItemStack getIconItemStack()
{
return new ItemStack(ObsidianIngots.ObsidianIngot);
}
}

2
src/common/net/uberkat/obsidian/common/ItemEnergized.java
View file

@ -28,7 +28,7 @@ public class ItemEnergized extends ItemObsidian implements IEnergizedItem, IItem
setMaxStackSize(1);
setMaxDamage(maxEnergy/divider);
setNoRepair();
setCreativeTab(CreativeTabs.tabRedstone);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag)

2
src/common/net/uberkat/obsidian/common/ItemLightningRod.java
View file

@ -9,7 +9,7 @@ public class ItemLightningRod extends ItemObsidian
super(i);
setMaxStackSize(1);
setMaxDamage(100);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public boolean hasEffect(ItemStack par1ItemStack)

2
src/common/net/uberkat/obsidian/common/ItemMachineUpgrade.java
View file

@ -12,6 +12,6 @@ public class ItemMachineUpgrade extends ItemObsidian implements IMachineUpgrade
{
super(i);
setMaxStackSize(1);
setCreativeTab(CreativeTabs.tabRedstone);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
}

2
src/common/net/uberkat/obsidian/common/ItemObsidian.java
View file

@ -8,7 +8,7 @@ public class ItemObsidian extends Item
{
super(i);
itemsList[256 + i] = this;
setCreativeTab(CreativeTabs.tabAllSearch);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public String getTextureFile() {

2
src/common/net/uberkat/obsidian/common/ItemObsidianArmor.java
View file

@ -7,7 +7,7 @@ public class ItemObsidianArmor extends ItemArmor
public ItemObsidianArmor(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4)
{
super(par1, par2EnumArmorMaterial, par3, par4);
setCreativeTab(CreativeTabs.tabCombat);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public String getTextureFile() {

2
src/common/net/uberkat/obsidian/common/ItemObsidianBow.java
View file

@ -10,7 +10,7 @@ public class ItemObsidianBow extends ItemObsidian
super(par1);
maxStackSize = 1;
setMaxDamage(750);
setCreativeTab(CreativeTabs.tabCombat);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag)

2
src/common/net/uberkat/obsidian/common/ItemObsidianHoe.java
View file

@ -9,7 +9,7 @@ public class ItemObsidianHoe extends ItemObsidian
super(par1);
maxStackSize = 1;
setMaxDamage(par2EnumToolMaterial.getMaxUses());
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
/**

2
src/common/net/uberkat/obsidian/common/ItemObsidianKnife.java
View file

@ -23,7 +23,7 @@ public class ItemObsidianKnife extends ItemObsidian
entityDamage = 2;
blockDamage = 2;
enchantability = enumtoolmaterial.getEnchantability();
setCreativeTab(CreativeTabs.tabCombat);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
/**

2
src/common/net/uberkat/obsidian/common/ItemObsidianPaxel.java
View file

@ -13,7 +13,7 @@ public class ItemObsidianPaxel extends ItemObsidianTool
public ItemObsidianPaxel(int i, EnumToolMaterial enumtoolmaterial)
{
super(i, 3, enumtoolmaterial, blocksEffectiveAgainst);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public boolean canHarvestBlock(Block block)

2
src/common/net/uberkat/obsidian/common/ItemObsidianPickaxe.java
View file

@ -13,7 +13,7 @@ public class ItemObsidianPickaxe extends ItemObsidianTool
public ItemObsidianPickaxe(int par1, EnumToolMaterial par2EnumToolMaterial)
{
super(par1, 2, par2EnumToolMaterial, blocksEffectiveAgainst);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
/**

2
src/common/net/uberkat/obsidian/common/ItemObsidianSpade.java
View file

@ -11,7 +11,7 @@ public class ItemObsidianSpade extends ItemObsidianTool
public ItemObsidianSpade(int par1, EnumToolMaterial par2EnumToolMaterial)
{
super(par1, 1, par2EnumToolMaterial, blocksEffectiveAgainst);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
/**

2
src/common/net/uberkat/obsidian/common/ItemObsidianSword.java
View file

@ -23,7 +23,7 @@ public class ItemObsidianSword extends ItemObsidian
maxStackSize = 1;
setMaxDamage(par2EnumToolMaterial.getMaxUses());
weaponDamage = 4 + par2EnumToolMaterial.getDamageVsEntity();
setCreativeTab(CreativeTabs.tabCombat);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
/**

2
src/common/net/uberkat/obsidian/common/ItemStopwatch.java
View file

@ -9,7 +9,7 @@ public class ItemStopwatch extends ItemObsidian {
super(i);
setMaxStackSize(1);
setMaxDamage(5000);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public boolean hasEffect(ItemStack itemstack)

2
src/common/net/uberkat/obsidian/common/ItemWeatherOrb.java
View file

@ -9,7 +9,7 @@ public class ItemWeatherOrb extends ItemObsidian
super(i);
setMaxStackSize(1);
setMaxDamage(5000);
setCreativeTab(CreativeTabs.tabTools);
setCreativeTab(ObsidianIngots.tabOBSIDIAN);
}
public boolean hasEffect(ItemStack itemstack)

25
src/common/net/uberkat/obsidian/common/ObsidianIngots.java
View file

@ -63,6 +63,9 @@ public class ObsidianIngots
/** Obsidian Ingots version number */
public static Version versionNumber = new Version(4, 2, 4);
/** Obsidian Ingots creative tab */
public static CreativeTabOI tabOBSIDIAN = new CreativeTabOI();
/** The latest version number which is received from the Obsidian Ingots server */
public static String latestVersionNumber;
@ -801,7 +804,7 @@ public class ObsidianIngots
RedstoneBody = (new ItemObsidianArmor(11236, armorREDSTONE, proxy.getArmorIndex("redstone"), 1)).setItemName("RedstoneBody");
RedstoneLegs = (new ItemObsidianArmor(11237, armorREDSTONE, proxy.getArmorIndex("redstone"), 2)).setItemName("RedstoneLegs");
RedstoneBoots = (new ItemObsidianArmor(11238, armorREDSTONE, proxy.getArmorIndex("redstone"), 3)).setItemName("RedstoneBoots");
RedstoneIngot = new ItemObsidian(11239).setItemName("RedstoneIngot").setCreativeTab(CreativeTabs.tabMaterials);
RedstoneIngot = new ItemObsidian(11239).setItemName("RedstoneIngot").setCreativeTab(tabOBSIDIAN);
RedstonePaxel = new ItemObsidianPaxel(11240, toolREDSTONE2).setItemName("RedstonePaxel");
RedstonePickaxe = new ItemObsidianPickaxe(11241, toolREDSTONE).setItemName("RedstonePickaxe");
RedstoneAxe = new ItemObsidianAxe(11242, toolREDSTONE).setItemName("RedstoneAxe");
@ -812,7 +815,7 @@ public class ObsidianIngots
PlatinumBody = (new ItemObsidianArmor(11247, EnumArmorMaterial.DIAMOND, proxy.getArmorIndex("platinum"), 1)).setItemName("PlatinumBody");
PlatinumLegs = (new ItemObsidianArmor(11248, EnumArmorMaterial.DIAMOND, proxy.getArmorIndex("platinum"), 2)).setItemName("PlatinumLegs");
PlatinumBoots = (new ItemObsidianArmor(11249, EnumArmorMaterial.DIAMOND, proxy.getArmorIndex("platinum"), 3)).setItemName("PlatinumBoots");
PlatinumIngot = new ItemObsidian(11250).setItemName("PlatinumIngot").setCreativeTab(CreativeTabs.tabMaterials);
PlatinumIngot = new ItemObsidian(11250).setItemName("PlatinumIngot").setCreativeTab(tabOBSIDIAN);
PlatinumPaxel = new ItemObsidianPaxel(11251, toolPLATINUM2).setItemName("PlatinumPaxel");
PlatinumPickaxe = new ItemObsidianPickaxe(11252, toolPLATINUM).setItemName("PlatinumPickaxe");
PlatinumAxe = new ItemObsidianAxe(11253, toolPLATINUM).setItemName("PlatinumAxe");
@ -823,7 +826,7 @@ public class ObsidianIngots
ObsidianBody = (new ItemObsidianArmor(11258, armorOBSIDIAN, proxy.getArmorIndex("obsidian"), 1)).setItemName("ObsidianBody");
ObsidianLegs = (new ItemObsidianArmor(11259, armorOBSIDIAN, proxy.getArmorIndex("obsidian"), 2)).setItemName("ObsidianLegs");
ObsidianBoots = (new ItemObsidianArmor(11260, armorOBSIDIAN, proxy.getArmorIndex("obsidian"), 3)).setItemName("ObsidianBoots");
ObsidianIngot = new ItemObsidian(11261).setItemName("ObsidianIngot").setCreativeTab(CreativeTabs.tabMaterials);
ObsidianIngot = new ItemObsidian(11261).setItemName("ObsidianIngot").setCreativeTab(tabOBSIDIAN);
ObsidianPaxel = new ItemObsidianPaxel(11262, toolOBSIDIAN2).setItemName("ObsidianPaxel");
ObsidianPickaxe = new ItemObsidianPickaxe(11263, toolOBSIDIAN).setItemName("ObsidianPickaxe");
ObsidianAxe = new ItemObsidianAxe(11264, toolOBSIDIAN).setItemName("ObsidianAxe");
@ -846,7 +849,7 @@ public class ObsidianIngots
LightningRod = new ItemLightningRod(11280).setItemName("LightningRod");
Stopwatch = new ItemStopwatch(11281).setItemName("Stopwatch");
WeatherOrb = new ItemWeatherOrb(11282).setItemName("WeatherOrb");
EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setCreativeTab(CreativeTabs.tabMaterials);
EnrichedAlloy = new ItemObsidian(11313).setItemName("EnrichedAlloy").setCreativeTab(tabOBSIDIAN);
}
WoodPaxel = new ItemObsidianPaxel(11283, EnumToolMaterial.WOOD).setItemName("WoodPaxel");
StonePaxel = new ItemObsidianPaxel(11284, EnumToolMaterial.STONE).setItemName("StonePaxel");
@ -862,8 +865,8 @@ public class ObsidianIngots
LazuliKnife = new ItemObsidianKnife(11294, toolLAZULI).setItemName("LazuliKnife");
PlatinumKnife = new ItemObsidianKnife(11295, toolPLATINUM).setItemName("PlatinumKnife");
RedstoneKnife = new ItemObsidianKnife(11296, toolREDSTONE).setItemName("RedstoneKnife");
PlatinumDust = new ItemObsidian(11300).setItemName("PlatinumDust").setCreativeTab(CreativeTabs.tabMaterials);
GlowstoneIngot = new ItemObsidian(11301).setItemName("GlowstoneIngot").setCreativeTab(CreativeTabs.tabMaterials);
PlatinumDust = new ItemObsidian(11300).setItemName("PlatinumDust").setCreativeTab(tabOBSIDIAN);
GlowstoneIngot = new ItemObsidian(11301).setItemName("GlowstoneIngot").setCreativeTab(tabOBSIDIAN);
GlowstonePaxel = new ItemObsidianPaxel(11302, toolGLOWSTONE2).setItemName("GlowstonePaxel");
GlowstonePickaxe = new ItemObsidianPickaxe(11303, toolGLOWSTONE).setItemName("GlowstonePickaxe");
GlowstoneAxe = new ItemObsidianAxe(11304, toolGLOWSTONE).setItemName("GlowstoneAxe");
@ -894,7 +897,7 @@ public class ObsidianIngots
OreBlock = new BlockOre(oreBlockID).setBlockName("OreBlock");
PowerUnit = new BlockPowerUnit(powerUnitID).setBlockName("PowerUnit");
Generator = new BlockGenerator(generatorID).setBlockName("Generator");
ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setBlockName("ObsidianTNT").setCreativeTab(CreativeTabs.tabRedstone);
ObsidianTNT = new BlockObsidianTNT(obsidianTNTID).setBlockName("ObsidianTNT").setCreativeTab(tabOBSIDIAN);
//Registrations
GameRegistry.registerBlock(ObsidianTNT);
@ -918,8 +921,8 @@ public class ObsidianIngots
GoldDust = hooks.IC2GoldDust.getItem();
}
else {
IronDust = new ItemObsidian(11298).setItemName("IronDust").setCreativeTab(CreativeTabs.tabMaterials);
GoldDust = new ItemObsidian(11299).setItemName("GoldDust").setCreativeTab(CreativeTabs.tabMaterials);
IronDust = new ItemObsidian(11298).setItemName("IronDust").setCreativeTab(tabOBSIDIAN);
GoldDust = new ItemObsidian(11299).setItemName("GoldDust").setCreativeTab(tabOBSIDIAN);
IronDust.setIconIndex(248);
GoldDust.setIconIndex(250);
LanguageRegistry.addName(IronDust, "Iron Dust");
@ -931,7 +934,7 @@ public class ObsidianIngots
ObsidianDust = hooks.RailcraftObsidianDust.getItem();
}
else {
ObsidianDust = new ItemObsidian(11297).setItemName("ObsidianDust").setCreativeTab(CreativeTabs.tabMaterials);
ObsidianDust = new ItemObsidian(11297).setItemName("ObsidianDust").setCreativeTab(tabOBSIDIAN);
ObsidianDust.setIconIndex(241);
LanguageRegistry.addName(ObsidianDust, "Obsidian Dust");
}
@ -1026,6 +1029,8 @@ public class ObsidianIngots
proxy.loadUtilities();
proxy.loadTickHandler();
LanguageRegistry.instance().addStringLocalization(tabOBSIDIAN.getTabLabel(), "Obsidian Ingots");
//Attempt to load server commands
try {
registerServerCommands();

7
src/common/net/uberkat/obsidian/common/OreHandler.java
View file

@ -1,13 +1,8 @@
package net.uberkat.obsidian.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import net.minecraft.src.IChunkProvider;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;
import net.minecraft.src.WorldGenMinable;
import net.minecraft.src.*;
import cpw.mods.fml.common.IWorldGenerator;
public class OreHandler implements IWorldGenerator

39
src/common/net/uberkat/obsidian/common/TileEntityGenerator.java
View file

@ -76,8 +76,19 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem
if(inventory[1].getItem() instanceof IEnergizedItem)
{
IEnergizedItem item = (IEnergizedItem)inventory[1].getItem();
int rejects = item.charge(inventory[1], item.getRate());
setEnergy(energyStored - (item.getRate() - rejects));
int sendingEnergy = 0;
if(item.getRate() <= energyStored)
{
sendingEnergy = item.getRate();
}
else if(item.getRate() > energyStored)
{
sendingEnergy = energyStored;
}
int rejects = item.charge(inventory[1], sendingEnergy);
setEnergy(energyStored - (sendingEnergy - rejects));
}
else if(inventory[1].getItem() instanceof IItemElectric)
{
@ -114,7 +125,6 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem
if(energyStored < MAX_ENERGY)
{
System.out.println(getEnvironmentBoost());
setEnergy(energyStored + getEnvironmentBoost());
if(fuelStored > 0)
@ -170,7 +180,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem
sendingEnergy = energyStored;
}
int rejects = ((IEnergyAcceptor)tileEntity).transferToAcceptor(output);
int rejects = ((IEnergyAcceptor)tileEntity).transferToAcceptor(sendingEnergy);
setEnergy(energyStored - (sendingEnergy - rejects));
}
@ -194,28 +204,19 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem
{
int boost = 0;
if(worldObj.getBlockId(xCoord+1, yCoord, zCoord) == 10)
if(worldObj.getBlockId(xCoord+1, yCoord, zCoord) == 10 || worldObj.getBlockId(xCoord+1, yCoord, zCoord) == 11)
boost+=1;
if(worldObj.getBlockId(xCoord-1, yCoord, zCoord) == 10)
if(worldObj.getBlockId(xCoord-1, yCoord, zCoord) == 10 || worldObj.getBlockId(xCoord-1, yCoord, zCoord) == 11)
boost+=1;
if(worldObj.getBlockId(xCoord, yCoord+1, zCoord) == 10)
if(worldObj.getBlockId(xCoord, yCoord+1, zCoord) == 10 || worldObj.getBlockId(xCoord, yCoord+1, zCoord) == 11)
boost+=1;
if(worldObj.getBlockId(xCoord, yCoord-1, zCoord) == 10)
if(worldObj.getBlockId(xCoord, yCoord-1, zCoord) == 10 || worldObj.getBlockId(xCoord, yCoord-1, zCoord) == 11)
boost+=1;
if(worldObj.getBlockId(xCoord, yCoord, zCoord+1) == 10)
if(worldObj.getBlockId(xCoord, yCoord, zCoord+1) == 10 || worldObj.getBlockId(xCoord, yCoord, zCoord+1) == 11)
boost+=1;
if(worldObj.getBlockId(xCoord, yCoord, zCoord-1) == 10)
if(worldObj.getBlockId(xCoord, yCoord, zCoord-1) == 10 || worldObj.getBlockId(xCoord, yCoord, zCoord-1) == 11)
boost+=1;
if(worldObj.isDaytime() && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord) && !worldObj.isRaining() && !worldObj.isThundering() && !worldObj.provider.hasNoSky)
{
boost+=2;
if(worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).biomeName.equals("Desert"))
boost+=2;
else if(worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).biomeName.equals("Plains"))
boost+=1;
}
return boost;
}

19
src/common/net/uberkat/obsidian/common/TileEntityPowerUnit.java
View file

@ -87,9 +87,20 @@ public class TileEntityPowerUnit extends TileEntityElectricBlock implements IEne
{
if(inventory[0].getItem() instanceof IEnergizedItem)
{
IEnergizedItem item = (IEnergizedItem)inventory[0].getItem();
int rejects = item.charge(inventory[0], item.getRate());
setEnergy(energyStored - (item.getRate() - rejects));
IEnergizedItem item = (IEnergizedItem)inventory[1].getItem();
int sendingEnergy = 0;
if(item.getRate() <= energyStored)
{
sendingEnergy = item.getRate();
}
else if(item.getRate() > energyStored)
{
sendingEnergy = energyStored;
}
int rejects = item.charge(inventory[1], sendingEnergy);
setEnergy(energyStored - (sendingEnergy - rejects));
}
else if(inventory[0].getItem() instanceof IItemElectric)
{
@ -190,7 +201,7 @@ public class TileEntityPowerUnit extends TileEntityElectricBlock implements IEne
sendingEnergy = energyStored;
}
int rejects = ((IEnergyAcceptor)tileEntity).transferToAcceptor(output);
int rejects = ((IEnergyAcceptor)tileEntity).transferToAcceptor(sendingEnergy);
setEnergy(energyStored - (sendingEnergy - rejects));
}

11
src/minecraft/net/uberkat/obsidian/client/GuiGenerator.java
View file

@ -4,12 +4,16 @@ import org.lwjgl.opengl.GL11;
import net.minecraft.src.*;
import net.uberkat.obsidian.common.ContainerGenerator;
import net.uberkat.obsidian.common.ObsidianUtils;
import net.uberkat.obsidian.common.TileEntityGenerator;
public class GuiGenerator extends GuiContainer
{
public TileEntityGenerator tileEntity;
private int guiWidth;
private int guiHeight;
public GuiGenerator(InventoryPlayer inventory, TileEntityGenerator tentity)
{
super(new ContainerGenerator(inventory, tentity));
@ -23,6 +27,9 @@ public class GuiGenerator extends GuiContainer
{
fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040);
fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040);
fontRenderer.drawString(ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.energyStored) + "/" + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.MAX_ENERGY), 51, 26, 0x404040);
fontRenderer.drawString("Fuel: " + tileEntity.fuelStored, 51, 35, 0x404040);
fontRenderer.drawString("Out: " + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.output), 51, 44, 0x404040);
}
/**
@ -33,8 +40,8 @@ public class GuiGenerator extends GuiContainer
int texture = mc.renderEngine.getTexture("/gui/GuiGenerator.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(texture);
int guiWidth = (width - xSize) / 2;
int guiHeight = (height - ySize) / 2;
guiWidth = (width - xSize) / 2;
guiHeight = (height - ySize) / 2;
drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize);
int displayInt;

8
src/minecraft/net/uberkat/obsidian/client/GuiPowerUnit.java
View file

@ -22,11 +22,11 @@ public class GuiPowerUnit extends GuiContainer
protected void drawGuiContainerForegroundLayer(int par1, int par2)
{
String capacityInfo = "Stored: " + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.energyStored) + "/" + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.MAX_ENERGY);
String outputInfo = "Output: " + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.output) + "/t";
String capacityInfo = ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.energyStored) + "/" + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.MAX_ENERGY);
String outputInfo = "Out: " + ObsidianUtils.getDisplayedEnergyNoColor(tileEntity.output) + "/t";
fontRenderer.drawString(tileEntity.getInvName(), 43, 6, 0x404040);
fontRenderer.drawString(capacityInfo, 45, 42, 0x404040);
fontRenderer.drawString(outputInfo, 45, 52, 0x404040);
fontRenderer.drawString(capacityInfo, 45, 40, 0x404040);
fontRenderer.drawString(outputInfo, 45, 49, 0x404040);
fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 0x404040);
}