Fixed config sync, fixed all generator rendering, fixed generator GUI issue

This commit is contained in:
aidancbrady committed 2016-05-17 12:32:35 -04:00
1 parent 2bab84e090
commit a01562eefe
14 files changed
+17 -51

No files matched your search

@@ -189,7 +189,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
usage.heavyWaterElectrolysisUsage = dataStream.readDouble();
usage.formulaicAssemblicatorUsage = dataStream.readDouble();
//TODO: Tier.readConfig(dataStream);
Tier.readConfig(dataStream);
try {
for(IModule module : Mekanism.modulesLoaded)
@@ -55,6 +55,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@@ -130,6 +131,8 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy
@Override
public void preInit()
{
MinecraftForge.EVENT_BUS.register(this);
CTMRegistry.registerCTMs("mekanismgenerators", "turbine_vent", "turbine_valve", "turbine_casing", "electromagnetic_coil",
"reactor_controller", "reactor_frame", "reactor_port", "reactor_glass", "laser_focus_matrix", "reactor_logic_adapter",
"reactor_controller_on");
@@ -53,13 +53,13 @@ public class GuiBioGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
@@ -62,12 +62,12 @@ public class GuiGasGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
String s = LangUtils.localize("gui.burnRate") + ": " + tileEntity.clientUsed;
fontRendererObj.drawString(s, xSize - 8 - fontRendererObj.getStringWidth(s), (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
@@ -75,10 +75,10 @@ public class GuiHeatGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
@@ -51,8 +51,6 @@ public class GuiSolarGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
int xAxis = (mouseX - (width - xSize) / 2);
int yAxis = (mouseY - (height - ySize) / 2);
@@ -61,6 +59,8 @@ public class GuiSolarGenerator extends GuiMekanism
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00);
fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00);
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
@@ -56,8 +56,6 @@ public class GuiWindGenerator extends GuiMekanism
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
fontRendererObj.drawString(tileEntity.getName(), 45, 6, 0x404040);
fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040);
fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00);
@@ -71,6 +69,8 @@ public class GuiWindGenerator extends GuiMekanism
size += 9;
fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00);
}
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@Override
@@ -60,6 +60,8 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo
if(generatorType != null)
{
GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F);
if(generatorType == GeneratorType.BIO_GENERATOR)
{
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
@@ -115,22 +117,7 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo
@Override
public List<BakedQuad> getFaceQuads(EnumFacing facing)
{
List<BakedQuad> faceQuads = new LinkedList<BakedQuad>();
/*if(Block.getBlockFromItem(stack.getItem()) != null)
{
MachineType machineType = MachineType.get(stack);
if(machineType != MachineType.QUANTUM_ENTANGLOPORTER && machineType != MachineType.RESISTIVE_HEATER)
{
if(!(stack.getItem() instanceof ItemBlockEnergyCube))
{
faceQuads.addAll(baseModel.getFaceQuads(facing));
}
}
}*/
return faceQuads;
return new LinkedList<BakedQuad>();
}
@Override