Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers
This commit is contained in:
parent
af4c1c6cd7
commit
48b895b80a
7 changed files with 27 additions and 7 deletions
src/main
java/mekanism
client/gui
common
resources/assets/mekanism/lang
|
@ -54,7 +54,7 @@ public class GuiEnergyCube extends GuiMekanism
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
|
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
|
||||||
{
|
{
|
||||||
fontRendererObj.drawString(tileEntity.getInventoryName(), 43, 6, 0x404040);
|
fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040);
|
||||||
fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
|
fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040);
|
||||||
|
|
||||||
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
|
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class GuiFactory extends GuiMekanism
|
||||||
int xAxis = (mouseX - (width - xSize) / 2);
|
int xAxis = (mouseX - (width - xSize) / 2);
|
||||||
int yAxis = (mouseY - (height - ySize) / 2);
|
int yAxis = (mouseY - (height - ySize) / 2);
|
||||||
|
|
||||||
fontRendererObj.drawString(tileEntity.getInventoryName(), 48, 4, 0x404040);
|
fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040);
|
||||||
fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040);
|
fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040);
|
||||||
fontRendererObj.drawString(tileEntity.recipeType.getName(), 104, (ySize - 93) + 2, 0x404040);
|
fontRendererObj.drawString(tileEntity.recipeType.getName(), 104, (ySize - 93) + 2, 0x404040);
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,9 @@ public class GuiMatrixStats extends GuiMekanism
|
||||||
int xAxis = (mouseX - (width - xSize) / 2);
|
int xAxis = (mouseX - (width - xSize) / 2);
|
||||||
int yAxis = (mouseY - (height - ySize) / 2);
|
int yAxis = (mouseY - (height - ySize) / 2);
|
||||||
|
|
||||||
fontRendererObj.drawString(MekanismUtils.localize("gui.matrixStats"), 45, 6, 0x404040);
|
String stats = MekanismUtils.localize("gui.matrixStats");
|
||||||
|
|
||||||
|
fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040);
|
||||||
fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ":", 53, 26, 0x797979);
|
fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ":", 53, 26, 0x797979);
|
||||||
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()), 59, 35, 0x404040);
|
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()), 59, 35, 0x404040);
|
||||||
fontRendererObj.drawString(MekanismUtils.localize("gui.output") + ":", 53, 46, 0x797979);
|
fontRendererObj.drawString(MekanismUtils.localize("gui.output") + ":", 53, 46, 0x797979);
|
||||||
|
|
|
@ -83,13 +83,13 @@ public class ContainerFactory extends Container
|
||||||
{
|
{
|
||||||
for(int slotX = 0; slotX < 9; slotX++)
|
for(int slotX = 0; slotX < 9; slotX++)
|
||||||
{
|
{
|
||||||
addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18));
|
addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 95 + slotY * 18));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(slotY = 0; slotY < 9; slotY++)
|
for(int slotX = 0; slotX < 9; slotX++)
|
||||||
{
|
{
|
||||||
addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142));
|
addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 153));
|
||||||
}
|
}
|
||||||
|
|
||||||
tileEntity.open(inventory.player);
|
tileEntity.open(inventory.player);
|
||||||
|
|
|
@ -116,8 +116,23 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem
|
||||||
list.add(EnumColor.DARK_RED + "Empty");
|
list.add(EnumColor.DARK_RED + "Empty");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2)
|
||||||
|
{
|
||||||
|
if(itemstack.getItemDamage() == 3)
|
||||||
|
{
|
||||||
|
InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()];
|
||||||
|
|
||||||
|
list.add(tier.getBaseTier().getColor() + MekanismUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.MAX_ELECTRICITY));
|
||||||
|
}
|
||||||
|
else if(itemstack.getItemDamage() == 4)
|
||||||
|
{
|
||||||
|
InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()];
|
||||||
|
|
||||||
|
list.add(tier.getBaseTier().getColor() + MekanismUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.OUTPUT));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(getMaxEnergy(itemstack) > 0)
|
if(getMaxEnergy(itemstack) > 0 && itemstack.stackTagCompound != null)
|
||||||
{
|
{
|
||||||
list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
|
list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -547,6 +547,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
|
||||||
{
|
{
|
||||||
sendDesc = true;
|
sendDesc = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
currentTransmitterConnections = possibleTransmitters;
|
currentTransmitterConnections = possibleTransmitters;
|
||||||
currentAcceptorConnections = possibleAcceptors;
|
currentAcceptorConnections = possibleAcceptors;
|
||||||
}
|
}
|
||||||
|
@ -575,6 +576,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
|
||||||
|
|
||||||
redstonePowered = redstoneReactive && MekanismUtils.isGettingPowered(world(), Coord4D.get(tile()));
|
redstonePowered = redstoneReactive && MekanismUtils.isGettingPowered(world(), Coord4D.get(tile()));
|
||||||
refreshConnections();
|
refreshConnections();
|
||||||
|
tile().notifyTileChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -577,6 +577,7 @@ tooltip.keysFound=Key(s) found
|
||||||
tooltip.noKey=No key
|
tooltip.noKey=No key
|
||||||
tooltip.hp=HP
|
tooltip.hp=HP
|
||||||
tooltip.configureState=Configure State
|
tooltip.configureState=Configure State
|
||||||
|
tooltip.outputRate=Output Rate
|
||||||
|
|
||||||
tooltip.portableTank.bucketMode=Bucket Mode
|
tooltip.portableTank.bucketMode=Bucket Mode
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue