Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed "Crafting*" to "Container*".

Browse source
This commit is contained in:
SirSengir 2012-08-17 19:38:08 +02:00
parent 06ea69bfea
commit 146682c092
13 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/buildcraft/builders/GuiHandler.java
View file

@ -2,9 +2,9 @@ package buildcraft.builders;
import cpw.mods.fml.common.network.IGuiHandler;
import buildcraft.builders.gui.ContainerBlueprintLibrary;
import buildcraft.builders.gui.CraftingBuilder;
import buildcraft.builders.gui.CraftingFiller;
import buildcraft.builders.gui.CraftingTemplate;
import buildcraft.builders.gui.ContainerBuilder;
import buildcraft.builders.gui.ContainerFiller;
import buildcraft.builders.gui.ContainerTemplate;
import buildcraft.builders.gui.GuiBlueprintLibrary;
import buildcraft.builders.gui.GuiBuilder;
import buildcraft.builders.gui.GuiFiller;
@ -66,7 +66,7 @@ public class GuiHandler implements IGuiHandler {
case GuiIds.ARCHITECT_TABLE:
if (!(tile instanceof TileArchitect))
return null;
return new CraftingTemplate(player.inventory, (TileArchitect) tile);
return new ContainerTemplate(player.inventory, (TileArchitect) tile);
case GuiIds.BLUEPRINT_LIBRARY:
if (!(tile instanceof TileBlueprintLibrary))
@ -76,12 +76,12 @@ public class GuiHandler implements IGuiHandler {
case GuiIds.BUILDER:
if (!(tile instanceof TileBuilder))
return null;
return new CraftingBuilder(player.inventory, (TileBuilder) tile);
return new ContainerBuilder(player.inventory, (TileBuilder) tile);
case GuiIds.FILLER:
if (!(tile instanceof TileFiller))
return null;
return new CraftingFiller(player.inventory, (TileFiller) tile);
return new ContainerFiller(player.inventory, (TileFiller) tile);
default:
return null;

4
common/buildcraft/builders/gui/CraftingBuilder.java → common/buildcraft/builders/gui/ContainerBuilder.java
View file

@ -15,12 +15,12 @@ import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;
import net.minecraft.src.Slot;
public class CraftingBuilder extends BuildCraftContainer {
public class ContainerBuilder extends BuildCraftContainer {
IInventory playerIInventory;
TileBuilder builder;
public CraftingBuilder(IInventory playerInventory, TileBuilder builder) {
public ContainerBuilder(IInventory playerInventory, TileBuilder builder) {
super(builder.getSizeInventory());
this.playerIInventory = playerInventory;
this.builder = builder;

4
common/buildcraft/builders/gui/CraftingFiller.java → common/buildcraft/builders/gui/ContainerFiller.java
View file

@ -14,12 +14,12 @@ import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;
import net.minecraft.src.Slot;
public class CraftingFiller extends BuildCraftContainer {
public class ContainerFiller extends BuildCraftContainer {
IInventory playerIInventory;
IInventory fillerInventory;
public CraftingFiller(IInventory playerInventory, IInventory fillerInventory) {
public ContainerFiller(IInventory playerInventory, IInventory fillerInventory) {
super(fillerInventory.getSizeInventory());
this.playerIInventory = playerInventory;
this.fillerInventory = fillerInventory;

4
common/buildcraft/builders/gui/CraftingTemplate.java → common/buildcraft/builders/gui/ContainerTemplate.java
View file

@ -16,13 +16,13 @@ import net.minecraft.src.ICrafting;
import net.minecraft.src.IInventory;
import net.minecraft.src.Slot;
public class CraftingTemplate extends BuildCraftContainer {
public class ContainerTemplate extends BuildCraftContainer {
protected IInventory playerIInventory;
protected TileArchitect template;
protected int computingTime = 0;
public CraftingTemplate(IInventory playerInventory, TileArchitect template) {
public ContainerTemplate(IInventory playerInventory, TileArchitect template) {
super(template.getSizeInventory());
this.playerIInventory = playerInventory;
this.template = template;

2
common/buildcraft/builders/gui/GuiBuilder.java
View file

@ -27,7 +27,7 @@ public class GuiBuilder extends GuiAdvancedInterface {
TileBuilder builder;
public GuiBuilder(IInventory playerInventory, TileBuilder builder) {
super(new CraftingBuilder(playerInventory, builder), builder);
super(new ContainerBuilder(playerInventory, builder), builder);
this.playerInventory = playerInventory;
this.builder = builder;
xSize = 176;

2
common/buildcraft/builders/gui/GuiFiller.java
View file

@ -24,7 +24,7 @@ public class GuiFiller extends GuiBuildCraft {
TileFiller filler;
public GuiFiller(IInventory playerInventory, TileFiller filler) {
super(new CraftingFiller(playerInventory, filler), filler);
super(new ContainerFiller(playerInventory, filler), filler);
this.playerInventory = playerInventory;
this.filler = filler;
xSize = 175;

2
common/buildcraft/builders/gui/GuiTemplate.java
View file

@ -29,7 +29,7 @@ public class GuiTemplate extends GuiBuildCraft {
boolean editMode = false;
public GuiTemplate(IInventory playerInventory, TileArchitect template) {
super(new CraftingTemplate(playerInventory, template), template);
super(new ContainerTemplate(playerInventory, template), template);
this.playerInventory = playerInventory;
this.template = template;
xSize = 175;

8
common/buildcraft/transport/GuiHandler.java
View file

@ -3,8 +3,8 @@ package buildcraft.transport;
import cpw.mods.fml.common.network.IGuiHandler;
import buildcraft.core.GuiIds;
import buildcraft.transport.TileGenericPipe;
import buildcraft.transport.gui.CraftingDiamondPipe;
import buildcraft.transport.gui.CraftingGateInterface;
import buildcraft.transport.gui.ContainerDiamondPipe;
import buildcraft.transport.gui.ContainerGateInterface;
import buildcraft.transport.gui.GuiDiamondPipe;
import buildcraft.transport.gui.GuiGateInterface;
import net.minecraft.src.EntityPlayer;
@ -27,10 +27,10 @@ public class GuiHandler implements IGuiHandler {
switch (ID) {
case GuiIds.PIPE_DIAMOND:
return new CraftingDiamondPipe(player.inventory, (PipeLogicDiamond)pipe.pipe.logic);
return new ContainerDiamondPipe(player.inventory, (PipeLogicDiamond)pipe.pipe.logic);
case GuiIds.GATES:
return new CraftingGateInterface(player.inventory, pipe.pipe);
return new ContainerGateInterface(player.inventory, pipe.pipe);
default:
return null;

4
common/buildcraft/transport/gui/CraftingDiamondPipe.java → common/buildcraft/transport/gui/ContainerDiamondPipe.java
View file

@ -14,12 +14,12 @@ import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory;
import net.minecraft.src.Slot;
public class CraftingDiamondPipe extends BuildCraftContainer {
public class ContainerDiamondPipe extends BuildCraftContainer {
IInventory playerIInventory;
IInventory filterIInventory;
public CraftingDiamondPipe(IInventory playerInventory, IInventory filterInventory) {
public ContainerDiamondPipe(IInventory playerInventory, IInventory filterInventory) {
super(filterInventory.getSizeInventory());
this.playerIInventory = playerInventory;
this.filterIInventory = filterInventory;

4
common/buildcraft/transport/gui/CraftingGateInterface.java → common/buildcraft/transport/gui/ContainerGateInterface.java
View file

@ -34,7 +34,7 @@ import net.minecraft.src.ItemStack;
import net.minecraft.src.Slot;
import net.minecraft.src.TileEntity;
public class CraftingGateInterface extends BuildCraftContainer {
public class ContainerGateInterface extends BuildCraftContainer {
IInventory playerIInventory;
Pipe pipe;
@ -45,7 +45,7 @@ public class CraftingGateInterface extends BuildCraftContainer {
private boolean isSynchronized = false;
private boolean isNetInitialized = false;
public CraftingGateInterface(IInventory playerInventory, Pipe pipe) {
public ContainerGateInterface(IInventory playerInventory, Pipe pipe) {
super(0);
this.playerIInventory = playerInventory;

2
common/buildcraft/transport/gui/GuiDiamondPipe.java
View file

@ -29,7 +29,7 @@ public class GuiDiamondPipe extends GuiAdvancedInterface {
PipeLogicDiamond filterInventory;
public GuiDiamondPipe(IInventory playerInventory, TileGenericPipe tile) {
super(new CraftingDiamondPipe(playerInventory, (IInventory)tile.pipe.logic), (IInventory)tile.pipe.logic);
super(new ContainerDiamondPipe(playerInventory, (IInventory)tile.pipe.logic), (IInventory)tile.pipe.logic);
this.playerInventory = playerInventory;
this.filterInventory = (PipeLogicDiamond)tile.pipe.logic;
xSize = 175;

6
common/buildcraft/transport/gui/GuiGateInterface.java
View file

@ -30,7 +30,7 @@ public class GuiGateInterface extends GuiAdvancedInterface {
IInventory playerInventory;
private final CraftingGateInterface _container;
private final ContainerGateInterface _container;
private int nbEntries;
@ -164,9 +164,9 @@ public class GuiGateInterface extends GuiAdvancedInterface {
}
public GuiGateInterface(IInventory playerInventory, Pipe pipe) {
super(new CraftingGateInterface(playerInventory, pipe), null);
super(new ContainerGateInterface(playerInventory, pipe), null);
_container = (CraftingGateInterface) this.inventorySlots;
_container = (ContainerGateInterface) this.inventorySlots;
this.playerInventory = playerInventory;
xSize = 175;

14
common/buildcraft/transport/network/PacketHandlerTransport.java
View file

@ -15,7 +15,7 @@ import buildcraft.transport.PipeTransportItems;
import buildcraft.transport.PipeTransportLiquids;
import buildcraft.transport.PipeTransportPower;
import buildcraft.transport.TileGenericPipe;
import buildcraft.transport.gui.CraftingGateInterface;
import buildcraft.transport.gui.ContainerGateInterface;
import buildcraft.transport.network.PacketLiquidUpdate;
import buildcraft.transport.network.PacketPowerUpdate;
import buildcraft.transport.network.PipeRenderStatePacket;
@ -91,10 +91,10 @@ public class PacketHandlerTransport implements IPacketHandler {
private void onGateActions(PacketUpdate packet) {
Container container = ModLoader.getMinecraftInstance().thePlayer.craftingInventory;
if (!(container instanceof CraftingGateInterface))
if (!(container instanceof ContainerGateInterface))
return;
((CraftingGateInterface) container).updateActions(packet);
((ContainerGateInterface) container).updateActions(packet);
}
/**
@ -105,10 +105,10 @@ public class PacketHandlerTransport implements IPacketHandler {
private void onGateTriggers(PacketUpdate packet) {
Container container = ModLoader.getMinecraftInstance().thePlayer.craftingInventory;
if (!(container instanceof CraftingGateInterface))
if (!(container instanceof ContainerGateInterface))
return;
((CraftingGateInterface) container).updateTriggers(packet);
((ContainerGateInterface) container).updateTriggers(packet);
}
/**
@ -119,10 +119,10 @@ public class PacketHandlerTransport implements IPacketHandler {
private void onGateSelection(PacketUpdate packet) {
Container container = ModLoader.getMinecraftInstance().thePlayer.craftingInventory;
if (!(container instanceof CraftingGateInterface))
if (!(container instanceof ContainerGateInterface))
return;
((CraftingGateInterface) container).setSelection(packet);
((ContainerGateInterface) container).setSelection(packet);
}
/**