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

v5.5.0 Release #1

Browse source 
*Removed unneeded imports.
*getMaxGas() in IGasStorage.
*Fixed Hydrogen Generator continuously draining hydrogen.
*Improved energy transfer protocol to equally distribute remainder.
*Gas transfer protocol now ignores full acceptors.
This commit is contained in:
Aidan Brady 2013-03-28 15:36:05 -04:00
parent c0cf5f833a
commit 51d525e350
87 changed files with 52 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/minecraft/mekanism/api/GasTransferProtocol.java
View file

@ -3,7 +3,6 @@ package mekanism.api;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -57,7 +56,10 @@ public class GasTransferProtocol
{
if(acceptor != original && acceptor.canReceiveGas(ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)).getOpposite(), transferType))
{
availableAcceptors.add(acceptor);
if(!(acceptor instanceof IGasStorage) || (acceptor instanceof IGasStorage && (((IGasStorage)acceptor).getMaxGas(transferType) - ((IGasStorage)acceptor).getGas(transferType)) > 0))
{
availableAcceptors.add(acceptor);
}
}
}
}

1
src/minecraft/mekanism/api/IElectricMachine.java
View file

@ -1,6 +1,5 @@
package mekanism.api;
import java.util.HashMap;
import java.util.Map;
/**

7
src/minecraft/mekanism/api/IGasStorage.java
View file

@ -20,4 +20,11 @@ public interface IGasStorage
* @param amount - amount to store
*/
public void setGas(EnumGas type, int amount);
/**
* Gets the maximum amount of gas this tile entity can store.
* @param type - type of gas
* @return maximum gas
*/
public int getMaxGas(EnumGas type);
}

1
src/minecraft/mekanism/client/BlockRenderingHandler.java
View file

@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.ForgeHooksClient;
import org.lwjgl.opengl.GL11;

15
src/minecraft/mekanism/client/ClientProxy.java
View file

@ -1,6 +1,5 @@
package mekanism.client;
import java.io.IOException;
import mekanism.common.CommonProxy;
import mekanism.common.EntityObsidianTNT;
@ -13,32 +12,18 @@ import mekanism.common.TileEntityEnergyCube;
import mekanism.common.TileEntityGasTank;
import mekanism.common.TileEntityMetallurgicInfuser;
import mekanism.common.TileEntityPressurizedTube;
import mekanism.common.TileEntityPurificationChamber;
import mekanism.common.TileEntityFactory;
import mekanism.common.TileEntityTeleporter;
import mekanism.common.TileEntityTheoreticalElementizer;
import mekanism.common.TileEntityUniversalCable;
import mekanism.generators.client.ModelAdvancedSolarGenerator;
import mekanism.generators.client.RenderAdvancedSolarGenerator;
import mekanism.generators.client.RenderBioGenerator;
import mekanism.generators.client.RenderElectrolyticSeparator;
import mekanism.generators.client.RenderHeatGenerator;
import mekanism.generators.client.RenderHydrogenGenerator;
import mekanism.generators.common.TileEntityAdvancedSolarGenerator;
import mekanism.generators.common.TileEntityBioGenerator;
import mekanism.generators.common.TileEntityElectrolyticSeparator;
import mekanism.generators.common.TileEntityHeatGenerator;
import mekanism.generators.common.TileEntityHydrogenGenerator;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.TextureFXManager;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.registry.TickRegistry;

4
src/minecraft/mekanism/client/ClientTickHandler.java
View file

@ -2,12 +2,8 @@ package mekanism.client;
import java.util.EnumSet;
import org.lwjgl.input.Keyboard;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.src.ModLoader;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.ITickHandler;

1
src/minecraft/mekanism/client/GuiCredits.java
View file

@ -3,7 +3,6 @@ package mekanism.client;
import mekanism.api.EnumColor;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;

3
src/minecraft/mekanism/client/GuiPortableTeleporter.java
View file

@ -1,14 +1,11 @@
package mekanism.client;
import mekanism.common.ContainerTeleporter;
import mekanism.common.EnumPacketType;
import mekanism.common.ItemPortableTeleporter;
import mekanism.common.PacketHandler;
import mekanism.common.TileEntityTeleporter;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;

1
src/minecraft/mekanism/client/ItemRenderingHandler.java
View file

@ -7,7 +7,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;

2
src/minecraft/mekanism/client/RenderPressurizedTube.java
View file

