Organized imports

Changed centrifuge to new recipe system
This commit is contained in:
Gig 2015-05-19 23:00:36 +01:00
parent 6de2cc351a
commit 1f9600b33c
155 changed files with 450 additions and 1664 deletions

View file

@ -1,9 +1,9 @@
package techreborn.client;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.event.TextureStitchEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class IconSupplier {
public static IIcon insulatedCopperCable;

View file

@ -2,10 +2,7 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class ContainerAesu extends TechRebornContainer {

View file

@ -2,11 +2,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnace;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class ContainerAlloyFurnace extends TechRebornContainer {

View file

@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class ContainerAlloySmelter extends TechRebornContainer {

View file

@ -3,9 +3,7 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileAssemblingMachine;
import techreborn.tiles.TileBlastFurnace;
public class ContainerAssemblingMachine extends TechRebornContainer {

View file

@ -13,72 +13,46 @@ public class ContainerCentrifuge extends TechRebornContainer {
TileCentrifuge tile;
public int tickTime;
public ContainerCentrifuge(TileCentrifuge tileCentrifuge,
EntityPlayer player)
{
tile = tileCentrifuge;
this.player = player;
// input
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 0, 80, 35));
// cells
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 1, 50, 5));
// outputs
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 2, 80,
5));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 3,
110, 35));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 4, 80,
65));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 5, 50,
35));
int i;
for (i = 0; i < 3; ++i)
{
for (int j = 0; j < 9; ++j)
{
this.addSlotToContainer(new Slot(player.inventory, j + i * 9
+ 9, 8 + j * 18, 84 + i * 18));
}
}
for (i = 0; i < 9; ++i)
{
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18,
142));
}
}
@Override
public boolean canInteractWith(EntityPlayer player)
{
return true;
}
@Override
public void addCraftingToCrafters(ICrafting crafting)
{
super.addCraftingToCrafters(crafting);
crafting.sendProgressBarUpdate(this, 0, tile.tickTime);
}
public ContainerCentrifuge(TileCentrifuge tileCentrifuge, EntityPlayer player){
tile = tileCentrifuge;
this.player = player;
/**
* Looks for changes made in the container, sends them to every listener.
*/
public void detectAndSendChanges()
{
super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); ++i)
{
ICrafting icrafting = (ICrafting) this.crafters.get(i);
if (this.tickTime != this.tile.tickTime)
{
icrafting.sendProgressBarUpdate(this, 0, this.tile.tickTime);
// input
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 0, 80, 35));
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 1, 50, 5));
// outputs
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 2, 80, 5));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 3, 110, 35));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 4, 80, 65));
this.addSlotToContainer(new SlotOutput(tileCentrifuge.inventory, 5, 50, 35));
// battery
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 6, 56, 53));
// upgrades
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 7, 152, 8));
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 8, 152, 26));
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 9, 152, 44));
this.addSlotToContainer(new Slot(tileCentrifuge.inventory, 10, 152, 62));
int i;
for (i = 0; i < 3; ++i){
for (int j = 0; j < 9; ++j){
this.addSlotToContainer(new Slot(player.inventory, j + i * 9
+ 9, 8 + j * 18, 84 + i * 18));
}
}
this.tickTime = this.tile.tickTime;
for (i = 0; i < 9; ++i){
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18,
142));
}
}
}

View file

