Update some APIs

Is IC2 dead? Player's jenkins is down.
This commit is contained in:
Ben Spiers committed 2016-01-25 20:25:17 +00:00
1 parent a556fffc4f
commit 18578139c4
440 files changed
+9407 -3036

No files matched your search

+60 -60
View File
@@ -8,56 +8,56 @@ import mekanism.api.MekanismConfig.general;
import mekanism.api.Pos3D;
import mekanism.client.SparkleAnimation.INodeChecker;
import mekanism.client.entity.EntityLaser;
import mekanism.client.gui.GuiAmbientAccumulator;
import mekanism.client.gui.GuiChemicalCrystallizer;
import mekanism.client.gui.GuiChemicalDissolutionChamber;
import mekanism.client.gui.GuiChemicalInfuser;
import mekanism.client.gui.GuiChemicalInjectionChamber;
import mekanism.client.gui.GuiChemicalOxidizer;
import mekanism.client.gui.GuiChemicalWasher;
import mekanism.client.gui.GuiCombiner;
import mekanism.client.gui.GuiCredits;
import mekanism.client.gui.GuiCrusher;
import mekanism.client.gui.GuiDictionary;
import mekanism.client.gui.GuiDigitalMiner;
import mekanism.client.gui.GuiDynamicTank;
import mekanism.client.gui.GuiElectricChest;
import mekanism.client.gui.GuiElectricPump;
import mekanism.client.gui.GuiElectrolyticSeparator;
import mekanism.client.gui.GuiEnergizedSmelter;
import mekanism.client.gui.GuiEnergyCube;
import mekanism.client.gui.GuiEnrichmentChamber;
import mekanism.client.gui.GuiEntangledBlock;
import mekanism.client.gui.GuiFactory;
import mekanism.client.gui.GuiFluidicPlenisher;
import mekanism.client.gui.GuiGasTank;
import mekanism.client.gui.GuiInductionMatrix;
import mekanism.client.gui.GuiLaserAmplifier;
import mekanism.client.gui.GuiLaserTractorBeam;
import mekanism.client.gui.GuiMatrixStats;
import mekanism.client.gui.GuiMetallurgicInfuser;
import mekanism.client.gui.GuiOredictionificator;
import mekanism.client.gui.GuiOsmiumCompressor;
import mekanism.client.gui.GuiPRC;
import mekanism.client.gui.GuiPasswordEnter;
import mekanism.client.gui.GuiPasswordModify;
import mekanism.client.gui.GuiPortableTank;
import mekanism.client.gui.GuiPrecisionSawmill;
import mekanism.client.gui.GuiPurificationChamber;
import mekanism.client.gui.GuiRobitCrafting;
import mekanism.client.gui.GuiRobitInventory;
import mekanism.client.gui.GuiRobitMain;
import mekanism.client.gui.GuiRobitRepair;
import mekanism.client.gui.GuiRobitSmelting;
import mekanism.client.gui.GuiRotaryCondensentrator;
import mekanism.client.gui.GuiSeismicReader;
import mekanism.client.gui.GuiSeismicVibrator;
import mekanism.client.gui.GuiSideConfiguration;
import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.client.gui.GuiSolarNeutronActivator;
import mekanism.client.gui.GuiTeleporter;
import mekanism.client.gui.GuiTransporterConfig;
import mekanism.client.gui.GuiUpgradeManagement;
//import mekanism.client.gui.GuiAmbientAccumulator;
//import mekanism.client.gui.GuiChemicalCrystallizer;
//import mekanism.client.gui.GuiChemicalDissolutionChamber;
//import mekanism.client.gui.GuiChemicalInfuser;
//import mekanism.client.gui.GuiChemicalInjectionChamber;
//import mekanism.client.gui.GuiChemicalOxidizer;
//import mekanism.client.gui.GuiChemicalWasher;
//import mekanism.client.gui.GuiCombiner;
//import mekanism.client.gui.GuiCredits;
//import mekanism.client.gui.GuiCrusher;
//import mekanism.client.gui.GuiDictionary;
//import mekanism.client.gui.GuiDigitalMiner;
//import mekanism.client.gui.GuiDynamicTank;
//import mekanism.client.gui.GuiElectricChest;
//import mekanism.client.gui.GuiElectricPump;
//import mekanism.client.gui.GuiElectrolyticSeparator;
//import mekanism.client.gui.GuiEnergizedSmelter;
//import mekanism.client.gui.GuiEnergyCube;
//import mekanism.client.gui.GuiEnrichmentChamber;
//import mekanism.client.gui.GuiEntangledBlock;
//import mekanism.client.gui.GuiFactory;
//import mekanism.client.gui.GuiFluidicPlenisher;
//import mekanism.client.gui.GuiGasTank;
//import mekanism.client.gui.GuiInductionMatrix;
//import mekanism.client.gui.GuiLaserAmplifier;
//import mekanism.client.gui.GuiLaserTractorBeam;
//import mekanism.client.gui.GuiMatrixStats;
//import mekanism.client.gui.GuiMetallurgicInfuser;
//import mekanism.client.gui.GuiOredictionificator;
//import mekanism.client.gui.GuiOsmiumCompressor;
//import mekanism.client.gui.GuiPRC;
//import mekanism.client.gui.GuiPasswordEnter;
//import mekanism.client.gui.GuiPasswordModify;
//import mekanism.client.gui.GuiPortableTank;
//import mekanism.client.gui.GuiPrecisionSawmill;
//import mekanism.client.gui.GuiPurificationChamber;
//import mekanism.client.gui.GuiRobitCrafting;
//import mekanism.client.gui.GuiRobitInventory;
//import mekanism.client.gui.GuiRobitMain;
//import mekanism.client.gui.GuiRobitRepair;
//import mekanism.client.gui.GuiRobitSmelting;
//import mekanism.client.gui.GuiRotaryCondensentrator;
//import mekanism.client.gui.GuiSeismicReader;
//import mekanism.client.gui.GuiSeismicVibrator;
//import mekanism.client.gui.GuiSideConfiguration;
//import mekanism.client.gui.GuiSolarEvaporationController;
//import mekanism.client.gui.GuiSolarNeutronActivator;
//import mekanism.client.gui.GuiTeleporter;
//import mekanism.client.gui.GuiTransporterConfig;
//import mekanism.client.gui.GuiUpgradeManagement;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.RenderTickHandler;
import mekanism.client.render.entity.RenderBalloon;
@@ -230,7 +230,7 @@ public class ClientProxy extends CommonProxy
{
if(isBlock)
{
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, tileEntity));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, tileEntity));
entityplayer.openContainer.windowId = windowId;
}
else {
@@ -239,7 +239,7 @@ public class ClientProxy extends CommonProxy
if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST)
{
InventoryElectricChest inventory = new InventoryElectricChest(entityplayer);
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, inventory));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, inventory));
entityplayer.openContainer.windowId = windowId;
}
}
@@ -248,14 +248,14 @@ public class ClientProxy extends CommonProxy
{
if(isBlock)
{
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(tileEntity));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(tileEntity));
}
else {
ItemStack stack = entityplayer.getCurrentEquippedItem();
if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST)
{
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(stack));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(stack));
}
}
}
@@ -263,14 +263,14 @@ public class ClientProxy extends CommonProxy
{
if(isBlock)
{
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(tileEntity));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(tileEntity));
}
else {
ItemStack stack = entityplayer.getCurrentEquippedItem();
if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST)
{
FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(stack));
//TODO FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(stack));
}
}
}
@@ -411,7 +411,7 @@ public class ClientProxy extends CommonProxy
{
TileEntity tileEntity = world.getTileEntity(pos);
switch(ID)
/*switch(ID)
{
case 0:
return new GuiDictionary(player.inventory);
@@ -538,7 +538,7 @@ public class ClientProxy extends CommonProxy
return new GuiTransporterConfig(player, (ISideConfiguration)tileEntity);
case 52:
return new GuiOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity);
}
}*/
return null;
}
@@ -548,7 +548,7 @@ public class ClientProxy extends CommonProxy
{
GuiScreen screen = Minecraft.getMinecraft().currentScreen;
if(screen instanceof GuiTeleporter && ((GuiTeleporter)screen).itemStack != null)
/*if(screen instanceof GuiTeleporter && ((GuiTeleporter)screen).itemStack != null)
{
GuiTeleporter teleporter = (GuiTeleporter)screen;
@@ -558,7 +558,7 @@ public class ClientProxy extends CommonProxy
teleporter.clientPrivateCache = message.privateCache;
teleporter.updateButtons();
}
}*/
}
@Override