Cleaned up unneeded imports.
This commit is contained in:
parent
316e2a5019
commit
c724e960f1
25 changed files with 16 additions and 48 deletions
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
package buildcraft.api.fuels;
|
package buildcraft.api.fuels;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
import buildcraft.api.core.BuildCraftAPI;
|
import buildcraft.api.core.BuildCraftAPI;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package buildcraft.api.liquids;
|
package buildcraft.api.liquids;
|
||||||
|
|
||||||
import buildcraft.api.core.Orientations;
|
|
||||||
|
|
||||||
public interface ILiquidTank {
|
public interface ILiquidTank {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package buildcraft.api.tools;
|
package buildcraft.api.tools;
|
||||||
|
|
||||||
import buildcraft.api.liquids.ILiquidTank;
|
|
||||||
import buildcraft.api.liquids.LiquidStack;
|
import buildcraft.api.liquids.LiquidStack;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,10 @@ public class ActionMachineControl extends Action {
|
||||||
return 4 * 16 + 3;
|
return 4 * 16 + 3;
|
||||||
case Loop:
|
case Loop:
|
||||||
return 4 * 16 + 4;
|
return 4 * 16 + 4;
|
||||||
}
|
default:
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
|
@ -39,10 +39,10 @@ public class ActionMachineControl extends Action {
|
||||||
return "Off";
|
return "Off";
|
||||||
case Loop:
|
case Loop:
|
||||||
return "Loop";
|
return "Loop";
|
||||||
}
|
default:
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTexture() {
|
public String getTexture() {
|
||||||
|
|
|
@ -20,8 +20,6 @@ import java.io.InputStreamReader;
|
||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
|
||||||
import buildcraft.mod_BuildCraftCore;
|
|
||||||
|
|
||||||
import net.minecraft.src.ModLoader;
|
import net.minecraft.src.ModLoader;
|
||||||
|
|
||||||
public abstract class BptBase {
|
public abstract class BptBase {
|
||||||
|
|
|
@ -3,7 +3,6 @@ package buildcraft.core;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
import buildcraft.BuildCraftCore;
|
import buildcraft.BuildCraftCore;
|
||||||
import buildcraft.api.gates.Action;
|
|
||||||
import buildcraft.api.gates.IAction;
|
import buildcraft.api.gates.IAction;
|
||||||
import buildcraft.api.gates.IActionProvider;
|
import buildcraft.api.gates.IActionProvider;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ import buildcraft.BuildCraftCore;
|
||||||
import buildcraft.api.gates.IOverrideDefaultTriggers;
|
import buildcraft.api.gates.IOverrideDefaultTriggers;
|
||||||
import buildcraft.api.gates.ITrigger;
|
import buildcraft.api.gates.ITrigger;
|
||||||
import buildcraft.api.gates.ITriggerProvider;
|
import buildcraft.api.gates.ITriggerProvider;
|
||||||
import buildcraft.api.gates.Trigger;
|
|
||||||
import buildcraft.api.liquids.ITankContainer;
|
import buildcraft.api.liquids.ITankContainer;
|
||||||
import buildcraft.api.transport.IPipe;
|
import buildcraft.api.transport.IPipe;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package buildcraft.core;
|
package buildcraft.core;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Side;
|
import cpw.mods.fml.common.Side;
|
||||||
|
|
|
@ -12,6 +12,7 @@ package buildcraft.core;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.SidedProxy;
|
import cpw.mods.fml.common.SidedProxy;
|
||||||
|
|
||||||
import buildcraft.core.network.BuildCraftPacket;
|
import buildcraft.core.network.BuildCraftPacket;
|
||||||
|
|
|
@ -11,7 +11,6 @@ package buildcraft.core;
|
||||||
|
|
||||||
import buildcraft.api.power.IPowerProvider;
|
import buildcraft.api.power.IPowerProvider;
|
||||||
import buildcraft.api.power.PowerFramework;
|
import buildcraft.api.power.PowerFramework;
|
||||||
import buildcraft.api.power.PowerProvider;
|
|
||||||
|
|
||||||
public class RedstonePowerFramework extends PowerFramework {
|
public class RedstonePowerFramework extends PowerFramework {
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
package buildcraft.core;
|
package buildcraft.core;
|
||||||
|
|
||||||
import buildcraft.api.core.BuildCraftAPI;
|
|
||||||
import buildcraft.api.gates.ITriggerParameter;
|
import buildcraft.api.gates.ITriggerParameter;
|
||||||
import buildcraft.api.gates.Trigger;
|
import buildcraft.api.gates.Trigger;
|
||||||
import buildcraft.api.liquids.ILiquidTank;
|
import buildcraft.api.liquids.ILiquidTank;
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
package buildcraft.energy;
|
package buildcraft.energy;
|
||||||
|
|
||||||
import buildcraft.mod_BuildCraftEnergy;
|
|
||||||
import buildcraft.api.blueprints.BlockSignature;
|
import buildcraft.api.blueprints.BlockSignature;
|
||||||
import buildcraft.api.blueprints.BptBlock;
|
import buildcraft.api.blueprints.BptBlock;
|
||||||
import buildcraft.api.blueprints.BptSlotInfo;
|
import buildcraft.api.blueprints.BptSlotInfo;
|
||||||
|
|
|
@ -45,10 +45,10 @@ public class EngineWood extends Engine {
|
||||||
return 0.04F;
|
return 0.04F;
|
||||||
case Red:
|
case Red:
|
||||||
return 0.08F;
|
return 0.08F;
|
||||||
}
|
default:
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
|
|
|
@ -11,7 +11,6 @@ package buildcraft.energy;
|
||||||
|
|
||||||
import buildcraft.api.power.IPowerProvider;
|
import buildcraft.api.power.IPowerProvider;
|
||||||
import buildcraft.api.power.PowerFramework;
|
import buildcraft.api.power.PowerFramework;
|
||||||
import buildcraft.api.power.PowerProvider;
|
|
||||||
|
|
||||||
public class PneumaticPowerFramework extends PowerFramework {
|
public class PneumaticPowerFramework extends PowerFramework {
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ import net.minecraft.src.ModelRenderer;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraft.src.TileEntitySpecialRenderer;
|
import net.minecraft.src.TileEntitySpecialRenderer;
|
||||||
import net.minecraftforge.client.ForgeHooksClient;
|
import net.minecraftforge.client.ForgeHooksClient;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
@ -130,6 +129,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
|
||||||
angle[0] = (float) -Math.PI / 2;
|
angle[0] = (float) -Math.PI / 2;
|
||||||
translate[2] = -1;
|
translate[2] = -1;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
box.rotateAngleX = angle[0];
|
box.rotateAngleX = angle[0];
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package buildcraft.transport;
|
package buildcraft.transport;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Side;
|
import cpw.mods.fml.common.Side;
|
||||||
|
|
|
@ -9,11 +9,6 @@
|
||||||
|
|
||||||
package buildcraft.transport;
|
package buildcraft.transport;
|
||||||
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import cpw.mods.fml.common.Side;
|
|
||||||
import cpw.mods.fml.common.asm.SideOnly;
|
|
||||||
import buildcraft.BuildCraftTransport;
|
import buildcraft.BuildCraftTransport;
|
||||||
import buildcraft.core.IItemPipe;
|
import buildcraft.core.IItemPipe;
|
||||||
import buildcraft.core.ItemBuildCraft;
|
import buildcraft.core.ItemBuildCraft;
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
package buildcraft.transport.pipes;
|
package buildcraft.transport.pipes;
|
||||||
|
|
||||||
|
/*
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
@ -34,7 +35,6 @@ import buildcraft.transport.PipeTransportItems;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
|
|
||||||
/*
|
|
||||||
public class PipeItemsStripes extends Pipe implements IItemTravelingHook, IPowerReceptor {
|
public class PipeItemsStripes extends Pipe implements IItemTravelingHook, IPowerReceptor {
|
||||||
|
|
||||||
private IPowerProvider powerProvider;
|
private IPowerProvider powerProvider;
|
||||||
|
|
|
@ -11,11 +11,9 @@ package buildcraft.transport.pipes;
|
||||||
import buildcraft.api.core.Orientations;
|
import buildcraft.api.core.Orientations;
|
||||||
import buildcraft.api.core.Position;
|
import buildcraft.api.core.Position;
|
||||||
import buildcraft.api.inventory.ISpecialInventory;
|
import buildcraft.api.inventory.ISpecialInventory;
|
||||||
import buildcraft.api.liquids.ITankContainer;
|
|
||||||
import buildcraft.api.power.IPowerProvider;
|
import buildcraft.api.power.IPowerProvider;
|
||||||
import buildcraft.api.power.IPowerReceptor;
|
import buildcraft.api.power.IPowerReceptor;
|
||||||
import buildcraft.api.power.PowerFramework;
|
import buildcraft.api.power.PowerFramework;
|
||||||
import buildcraft.api.power.PowerProvider;
|
|
||||||
import buildcraft.api.transport.IPipedItem;
|
import buildcraft.api.transport.IPipedItem;
|
||||||
import buildcraft.api.transport.PipeManager;
|
import buildcraft.api.transport.PipeManager;
|
||||||
import buildcraft.core.DefaultProps;
|
import buildcraft.core.DefaultProps;
|
||||||
|
@ -24,7 +22,6 @@ import buildcraft.core.Utils;
|
||||||
import buildcraft.transport.Pipe;
|
import buildcraft.transport.Pipe;
|
||||||
import buildcraft.transport.PipeLogicWood;
|
import buildcraft.transport.PipeLogicWood;
|
||||||
import buildcraft.transport.PipeTransportItems;
|
import buildcraft.transport.PipeTransportItems;
|
||||||
import net.minecraft.src.Block;
|
|
||||||
import net.minecraft.src.IInventory;
|
import net.minecraft.src.IInventory;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
|
|
|
@ -22,7 +22,6 @@ import buildcraft.core.network.TileNetworkData;
|
||||||
import buildcraft.transport.Pipe;
|
import buildcraft.transport.Pipe;
|
||||||
import buildcraft.transport.PipeLogicWood;
|
import buildcraft.transport.PipeLogicWood;
|
||||||
import buildcraft.transport.PipeTransportLiquids;
|
import buildcraft.transport.PipeTransportLiquids;
|
||||||
import net.minecraft.src.Block;
|
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraft.src.World;
|
import net.minecraft.src.World;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ import buildcraft.api.core.Orientations;
|
||||||
import buildcraft.api.power.IPowerProvider;
|
import buildcraft.api.power.IPowerProvider;
|
||||||
import buildcraft.api.power.IPowerReceptor;
|
import buildcraft.api.power.IPowerReceptor;
|
||||||
import buildcraft.api.power.PowerFramework;
|
import buildcraft.api.power.PowerFramework;
|
||||||
import buildcraft.api.power.PowerProvider;
|
|
||||||
import buildcraft.core.DefaultProps;
|
import buildcraft.core.DefaultProps;
|
||||||
import buildcraft.core.Utils;
|
import buildcraft.core.Utils;
|
||||||
import buildcraft.transport.Pipe;
|
import buildcraft.transport.Pipe;
|
||||||
|
|
|
@ -13,7 +13,6 @@ import net.minecraft.src.RenderBlocks;
|
||||||
import net.minecraft.src.Tessellator;
|
import net.minecraft.src.Tessellator;
|
||||||
import net.minecraftforge.client.ForgeHooksClient;
|
import net.minecraftforge.client.ForgeHooksClient;
|
||||||
import net.minecraftforge.client.IItemRenderer;
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
|
||||||
|
|
||||||
public class FacadeItemRenderer implements IItemRenderer {
|
public class FacadeItemRenderer implements IItemRenderer {
|
||||||
|
|
||||||
|
@ -106,9 +105,10 @@ public class FacadeItemRenderer implements IItemRenderer {
|
||||||
case ENTITY: return true;
|
case ENTITY: return true;
|
||||||
case EQUIPPED: return true;
|
case EQUIPPED: return true;
|
||||||
case INVENTORY: return true;
|
case INVENTORY: return true;
|
||||||
}
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||||
|
@ -130,6 +130,7 @@ public class FacadeItemRenderer implements IItemRenderer {
|
||||||
GL11.glScalef(1.1F, 1.1F, 1.1F);
|
GL11.glScalef(1.1F, 1.1F, 1.1F);
|
||||||
renderFacadeItem((RenderBlocks) data[0], item, -0.3f, -0.35f, -0.7f);
|
renderFacadeItem((RenderBlocks) data[0], item, -0.3f, -0.35f, -0.7f);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,9 +68,10 @@ public class PipeItemRenderer implements IItemRenderer {
|
||||||
return true;
|
return true;
|
||||||
case INVENTORY:
|
case INVENTORY:
|
||||||
return true;
|
return true;
|
||||||
}
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||||
|
@ -89,6 +90,7 @@ public class PipeItemRenderer implements IItemRenderer {
|
||||||
case INVENTORY:
|
case INVENTORY:
|
||||||
renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
|
renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,9 @@
|
||||||
package buildcraft.transport.render;
|
package buildcraft.transport.render;
|
||||||
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.ListIterator;
|
|
||||||
import java.util.TreeMap;
|
|
||||||
|
|
||||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||||
|
|
||||||
import buildcraft.BuildCraftTransport;
|
import buildcraft.BuildCraftTransport;
|
||||||
import buildcraft.mod_BuildCraftTransport;
|
|
||||||
import buildcraft.api.core.Orientations;
|
import buildcraft.api.core.Orientations;
|
||||||
import buildcraft.api.transport.IPipe;
|
import buildcraft.api.transport.IPipe;
|
||||||
import buildcraft.api.transport.IPipe.WireColor;
|
import buildcraft.api.transport.IPipe.WireColor;
|
||||||
|
@ -21,13 +14,9 @@ import buildcraft.transport.PipeRenderState;
|
||||||
|
|
||||||
import net.minecraft.src.Block;
|
import net.minecraft.src.Block;
|
||||||
import net.minecraft.src.IBlockAccess;
|
import net.minecraft.src.IBlockAccess;
|
||||||
import net.minecraft.src.Item;
|
|
||||||
import net.minecraft.src.ItemBlock;
|
|
||||||
import net.minecraft.src.ItemStack;
|
|
||||||
import net.minecraft.src.RenderBlocks;
|
import net.minecraft.src.RenderBlocks;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.client.ForgeHooksClient;
|
import net.minecraftforge.client.ForgeHooksClient;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
|
||||||
|
|
||||||
public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
|
public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ import net.minecraft.src.GLAllocation;
|
||||||
import net.minecraft.src.Item;
|
import net.minecraft.src.Item;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraft.src.RenderBlocks;
|
import net.minecraft.src.RenderBlocks;
|
||||||
import net.minecraft.src.RenderEngine;
|
|
||||||
import net.minecraft.src.RenderManager;
|
import net.minecraft.src.RenderManager;
|
||||||
import net.minecraft.src.Tessellator;
|
import net.minecraft.src.Tessellator;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
|
@ -35,7 +34,6 @@ import org.lwjgl.opengl.GL11;
|
||||||
import buildcraft.BuildCraftCore;
|
import buildcraft.BuildCraftCore;
|
||||||
import buildcraft.BuildCraftCore.RenderMode;
|
import buildcraft.BuildCraftCore.RenderMode;
|
||||||
import buildcraft.api.core.Orientations;
|
import buildcraft.api.core.Orientations;
|
||||||
import buildcraft.api.liquids.ILiquidTank;
|
|
||||||
import buildcraft.api.liquids.LiquidStack;
|
import buildcraft.api.liquids.LiquidStack;
|
||||||
import buildcraft.api.transport.IPipedItem;
|
import buildcraft.api.transport.IPipedItem;
|
||||||
import buildcraft.core.DefaultProps;
|
import buildcraft.core.DefaultProps;
|
||||||
|
@ -341,6 +339,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
|
||||||
GL11.glRotatef(angleZ[i], 0, 0, 1);
|
GL11.glRotatef(angleZ[i], 0, 0, 1);
|
||||||
list = d.sideHorizontal[stage];
|
list = d.sideHorizontal[stage];
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glCallList(list);
|
GL11.glCallList(list);
|
||||||
|
|
Loading…
Reference in a new issue