@ -3,8 +3,6 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileChemicalReactor;
public class ContainerChemicalReactor extends TechRebornContainer {

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import techreborn.tiles.TileChunkLoader;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.tiles.TileChunkLoader;
public class ContainerChunkloader extends TechRebornContainer{

View file

@ -5,7 +5,6 @@ import net.minecraft.inventory.Slot;
import techreborn.client.SlotFake;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileDieselGenerator;
import techreborn.tiles.TileThermalGenerator;
public class ContainerDieselGenerator extends TechRebornContainer {
public TileDieselGenerator tiledieselGenerator;

View file

@ -1,10 +1,9 @@
package techreborn.client.container;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileGrinder;
import techreborn.tiles.TileMatterFabricator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileGrinder;
public class ContainerGrinder extends TechRebornContainer{

View file

@ -1,11 +1,9 @@
package techreborn.client.container;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileGrinder;
import techreborn.tiles.TileImplosionCompressor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileImplosionCompressor;
public class ContainerImplosionCompressor extends TechRebornContainer{

View file

@ -3,8 +3,6 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileIndustrialElectrolyzer;
public class ContainerIndustrialElectrolyzer extends TechRebornContainer {

View file

@ -3,8 +3,6 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileIndustrialSawmill;
public class ContainerIndustrialSawmill extends TechRebornContainer {

View file

@ -3,8 +3,6 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileLathe;
public class ContainerLathe extends TechRebornContainer {

View file

@ -1,10 +1,9 @@
package techreborn.client.container;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileMatterFabricator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileMatterFabricator;
public class ContainerMatterFabricator extends TechRebornContainer{

View file

@ -3,9 +3,6 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileLathe;
import techreborn.tiles.TilePlateCuttingMachine;
public class ContainerPlateCuttingMachine extends TechRebornContainer {

View file

@ -1,17 +1,11 @@
package techreborn.client.gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAesu;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class GuiAesu extends GuiContainer {

View file

@ -6,15 +6,8 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.client.container.ContainerAlloyFurnace;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.compat.nei.recipes.AlloySmelterRecipeHandler;
import techreborn.recipes.AlloySmelterRecipe;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class GuiAlloyFurnace extends GuiContainer {

View file

@ -7,9 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
public class GuiAlloySmelter extends GuiContainer {

View file

@ -6,12 +6,8 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileAssemblingMachine;
import techreborn.tiles.TileBlastFurnace;
public class GuiAssemblingMachine extends GuiContainer {

View file

@ -1,7 +1,5 @@
package techreborn.client.gui;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.IRecipeHandler;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;

View file

@ -37,7 +37,6 @@ public class GuiCentrifuge extends GuiContainer {
this.fontRendererObj.drawString(namePt1, 98, 6, 4210752);
this.fontRendererObj.drawString(namePt2, 98, 14, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString(centrifuge.tickTime + " " + centrifuge.isRunning, 110, this.ySize - 96 + 2, 4210752);
}
@Override

View file

@ -6,11 +6,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerChemicalReactor;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileChemicalReactor;
public class GuiChemicalReactor extends GuiContainer {

View file

@ -1,17 +1,13 @@
package techreborn.client.gui;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerChunkloader;
import techreborn.pda.GuiButtonCustomTexture;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileChunkLoader;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerChunkloader;
import techreborn.tiles.TileChunkLoader;
public class GuiChunkLoader extends GuiContainer{

View file

@ -6,9 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerDieselGenerator;
import techreborn.client.container.ContainerThermalGenerator;
import techreborn.tiles.TileDieselGenerator;
import techreborn.tiles.TileThermalGenerator;
public class GuiDieselGenerator extends GuiContainer {

View file

@ -1,15 +1,12 @@
package techreborn.client.gui;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerGrinder;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileGrinder;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerGrinder;
import techreborn.tiles.TileGrinder;
public class GuiGrinder extends GuiContainer{

View file

@ -1,15 +1,13 @@
package techreborn.client.gui;
import techreborn.client.container.ContainerGrinder;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.tiles.TileImplosionCompressor;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.tiles.TileImplosionCompressor;
public class GuiImplosionCompressor extends GuiContainer{

View file

@ -6,11 +6,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerIndustrialElectrolyzer;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileIndustrialElectrolyzer;
public class GuiIndustrialElectrolyzer extends GuiContainer {

View file

@ -6,11 +6,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerIndustrialSawmill;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileIndustrialSawmill;
public class GuiIndustrialSawmill extends GuiContainer {

View file

@ -6,11 +6,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerLathe;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileLathe;
public class GuiLathe extends GuiContainer {

View file

@ -1,15 +1,12 @@
package techreborn.client.gui;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.client.container.ContainerMatterFabricator;
import techreborn.tiles.TileImplosionCompressor;
import techreborn.tiles.TileMatterFabricator;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerMatterFabricator;
import techreborn.tiles.TileMatterFabricator;
public class GuiMatterFabricator extends GuiContainer{

View file

@ -6,13 +6,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerLathe;
import techreborn.client.container.ContainerPlateCuttingMachine;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileLathe;
import techreborn.tiles.TilePlateCuttingMachine;
public class GuiPlateCuttingMachine extends GuiContainer {