@ -7,9 +7,7 @@ import org.lwjgl.opengl.GL11;
import net.minecraftforge.common.ForgeDirection;
import mekanism.api.GasTransmission;
import mekanism.api.IGasAcceptor;
import mekanism.api.ITubeConnection;
import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityPressurizedTube;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;

10
src/minecraft/mekanism/client/RenderUniversalCable.java
View file

@ -1,13 +1,7 @@
package mekanism.client;
import ic2.api.Direction;
import ic2.api.energy.tile.IEnergyAcceptor;
import java.util.Arrays;
import mekanism.api.GasTransmission;
import mekanism.api.ICableOutputter;
import mekanism.api.ITubeConnection;
import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityUniversalCable;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -16,10 +10,6 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.block.IConnectionProvider;
import buildcraft.api.power.IPowerReceptor;
public class RenderUniversalCable extends TileEntitySpecialRenderer
{
private ModelTransmitter model;

1
src/minecraft/mekanism/client/Sound.java
View file

@ -7,7 +7,6 @@ import cpw.mods.fml.client.FMLClientHandler;
import mekanism.common.Mekanism;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import paulscode.sound.SoundSystem;
/**
* Sound -- an object that is created in SoundHandler. A 'Sound' object runs off of

1
src/minecraft/mekanism/client/SoundHandler.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Random;
import mekanism.api.IActiveState;
import mekanism.common.TileEntityBasicMachine;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import paulscode.sound.SoundSystem;

1
src/minecraft/mekanism/client/ThreadClientUpdate.java
View file

@ -2,7 +2,6 @@ package mekanism.client;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;

2
src/minecraft/mekanism/client/ThreadSendData.java
View file

@ -8,8 +8,6 @@ import java.net.Socket;
import cpw.mods.fml.client.FMLClientHandler;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.src.ModLoader;
/**
* Sends information about this mod to the Mekanism server.

4
src/minecraft/mekanism/common/BlockBasic.java
View file

@ -3,11 +3,9 @@ package mekanism.common;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.GuiControlPanel;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -17,12 +15,10 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.*;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeChunkManager;
/**
* Block class for handling multiple metal block IDs.

1
src/minecraft/mekanism/common/BlockBounding.java
View file

@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockBounding extends Block

7
src/minecraft/mekanism/common/BlockEnergyCube.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@ -15,27 +14,21 @@ import universalelectricity.prefab.implement.IToolConfigurator;
import mekanism.api.IEnergyCube;
import mekanism.api.Tier.EnergyCubeTier;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.BlockGenerator.GeneratorType;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.*;
import net.minecraft.stats.StatList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
/**
* Block class for handling multiple energy cube block IDs.

2
src/minecraft/mekanism/common/BlockGasTank.java
View file

@ -6,8 +6,6 @@ import thermalexpansion.api.core.IDismantleable;
import universalelectricity.prefab.implement.IToolConfigurator;
import buildcraft.api.tools.IToolWrench;
import mekanism.api.IUpgradeManagement;
import mekanism.common.BlockMachine.MachineType;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;

2
src/minecraft/mekanism/common/BlockMachine.java
View file

@ -10,7 +10,6 @@ import universalelectricity.core.item.IItemElectric;
import universalelectricity.prefab.implement.IToolConfigurator;
import mekanism.api.IActiveState;
import mekanism.api.IEnergyCube;
import mekanism.api.Tier;
import mekanism.api.IUpgradeManagement;
import mekanism.client.ClientProxy;
@ -22,7 +21,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

1
src/minecraft/mekanism/common/BlockObsidianTNT.java
View file

@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.Item;

1
src/minecraft/mekanism/common/BlockOre.java
View file

@ -8,7 +8,6 @@ import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

9
src/minecraft/mekanism/common/BlockTransmitter.java
View file

@ -1,28 +1,19 @@
package mekanism.common;
import ic2.api.Direction;
import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergyTile;
import java.util.Arrays;
import java.util.List;
import buildcraft.api.power.IPowerReceptor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.GasTransmission;
import mekanism.api.IGasAcceptor;
import mekanism.api.ITubeConnection;
import mekanism.client.ClientProxy;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;

1
src/minecraft/mekanism/common/CommandMekanism.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import mekanism.api.EnumColor;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
public class CommandMekanism extends CommandBase
{

3
src/minecraft/mekanism/common/CommonProxy.java
View file

@ -3,12 +3,9 @@ package mekanism.common;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
import mekanism.client.GuiTeleporter;
import mekanism.generators.common.TileEntityAdvancedSolarGenerator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;

1
src/minecraft/mekanism/common/ContainerFactory.java
View file

@ -11,7 +11,6 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
public class ContainerFactory extends Container
{

4
src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java
View file

@ -1,12 +1,9 @@
package mekanism.common;
import java.util.Map;
import universalelectricity.core.item.IItemElectric;
import ic2.api.IElectricItem;
import mekanism.api.InfusionInput;
import mekanism.api.InfusionOutput;
import mekanism.api.InfusionType;
import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.entity.player.EntityPlayer;
@ -15,7 +12,6 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class ContainerMetallurgicInfuser extends Container
{

10
src/minecraft/mekanism/common/EnergyTransferProtocol.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import ic2.api.Direction;
import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
@ -11,7 +10,6 @@ import java.util.Map;
import universalelectricity.core.block.IElectricityStorage;
import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor;
import mekanism.api.IStrictEnergyAcceptor;
@ -146,21 +144,21 @@ public class EnergyTransferProtocol
{
int divider = availableAcceptors.size();
double remaining = energyToSend % divider;
double currentRemaining = remaining;
double sending = (energyToSend-remaining)/divider;
for(TileEntity acceptor : availableAcceptors)
{
double currentSending = sending;
if(remaining > 0)
if(currentRemaining > 0)
{
currentSending++;
remaining--;
currentSending += (currentRemaining/divider);
currentRemaining -= (currentRemaining/divider);
}
if(acceptor instanceof IStrictEnergyAcceptor)
{
double before = energyToSend;
energyToSend -= (currentSending - ((IStrictEnergyAcceptor)acceptor).transferEnergyToAcceptor(currentSending));
}
else if(acceptor instanceof IEnergySink)

1
src/minecraft/mekanism/common/ItemAtomicDisassembler.java
View file

@ -8,7 +8,6 @@ import mekanism.api.EnumColor;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;

2
src/minecraft/mekanism/common/ItemBlockEnergyCube.java
View file

@ -8,13 +8,11 @@ import java.util.List;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.item.IItemElectric;
import mekanism.api.IEnergyCube;
import mekanism.api.Tier.EnergyCubeTier;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

1
src/minecraft/mekanism/common/ItemBlockMachine.java
View file

@ -11,7 +11,6 @@ import ic2.api.ICustomElectricItem;
import mekanism.api.IUpgradeManagement;
import mekanism.common.BlockMachine.MachineType;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

1
src/minecraft/mekanism/common/ItemConfigurator.java
View file

@ -2,7 +2,6 @@ package mekanism.common;
import universalelectricity.core.electricity.ElectricityPack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import mekanism.api.EnumColor;

1
src/minecraft/mekanism/common/ItemEnergized.java
View file

@ -10,7 +10,6 @@ import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import universalelectricity.core.item.IItemElectric;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

6
src/minecraft/mekanism/common/ItemMachineUpgrade.java
View file

@ -1,13 +1,7 @@
package mekanism.common;
import java.util.List;
import universalelectricity.prefab.modifier.IModifier;
import mekanism.api.TabProxy;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemMachineUpgrade extends ItemMekanism implements IModifier

1
src/minecraft/mekanism/common/ItemMekanism.java
View file

@ -2,7 +2,6 @@ package mekanism.common;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import net.minecraft.util.Icon;
public class ItemMekanism extends Item
{

1
src/minecraft/mekanism/common/ItemPortableTeleporter.java
View file

@ -6,7 +6,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagFloat;
import net.minecraft.world.World;
public class ItemPortableTeleporter extends ItemEnergized

4
src/minecraft/mekanism/common/LinkedPowerProvider.java
View file

@ -1,11 +1,7 @@
package mekanism.common;
import java.util.ArrayList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerProvider;

3
src/minecraft/mekanism/common/Mekanism.java
View file

@ -10,9 +10,7 @@ import java.util.logging.Logger;
import mekanism.api.InfuseObject;
import mekanism.api.InfusionInput;
import mekanism.api.InfusionOutput;
import mekanism.api.InfusionType;
import mekanism.api.RecipeHelper;
import mekanism.api.Tier.EnergyCubeTier;
import mekanism.api.Tier.FactoryTier;
import mekanism.client.SoundHandler;
@ -48,7 +46,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import cpw.mods.fml.server.FMLServerHandler;
/**
* Mekanism mod -- adds in Tools, Armor, Weapons, Machines, and Magic. Universal source.

5
src/minecraft/mekanism/common/MekanismHooks.java
View file

@ -3,14 +3,9 @@ package mekanism.common;
import universalelectricity.prefab.RecipeHelper;
import cpw.mods.fml.common.Loader;
import ic2.api.Ic2Recipes;
import ic2.api.Items;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.src.*;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidDictionary;
import net.minecraftforge.liquids.LiquidStack;
/**
* Hooks for Mekanism. Use to grab items or blocks out of different mods.

7
src/minecraft/mekanism/common/MekanismUtils.java
View file

@ -11,20 +11,15 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.transport.IPipeTile;
import universalelectricity.core.block.IConnectionProvider;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import universalelectricity.prefab.multiblock.TileEntityMulti;
import mekanism.api.EnumColor;
import mekanism.api.EnumGas;
import mekanism.api.GasTransferProtocol;
import mekanism.api.IActiveState;
import mekanism.api.ICableOutputter;
import mekanism.api.IConfigurable;
@ -36,7 +31,6 @@ import mekanism.api.Tier.FactoryTier;
import mekanism.common.IFactory.RecipeType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.network.packet.Packet3Chat;
@ -44,7 +38,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import cpw.mods.fml.common.network.PacketDispatcher;

1
src/minecraft/mekanism/common/PacketHandler.java
View file

@ -24,7 +24,6 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.server.FMLServerHandler;
/**
* Mekanism packet handler. As always, use packets sparingly!

4
src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java
View file

@ -8,13 +8,9 @@ import ic2.api.ElectricItem;
import ic2.api.IElectricItem;
import mekanism.api.EnumColor;
import mekanism.api.SideData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import com.google.common.io.ByteArrayDataInput;

3
src/minecraft/mekanism/common/TileEntityBasicBlock.java
View file

@ -5,14 +5,11 @@ import java.util.ArrayList;
import com.google.common.io.ByteArrayDataInput;
import ic2.api.IWrenchable;
import ic2.api.energy.EnergyNet;
import mekanism.api.ITileNetwork;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import universalelectricity.prefab.tile.TileEntityDisableable;
public abstract class TileEntityBasicBlock extends TileEntityDisableable implements IWrenchable, ITileNetwork

9
src/minecraft/mekanism/common/TileEntityBasicMachine.java
View file

@ -4,29 +4,20 @@ import ic2.api.Direction;
import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import java.util.EnumSet;
import com.google.common.io.ByteArrayDataInput;
import mekanism.api.IActiveState;
import mekanism.api.IConfigurable;
import mekanism.api.IElectricMachine;
import mekanism.api.IEnergyCube;
import mekanism.api.IStrictEnergyAcceptor;
import mekanism.api.IUpgradeManagement;
import mekanism.api.SideData;
import mekanism.client.IHasSound;
import mekanism.client.Sound;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import universalelectricity.core.item.IItemElectric;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
src/minecraft/mekanism/common/TileEntityBoundingBlock.java
View file

@ -4,15 +4,9 @@ import java.util.ArrayList;
import com.google.common.io.ByteArrayDataInput;
import mekanism.api.EnumGas;
import mekanism.api.ITileNetwork;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
{

1
src/minecraft/mekanism/common/TileEntityCombiner.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.RecipeHandler.Recipe;

3
src/minecraft/mekanism/common/TileEntityControlPanel.java
View file

@ -3,10 +3,7 @@ package mekanism.common;
import java.util.ArrayList;
import mekanism.api.ITileNetwork;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/mekanism/common/TileEntityCrusher.java
View file

@ -1,10 +1,8 @@
package mekanism.common;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.item.ItemStack;
public class TileEntityCrusher extends TileEntityElectricMachine
{

6
src/minecraft/mekanism/common/TileEntityElectricMachine.java
View file

@ -4,16 +4,10 @@ import ic2.api.ElectricItem;
import ic2.api.IElectricItem;
import mekanism.api.EnumColor;
import mekanism.api.SideData;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.item.ElectricItemHelper;
import com.google.common.io.ByteArrayDataInput;
import dan200.computer.api.IComputerAccess;
public abstract class TileEntityElectricMachine extends TileEntityBasicMachine

2
src/minecraft/mekanism/common/TileEntityEnergizedSmelter.java
View file

@ -7,8 +7,6 @@ import java.util.Map;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import mekanism.common.RecipeHandler.Recipe;
public class TileEntityEnergizedSmelter extends TileEntityElectricMachine
{
public TileEntityEnergizedSmelter()

9
src/minecraft/mekanism/common/TileEntityEnergyCube.java
View file

@ -5,7 +5,6 @@ import ic2.api.ElectricItem;
import ic2.api.IElectricItem;
import ic2.api.energy.tile.IEnergyConductor;
import ic2.api.IEnergyStorage;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.event.EnergyTileSourceEvent;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
@ -14,19 +13,13 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashSet;
import mekanism.api.EnumGas;
import mekanism.api.GasTransmission;
import mekanism.api.ICableOutputter;
import mekanism.api.IUniversalCable;
import mekanism.api.IEnergyCube;
import mekanism.api.IStrictEnergyAcceptor;
import mekanism.api.Tier.EnergyCubeTier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
@ -35,13 +28,11 @@ import universalelectricity.core.block.IVoltage;
import universalelectricity.core.electricity.ElectricityNetworkHelper;
import universalelectricity.core.electricity.IElectricityNetwork;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.item.IItemElectric;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import universalelectricity.core.block.IConductor;
import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.power.PowerProvider;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java
View file

@ -1,10 +1,8 @@
package mekanism.common;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.item.ItemStack;
public class TileEntityEnrichmentChamber extends TileEntityElectricMachine
{

7
src/minecraft/mekanism/common/TileEntityFactory.java
View file

@ -1,7 +1,6 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.EnumSet;
import ic2.api.Direction;
import ic2.api.ElectricItem;
@ -17,18 +16,12 @@ import mekanism.api.Tier.FactoryTier;
import mekanism.client.IHasSound;
import mekanism.client.Sound;
import mekanism.common.IFactory.RecipeType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.vector.Vector3;
import com.google.common.io.ByteArrayDataInput;

9
src/minecraft/mekanism/common/TileEntityGasTank.java
View file

@ -8,11 +8,8 @@ import mekanism.api.IGasAcceptor;
import mekanism.api.IGasStorage;
import mekanism.api.IStorageTank;
import mekanism.api.ITubeConnection;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
@ -174,6 +171,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS
gasStored = Math.max(Math.min(amount, MAX_GAS), 0);
}
}
@Override
public int getMaxGas(EnumGas type)
{
return MAX_GAS;
}
@Override
public int transferGasToAcceptor(int amount, EnumGas type)

8
src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java
View file

@ -6,9 +6,6 @@ import ic2.api.IElectricItem;
import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import mekanism.api.EnumColor;
import mekanism.api.IActiveState;
@ -23,17 +20,12 @@ import mekanism.api.SideData;
import mekanism.client.IHasSound;
import mekanism.client.Sound;
import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.vector.Vector3;
import com.google.common.io.ByteArrayDataInput;

1
src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import java.util.HashMap;
import java.util.Map;
import mekanism.common.RecipeHandler.Recipe;

15
src/minecraft/mekanism/common/TileEntityPurificationChamber.java
View file

@ -1,12 +1,9 @@
package mekanism.common;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import mekanism.api.EnumGas;
@ -56,6 +53,17 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac
setSecondaryEnergy(amount);
}
}
@Override
public int getMaxGas(EnumGas type)
{
if(type == EnumGas.OXYGEN)
{
return MAX_SECONDARY_ENERGY;
}
return 0;
}
@Override
public int transferGasToAcceptor(int amount, EnumGas type)
@ -75,6 +83,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac
}
return rejects;
}
return amount;
}

10
src/minecraft/mekanism/common/TileEntityTeleporter.java
View file

@ -6,33 +6,23 @@ import ic2.api.IElectricItem;
import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Random;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.vector.Vector3;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import cpw.mods.fml.server.FMLServerHandler;
import dan200.computer.api.IComputerAccess;
import dan200.computer.api.IPeripheral;
import mekanism.api.EnumColor;
import mekanism.api.IStrictEnergyAcceptor;
import mekanism.common.Teleporter.Coords;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;

1
src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java
View file

@ -2,7 +2,6 @@ package mekanism.common;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;

8
src/minecraft/mekanism/common/TileEntityUniversalCable.java
View file

@ -1,10 +1,6 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -13,12 +9,8 @@ import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.power.PowerProvider;
import buildcraft.api.transport.IPipeConnection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import universalelectricity.core.block.IConnectionProvider;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.electricity.IElectricityNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;

1
src/minecraft/mekanism/generators/client/BlockRenderingHandler.java
View file

@ -6,7 +6,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.ForgeHooksClient;
import org.lwjgl.opengl.GL11;

1
src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java
View file

@ -11,7 +11,6 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;

1
src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java
View file

@ -1,6 +1,5 @@
package mekanism.generators.client;
import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;

2
src/minecraft/mekanism/generators/client/ModelBioGenerator.java
View file

@ -1,7 +1,5 @@
package mekanism.generators.client;
import java.util.Random;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;

2
src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java
View file

@ -6,8 +6,6 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer
{
private ModelAdvancedSolarGenerator arrayModel;

2
src/minecraft/mekanism/generators/client/RenderBioGenerator.java
View file

@ -6,8 +6,6 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderBioGenerator extends TileEntitySpecialRenderer
{
private ModelBioGenerator model = new ModelBioGenerator();

3
src/minecraft/mekanism/generators/common/BlockGenerator.java
View file

@ -1,19 +1,16 @@
package mekanism.generators.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import buildcraft.api.tools.IToolWrench;
import mekanism.api.IActiveState;
import mekanism.api.IEnergyCube;
import mekanism.common.IBoundingBlock;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityBasicBlock;
import mekanism.common.TileEntityElectricBlock;
import mekanism.common.TileEntityEnergyCube;
import mekanism.generators.client.GeneratorsClientProxy;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;

1
src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java
View file

@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;

1
src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java
View file

@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric;

1
src/minecraft/mekanism/generators/common/ItemBlockGenerator.java
View file

@ -11,7 +11,6 @@ import mekanism.common.Mekanism;
import mekanism.common.TileEntityElectricBlock;
import mekanism.generators.common.BlockGenerator.GeneratorType;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

3
src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java
View file

@ -1,10 +1,7 @@
package mekanism.generators.common;
import mekanism.common.IBoundingBlock;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock
{

4
src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java
View file

@ -12,13 +12,9 @@ import mekanism.client.Sound;
import mekanism.common.LiquidSlot;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.ITankContainer;

14
src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java
View file

@ -6,7 +6,6 @@ import ic2.api.IElectricItem;
import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.EnumGas;
import mekanism.api.GasTransmission;
@ -18,23 +17,16 @@ import mekanism.api.ITubeConnection;
import mekanism.common.LiquidSlot;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.TileEntityElectricBlock;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidContainerData;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidDictionary;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
import universalelectricity.core.item.ElectricItemHelper;
@ -371,6 +363,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
return data;
}
@Override
public int getMaxGas(EnumGas type)
{
return MAX_GAS;
}
@Override
public void setGas(EnumGas type, int amount)
{

2
src/minecraft/mekanism/generators/common/TileEntityGenerator.java
View file

@ -3,7 +3,6 @@ package mekanism.generators.common;
import ic2.api.Direction;
import ic2.api.energy.tile.IEnergyConductor;
import ic2.api.IEnergyStorage;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.event.EnergyTileSourceEvent;
import ic2.api.energy.tile.IEnergySource;
@ -37,7 +36,6 @@ import universalelectricity.core.vector.VectorHelper;
import universalelectricity.core.block.IConductor;
import buildcraft.api.power.IPowerProvider;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerFramework;
import buildcraft.api.power.PowerProvider;
import dan200.computer.api.IComputerAccess;
import dan200.computer.api.IPeripheral;

10
src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java
View file

@ -6,19 +6,13 @@ import java.util.Map;
import ic2.api.ElectricItem;
import ic2.api.IElectricItem;
import mekanism.client.Sound;
import mekanism.common.LiquidSlot;
import mekanism.common.Mekanism;
import mekanism.common.MekanismHooks;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
@ -30,10 +24,6 @@ import universalelectricity.core.item.ElectricItemHelper;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dan200.computer.api.IComputerAccess;
public class TileEntityHeatGenerator extends TileEntityGenerator implements ITankContainer

18
src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java
View file

@ -11,12 +11,8 @@ import mekanism.api.IStorageTank;
import mekanism.api.ITubeConnection;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import universalelectricity.core.item.ElectricItemHelper;
@ -243,7 +239,8 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements
return rejects;
}
return 0;
return amount;
}
@Override
@ -273,4 +270,15 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements
{
return side != ForgeDirection.getOrientation(facing);
}
@Override
public int getMaxGas(EnumGas type)
{
if(type == EnumGas.HYDROGEN)
{
return MAX_HYDROGEN;
}
return 0;
}
}

4
src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java
View file

@ -7,12 +7,8 @@ import universalelectricity.core.item.ElectricItemHelper;
import ic2.api.ElectricItem;
import ic2.api.IElectricItem;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.generators.common.BlockGenerator.GeneratorType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import com.google.common.io.ByteArrayDataInput;

1
src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java
View file

@ -1,7 +1,6 @@
package mekanism.nei;
import java.awt.Rectangle;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

3
src/minecraft/mekanism/nei/CombinerRecipeHandler.java
View file

@ -1,14 +1,11 @@
package mekanism.nei;
import java.util.List;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import mekanism.client.GuiAdvancedElectricMachine;
import mekanism.client.GuiCombiner;
import mekanism.common.TileEntityCombiner;
import mekanism.common.RecipeHandler.Recipe;
public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler

2
src/minecraft/mekanism/nei/CrusherRecipeHandler.java
View file

@ -3,8 +3,6 @@ package mekanism.nei;
import java.util.Set;
import mekanism.client.GuiCrusher;
import mekanism.client.GuiElectricMachine;
import mekanism.common.TileEntityCrusher;
import mekanism.common.RecipeHandler.Recipe;
public class CrusherRecipeHandler extends MachineRecipeHandler

2
src/minecraft/mekanism/nei/EnrichmentChamberRecipeHandler.java
View file

@ -2,9 +2,7 @@ package mekanism.nei;
import java.util.Set;
import mekanism.client.GuiElectricMachine;
import mekanism.client.GuiEnrichmentChamber;
import mekanism.common.TileEntityEnrichmentChamber;
import mekanism.common.RecipeHandler.Recipe;
public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler

6
src/minecraft/mekanism/nei/FactoryRecipeHandler.java
View file

@ -9,14 +9,8 @@ import mekanism.common.IFactory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import codechicken.core.ReflectionManager;
import codechicken.nei.NEICompatibility;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.ShapedRecipeHandler;
import codechicken.nei.recipe.weakDependancy_Forge;
import codechicken.nei.recipe.ShapedRecipeHandler.CachedShapedRecipe;
import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;
public class FactoryRecipeHandler extends ShapedRecipeHandler
{

1
src/minecraft/mekanism/nei/MachineRecipeHandler.java
View file

@ -1,7 +1,6 @@
package mekanism.nei;
import java.awt.Rectangle;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

3
src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java
View file

@ -1,7 +1,6 @@
package mekanism.nei;
import java.awt.Rectangle;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@ -12,10 +11,8 @@ import mekanism.api.InfusionType;
import mekanism.client.GuiMetallurgicInfuser;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityMetallurgicInfuser;
import mekanism.common.RecipeHandler.Recipe;
import mekanism.generators.common.MekanismGenerators;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;

2
src/minecraft/mekanism/nei/OsmiumCompressorRecipeHandler.java
View file

@ -4,10 +4,8 @@ import java.util.Set;
import net.minecraft.item.ItemStack;
import mekanism.client.GuiAdvancedElectricMachine;
import mekanism.client.GuiOsmiumCompressor;
import mekanism.common.Mekanism;
import mekanism.common.TileEntityOsmiumCompressor;
import mekanism.common.RecipeHandler.Recipe;
public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler

2
src/minecraft/mekanism/nei/PurificationChamberRecipeHandler.java
View file

@ -2,9 +2,7 @@ package mekanism.nei;
import java.util.Set;
import mekanism.client.GuiAdvancedElectricMachine;
import mekanism.client.GuiPurificationChamber;
import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

4
src/minecraft/mekanism/tools/common/MekanismTools.java
View file

@ -2,7 +2,6 @@ package mekanism.tools.common;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.item.EnumArmorMaterial;
@ -10,7 +9,6 @@ import net.minecraft.item.EnumToolMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.src.*;
import net.minecraftforge.common.EnumHelper;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
@ -19,11 +17,9 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import mekanism.common.Mekanism;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.5.0", dependencies = "required-after:Mekanism")