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

General cleanup

Browse source
This commit is contained in:
Aidan Brady 2013-06-28 19:43:45 -04:00
parent 645552e6fb
commit 8f6ad2688e
51 changed files with 26 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/api/Object3D.java
View file

@ -4,7 +4,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
public class Object3D

2
common/mekanism/client/BasicRenderingHandler.java
View file

@ -1,10 +1,8 @@
package mekanism.client;
import mekanism.common.Mekanism;
import mekanism.common.TileEntityDynamicTank;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;

1
common/mekanism/client/ClientProxy.java
View file

@ -47,7 +47,6 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
common/mekanism/client/GasClientUpdate.java
View file

@ -1,17 +1,11 @@
package mekanism.client;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import mekanism.api.EnumGas;
import mekanism.api.GasTransmission;
import mekanism.api.IPressurizedTube;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import cpw.mods.fml.common.FMLCommonHandler;
/**
* The actual protocol gas goes through when it is transferred via Pressurized Tubes.

2
common/mekanism/client/GuiAdvancedElectricMachine.java
View file

@ -4,13 +4,11 @@ import mekanism.common.ContainerAdvancedElectricMachine;
import mekanism.common.TileEntityAdvancedElectricMachine;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraftforge.liquids.LiquidDictionary;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

5
common/mekanism/client/GuiCredits.java
View file

@ -1,8 +1,5 @@
package mekanism.client;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.EnumColor;
import mekanism.common.IModule;
import mekanism.common.Mekanism;
@ -10,6 +7,8 @@ import mekanism.common.MekanismUtils;
import mekanism.common.Version;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiCredits extends GuiScreen

6
common/mekanism/client/GuiElectricPump.java
View file

@ -3,17 +3,15 @@ package mekanism.client;
import mekanism.common.ContainerElectricPump;
import mekanism.common.TileEntityElectricPump;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraftforge.liquids.LiquidStack;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiElectricPump extends GuiContainer

4
common/mekanism/client/GuiMetallurgicInfuser.java
View file

@ -2,12 +2,11 @@ package mekanism.client;
import java.util.ArrayList;
import mekanism.api.InfuseType;
import mekanism.api.Object3D;
import mekanism.common.ContainerMetallurgicInfuser;
import mekanism.common.PacketHandler;
import mekanism.common.TileEntityMetallurgicInfuser;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityMetallurgicInfuser;
import mekanism.common.network.PacketTileEntity;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
@ -16,7 +15,6 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

3
common/mekanism/client/GuiPasswordModify.java
View file

@ -3,10 +3,9 @@ package mekanism.client;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.common.IElectricChest;
import mekanism.common.InventoryElectricChest;
import mekanism.common.PacketHandler;
import mekanism.common.TileEntityElectricChest;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityElectricChest;
import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import net.minecraft.client.gui.GuiButton;

1
common/mekanism/client/GuiRobitInventory.java
View file

@ -9,7 +9,6 @@ import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;

1
common/mekanism/client/GuiRobitRepair.java
View file

@ -8,7 +8,6 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

3
common/mekanism/client/GuiRobitSmelting.java
View file

@ -12,9 +12,6 @@ import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class GuiRobitSmelting extends GuiContainer
{
public EntityRobit robit;

2
common/mekanism/client/GuiStopwatch.java
View file

@ -17,8 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class GuiStopwatch extends GuiScreen
{
private static EntityPlayer player;
private int xSize = 176;
private int ySize = 166;
public GuiStopwatch(EntityPlayer entityplayer)
{

2
common/mekanism/client/GuiWeatherOrb.java
View file

@ -18,8 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class GuiWeatherOrb extends GuiScreen
{
private static EntityPlayer player;
private int xSize = 176;
private int ySize = 166;
public GuiWeatherOrb(EntityPlayer entityplayer)
{

4
common/mekanism/client/IHasSound.java
View file

@ -1,9 +1,5 @@
package mekanism.client;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Implement this if your TileEntity has a specific sound.
* @author AidanBrady

15
common/mekanism/client/LiquidClientUpdate.java
View file

@ -1,26 +1,11 @@
package mekanism.client;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import cpw.mods.fml.common.FMLCommonHandler;
import mekanism.api.GasTransmission;
import mekanism.api.IGasAcceptor;
import mekanism.api.IGasStorage;
import mekanism.common.IMechanicalPipe;
import mekanism.common.PipeUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
public class LiquidClientUpdate
{

1
common/mekanism/client/MachineRenderingHandler.java
View file

@ -5,7 +5,6 @@ import mekanism.common.Mekanism;
import net.minecraft.block.Block;
import net.minecraft.client.model.ModelChest;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;

12
common/mekanism/client/RenderElectricChest.java
View file

@ -1,17 +1,15 @@
package mekanism.client;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityElectricChest;
import mekanism.common.TileEntityTheoreticalElementizer;
import net.minecraft.client.model.ModelChest;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class RenderElectricChest extends TileEntitySpecialRenderer
{

5
common/mekanism/client/RenderMechanicalPipe.java
View file

@ -1,11 +1,8 @@
package mekanism.client;
import java.util.Arrays;
import java.util.HashMap;
import mekanism.client.MekanismRenderer.Model3D;
import mekanism.common.CableUtils;
import mekanism.common.Mekanism;
import mekanism.common.PipeUtils;
import mekanism.common.TileEntityMechanicalPipe;
import net.minecraft.block.Block;
@ -14,8 +11,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import org.lwjgl.opengl.GL11;

4
common/mekanism/client/RenderRobit.java
View file

@ -1,10 +1,8 @@
package mekanism.client;
import net.minecraft.client.renderer.entity.RenderLiving;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.EntityRobit;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderLiving;
@SideOnly(Side.CLIENT)
public class RenderRobit extends RenderLiving

1
common/mekanism/client/RenderTickHandler.java
View file

@ -4,7 +4,6 @@ import java.util.EnumSet;
import mekanism.api.Object3D;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.player.EntityPlayer;

5
common/mekanism/client/SoundHandler.java
View file

@ -10,6 +10,7 @@ import java.util.Random;
import mekanism.api.Object3D;
import mekanism.common.IActiveState;
import mekanism.common.Mekanism;
import net.minecraft.client.audio.SoundManager;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
@ -43,7 +44,7 @@ public class SoundHandler
*/
public SoundHandler()
{
soundSystem = FMLClientHandler.instance().instance().getClient().sndManager.sndSystem;
soundSystem = SoundManager.sndSystem;
MinecraftForge.EVENT_BUS.register(this);
System.out.println("[Mekanism] Successfully set up SoundHandler.");
}
@ -57,7 +58,7 @@ public class SoundHandler
{
if(soundSystem == null)
{
soundSystem = FMLClientHandler.instance().instance().getClient().sndManager.sndSystem;
soundSystem = SoundManager.sndSystem;
}
if(soundSystem != null)

5
common/mekanism/common/BlockBasic.java
View file

@ -1,9 +1,7 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mekanism.api.Object3D;
import mekanism.client.ClientProxy;
@ -22,7 +20,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import cpw.mods.fml.relauncher.Side;
@ -215,8 +212,6 @@ public class BlockBasic extends Block
{
if(itemStack.stackSize > 1)
{
boolean didMove = false;
for(int i = 0; i < player.inventory.mainInventory.length; i++)
{
if(player.inventory.mainInventory[i] == null)

1
common/mekanism/common/BlockEnergyCube.java
View file

@ -35,7 +35,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockEnergyCube extends BlockContainer
{
public Icon[][] icons = new Icon[256][256];
private Random powerRand = new Random();
public BlockEnergyCube(int id)
{

7
common/mekanism/common/BlockObsidianTNT.java
View file

@ -1,10 +1,5 @@
package mekanism.common;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -16,6 +11,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockObsidianTNT extends Block
{

2
common/mekanism/common/BlockTransmitter.java
View file

@ -18,8 +18,6 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
common/mekanism/common/CommandMekanism.java
View file

@ -3,8 +3,6 @@ package mekanism.common;
import java.util.Arrays;
import java.util.List;
import cpw.mods.fml.common.FMLCommonHandler;
import mekanism.api.EnumColor;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;

1
common/mekanism/common/ContainerRobitCrafting.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ContainerWorkbench;

4
common/mekanism/common/ContainerRobitInventory.java
View file

@ -1,13 +1,9 @@
package mekanism.common;
import ic2.api.item.IElectricItem;
import universalelectricity.core.item.IItemElectric;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ContainerRobitInventory extends Container

4
common/mekanism/common/ContainerRobitMain.java
View file

@ -1,15 +1,11 @@
package mekanism.common;
import ic2.api.item.IElectricItem;
import universalelectricity.core.item.IItemElectric;
import mekanism.common.SlotEnergy.SlotDischarge;
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;
public class ContainerRobitMain extends Container
{

2
common/mekanism/common/ContainerRobitSmelting.java
View file

@ -1,7 +1,5 @@
package mekanism.common;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

1
common/mekanism/common/EnergyNetwork.java
View file

@ -17,7 +17,6 @@ import mekanism.api.Object3D;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.world.ChunkEvent;
import buildcraft.api.power.IPowerReceptor;

1
common/mekanism/common/ISustainedInventory.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
/**

2
common/mekanism/common/ISustainedTank.java
View file

@ -1,8 +1,6 @@
package mekanism.common;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.liquids.LiquidTank;
/**
* Internal interface used in blocks and items that are capable of storing sustained tanks.

2
common/mekanism/common/IUniversalCable.java
View file

@ -1,7 +1,5 @@
package mekanism.common;
import net.minecraft.tileentity.TileEntity;
/**
* Implement this in your TileEntity class if the block can transfer energy as a Universal Cable.
* @author AidanBrady

2
common/mekanism/common/InventoryElectricChest.java
View file

@ -1,8 +1,6 @@
package mekanism.common;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryBasic;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

10
common/mekanism/common/ItemRobit.java
View file

@ -2,22 +2,16 @@ package mekanism.common;
import java.util.List;
import org.lwjgl.input.Keyboard;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.common.IFactory.RecipeType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import net.minecraftforge.liquids.LiquidDictionary;
import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemRobit extends ItemEnergized implements ISustainedInventory
{

2
common/mekanism/common/ItemStorageTank.java
View file

@ -53,8 +53,6 @@ public class ItemStorageTank extends ItemMekanism implements IStorageTank
@Override
public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag)
{
ItemStorageTank item = ((ItemStorageTank)itemstack.getItem());
if(getGasType(itemstack) != EnumGas.NONE && getGas(getGasType(itemstack), itemstack) == 0)
{
setGasType(itemstack, EnumGas.NONE);

1
common/mekanism/common/LinkedPowerProvider.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerProvider;

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

@ -20,16 +20,11 @@ import cpw.mods.fml.common.Loader;
*/
public final class MekanismHooks
{
private Class IC2;
private Class Railcraft;
private Class BasicComponents;
private Class BuildCraftEnergy;
private Class ForestryItem;
private Class Forestry;
public int ForestryBiofuelID = 5013;
public ItemStack ForestryBiofuelBucket;

5
common/mekanism/common/SynchronizedTankData.java
View file

@ -1,16 +1,13 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.api.Object3D;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack;
import mekanism.api.Object3D;
public class SynchronizedTankData
{
public Set<Object3D> locations = new HashSet<Object3D>();

5
common/mekanism/common/TankUpdateProtocol.java
View file

@ -1,16 +1,11 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.api.Object3D;
import mekanism.common.SynchronizedTankData.ValveData;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;

6
common/mekanism/common/TileEntityTheoreticalElementizer.java
View file

@ -1,16 +1,14 @@
package mekanism.common;
import java.util.Collections;
import java.util.HashMap;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.BlockMachine.MachineType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileEntityTheoreticalElementizer extends TileEntityAdvancedElectricMachine
{

1
common/mekanism/common/network/PacketConfiguratorState.java
View file

@ -4,7 +4,6 @@ import java.io.DataOutputStream;
import mekanism.common.ItemConfigurator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

1
common/mekanism/common/network/PacketElectricBowState.java
View file

@ -4,7 +4,6 @@ import java.io.DataOutputStream;
import mekanism.common.ItemElectricBow;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

5
common/mekanism/generators/client/ModelAdvancedSolarGenerator.java
View file

@ -1,10 +1,9 @@
package mekanism.generators.client;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelAdvancedSolarGenerator extends ModelBase

5
common/mekanism/generators/client/ModelBioGenerator.java
View file

@ -1,10 +1,9 @@
package mekanism.generators.client;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelBioGenerator extends ModelBase

3
common/mekanism/generators/client/RenderWindTurbine.java
View file

@ -2,14 +2,11 @@ package mekanism.generators.client;
import mekanism.common.Mekanism;
import mekanism.generators.common.TileEntityWindTurbine;
import net.minecraft.client.gui.GuiIngameMenu;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
public class RenderWindTurbine extends TileEntitySpecialRenderer
{
private ModelWindTurbine model = new ModelWindTurbine();

1
common/mekanism/generators/common/ContainerHeatGenerator.java
View file

@ -1,7 +1,6 @@
package mekanism.generators.common;
import ic2.api.item.IElectricItem;
import mekanism.common.Mekanism;
import mekanism.common.SlotEnergy.SlotCharge;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

1
common/mekanism/generators/common/GeneratorsCommonProxy.java
View file

@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import cpw.mods.fml.common.registry.GameRegistry;
/**

1
common/universalelectricity/core/electricity/ElectricityNetwork.java
View file

@ -254,7 +254,6 @@ public class ElectricityNetwork implements IElectricityNetwork
ElectricityPack totalRequest = this.getRequestWithoutReduction();
totalElectricity.amperes *= (tileRequest.amperes / totalRequest.amperes);
int distance = this.conductors.size();
double ampsReceived = totalElectricity.amperes - (totalElectricity.amperes * totalElectricity.amperes * this.getTotalResistance()) / totalElectricity.voltage;
double voltsReceived = totalElectricity.voltage - (totalElectricity.amperes * this.getTotalResistance());