dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put gui ids in other class

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-24 21:49:20 +01:00
parent 770483ee02
commit 0e0c6eb5b9
17 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/storagecraft/StorageCraft.java
View File

@@ -16,27 +16,14 @@ import storagecraft.item.ItemStorageCell;
import storagecraft.proxy.CommonProxy; import storagecraft.proxy.CommonProxy;
@Mod(modid = StorageCraft.ID, version = StorageCraft.VERSION, dependencies = StorageCraft.DEPENDENCIES) @Mod(modid = StorageCraft.ID, version = StorageCraft.VERSION, dependencies = StorageCraft.DEPENDENCIES)
public class StorageCraft public final class StorageCraft
{ {
public static final class GUI
{
public static final int CONTROLLER = 0;
public static final int GRID = 1;
public static final int DRIVE = 2;
public static final int EXTERNAL_STORAGE = 3;
public static final int IMPORTER = 4;
public static final int EXPORTER = 5;
public static final int DETECTOR = 6;
public static final int SOLDERER = 7;
public static final int WIRELESS_TRANSMITTER = 8;
public static final int DESTRUCTOR = 9;
public static final int CONSTRUCTOR = 10;
}
public static final String ID = "storagecraft"; public static final String ID = "storagecraft";
public static final String VERSION = "1.0"; public static final String VERSION = "1.0";
public static final String DEPENDENCIES = "after:NotEnoughItems"; public static final String DEPENDENCIES = "after:NotEnoughItems";
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
public static final CreativeTabs TAB = new CreativeTabs(ID) public static final CreativeTabs TAB = new CreativeTabs(ID)
{ {
@Override @Override
@@ -51,8 +38,10 @@ public class StorageCraft
return null; return null;
} }
}; };
@SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy") @SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy")
public static CommonProxy PROXY; public static CommonProxy PROXY;
@Instance @Instance
public static StorageCraft INSTANCE; public static StorageCraft INSTANCE;

2
src/main/java/storagecraft/StorageCraftBlocks.java
View File

@@ -14,7 +14,7 @@ import storagecraft.block.BlockSolderer;
import storagecraft.block.BlockExternalStorage; import storagecraft.block.BlockExternalStorage;
import storagecraft.block.BlockWirelessTransmitter; import storagecraft.block.BlockWirelessTransmitter;
public class StorageCraftBlocks public final class StorageCraftBlocks
{ {
public static final BlockController CONTROLLER = new BlockController(); public static final BlockController CONTROLLER = new BlockController();
public static final BlockCable CABLE = new BlockCable(); public static final BlockCable CABLE = new BlockCable();

16
src/main/java/storagecraft/StorageCraftGUI.java Normal file
View File

@@ -0,0 +1,16 @@
package storagecraft;
public final class StorageCraftGUI
{
public static final int CONTROLLER = 0;
public static final int GRID = 1;
public static final int DRIVE = 2;
public static final int EXTERNAL_STORAGE = 3;
public static final int IMPORTER = 4;
public static final int EXPORTER = 5;
public static final int DETECTOR = 6;
public static final int SOLDERER = 7;
public static final int WIRELESS_TRANSMITTER = 8;
public static final int DESTRUCTOR = 9;
public static final int CONSTRUCTOR = 10;
}

2
src/main/java/storagecraft/StorageCraftItems.java
View File

@@ -9,7 +9,7 @@ import storagecraft.item.ItemStoragePart;
import storagecraft.item.ItemWirelessGrid; import storagecraft.item.ItemWirelessGrid;
import storagecraft.item.ItemWirelessGridPlate; import storagecraft.item.ItemWirelessGridPlate;
public class StorageCraftItems public final class StorageCraftItems
{ {
public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell();
public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid();

3
src/main/java/storagecraft/block/BlockConstructor.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileConstructor; import storagecraft.tile.TileConstructor;
public class BlockConstructor extends BlockBase implements ITileEntityProvider public class BlockConstructor extends BlockBase implements ITileEntityProvider
@@ -32,7 +33,7 @@ public class BlockConstructor extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.CONSTRUCTOR, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONSTRUCTOR, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockController.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileController; import storagecraft.tile.TileController;
public class BlockController extends BlockBase implements ITileEntityProvider public class BlockController extends BlockBase implements ITileEntityProvider
@@ -31,7 +32,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.CONTROLLER, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.CONTROLLER, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockDestructor.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileDestructor; import storagecraft.tile.TileDestructor;
public class BlockDestructor extends BlockBase implements ITileEntityProvider public class BlockDestructor extends BlockBase implements ITileEntityProvider
@@ -32,7 +33,7 @@ public class BlockDestructor extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.DESTRUCTOR, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DESTRUCTOR, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockDetector.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileDetector; import storagecraft.tile.TileDetector;
public class BlockDetector extends BlockBase implements ITileEntityProvider public class BlockDetector extends BlockBase implements ITileEntityProvider
@@ -26,7 +27,7 @@ public class BlockDetector extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.DETECTOR, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DETECTOR, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockDrive.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileDrive; import storagecraft.tile.TileDrive;
public class BlockDrive extends BlockBase implements ITileEntityProvider public class BlockDrive extends BlockBase implements ITileEntityProvider
@@ -25,7 +26,7 @@ public class BlockDrive extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.DRIVE, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.DRIVE, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockExporter.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileExporter; import storagecraft.tile.TileExporter;
public class BlockExporter extends BlockBase implements ITileEntityProvider public class BlockExporter extends BlockBase implements ITileEntityProvider
@@ -31,7 +32,7 @@ public class BlockExporter extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.EXPORTER, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.EXPORTER, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockExternalStorage.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileExternalStorage; import storagecraft.tile.TileExternalStorage;
public class BlockExternalStorage extends BlockBase implements ITileEntityProvider public class BlockExternalStorage extends BlockBase implements ITileEntityProvider
@@ -31,7 +32,7 @@ public class BlockExternalStorage extends BlockBase implements ITileEntityProvid
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.EXTERNAL_STORAGE, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.EXTERNAL_STORAGE, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockGrid.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileGrid; import storagecraft.tile.TileGrid;
public class BlockGrid extends BlockBase implements ITileEntityProvider public class BlockGrid extends BlockBase implements ITileEntityProvider
@@ -45,7 +46,7 @@ public class BlockGrid extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.GRID, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockImporter.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileImporter; import storagecraft.tile.TileImporter;
public class BlockImporter extends BlockBase implements ITileEntityProvider public class BlockImporter extends BlockBase implements ITileEntityProvider
@@ -31,7 +32,7 @@ public class BlockImporter extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.IMPORTER, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.IMPORTER, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockSolderer.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileSolderer; import storagecraft.tile.TileSolderer;
public class BlockSolderer extends BlockBase implements ITileEntityProvider public class BlockSolderer extends BlockBase implements ITileEntityProvider
@@ -32,7 +33,7 @@ public class BlockSolderer extends BlockBase implements ITileEntityProvider
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.SOLDERER, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.SOLDERER, world, x, y, z);
} }
return true; return true;

3
src/main/java/storagecraft/block/BlockWirelessTransmitter.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileWirelessTransmitter; import storagecraft.tile.TileWirelessTransmitter;
public class BlockWirelessTransmitter extends BlockBase implements ITileEntityProvider public class BlockWirelessTransmitter extends BlockBase implements ITileEntityProvider
@@ -27,7 +28,7 @@ public class BlockWirelessTransmitter extends BlockBase implements ITileEntityPr
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.WIRELESS_TRANSMITTER, world, x, y, z); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.WIRELESS_TRANSMITTER, world, x, y, z);
} }
return true; return true;

46
src/main/java/storagecraft/gui/GuiHandler.java
View File

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI;
import storagecraft.container.ContainerConstructor; import storagecraft.container.ContainerConstructor;
import storagecraft.container.ContainerController; import storagecraft.container.ContainerController;
import storagecraft.container.ContainerDestructor; import storagecraft.container.ContainerDestructor;
@@ -35,27 +35,27 @@ public class GuiHandler implements IGuiHandler
{ {
switch (ID) switch (ID)
{ {
case StorageCraft.GUI.CONTROLLER: case StorageCraftGUI.CONTROLLER:
return new ContainerController(player); return new ContainerController(player);
case StorageCraft.GUI.GRID: case StorageCraftGUI.GRID:
return new ContainerGrid(player, (TileGrid) tile); return new ContainerGrid(player, (TileGrid) tile);
case StorageCraft.GUI.DRIVE: case StorageCraftGUI.DRIVE:
return new ContainerDrive(player, (TileDrive) tile); return new ContainerDrive(player, (TileDrive) tile);
case StorageCraft.GUI.EXTERNAL_STORAGE: case StorageCraftGUI.EXTERNAL_STORAGE:
return new ContainerExternalStorage(player); return new ContainerExternalStorage(player);
case StorageCraft.GUI.IMPORTER: case StorageCraftGUI.IMPORTER:
return new ContainerImporter(player, (TileImporter) tile); return new ContainerImporter(player, (TileImporter) tile);
case StorageCraft.GUI.EXPORTER: case StorageCraftGUI.EXPORTER:
return new ContainerExporter(player, (TileExporter) tile); return new ContainerExporter(player, (TileExporter) tile);
case StorageCraft.GUI.DETECTOR: case StorageCraftGUI.DETECTOR:
return new ContainerDetector(player, (TileDetector) tile); return new ContainerDetector(player, (TileDetector) tile);
case StorageCraft.GUI.SOLDERER: case StorageCraftGUI.SOLDERER:
return new ContainerSolderer(player, (TileSolderer) tile); return new ContainerSolderer(player, (TileSolderer) tile);
case StorageCraft.GUI.WIRELESS_TRANSMITTER: case StorageCraftGUI.WIRELESS_TRANSMITTER:
return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile);
case StorageCraft.GUI.DESTRUCTOR: case StorageCraftGUI.DESTRUCTOR:
return new ContainerDestructor(player); return new ContainerDestructor(player);
case StorageCraft.GUI.CONSTRUCTOR: case StorageCraftGUI.CONSTRUCTOR:
return new ContainerConstructor(player, (TileConstructor) tile); return new ContainerConstructor(player, (TileConstructor) tile);
default: default:
return null; return null;
@@ -75,27 +75,27 @@ public class GuiHandler implements IGuiHandler
switch (ID) switch (ID)
{ {
case StorageCraft.GUI.CONTROLLER: case StorageCraftGUI.CONTROLLER:
return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile);
case StorageCraft.GUI.GRID: case StorageCraftGUI.GRID:
return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile);
case StorageCraft.GUI.DRIVE: case StorageCraftGUI.DRIVE:
return new GuiDrive((ContainerDrive) getContainer(ID, player, tile), (TileDrive) tile); return new GuiDrive((ContainerDrive) getContainer(ID, player, tile), (TileDrive) tile);
case StorageCraft.GUI.EXTERNAL_STORAGE: case StorageCraftGUI.EXTERNAL_STORAGE:
return new GuiExternalStorage((ContainerExternalStorage) getContainer(ID, player, tile), (TileExternalStorage) tile); return new GuiExternalStorage((ContainerExternalStorage) getContainer(ID, player, tile), (TileExternalStorage) tile);
case StorageCraft.GUI.IMPORTER: case StorageCraftGUI.IMPORTER:
return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile);
case StorageCraft.GUI.EXPORTER: case StorageCraftGUI.EXPORTER:
return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile);
case StorageCraft.GUI.DETECTOR: case StorageCraftGUI.DETECTOR:
return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile);
case StorageCraft.GUI.SOLDERER: case StorageCraftGUI.SOLDERER:
return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile);
case StorageCraft.GUI.WIRELESS_TRANSMITTER: case StorageCraftGUI.WIRELESS_TRANSMITTER:
return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile);
case StorageCraft.GUI.DESTRUCTOR: case StorageCraftGUI.DESTRUCTOR:
return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile);
case StorageCraft.GUI.CONSTRUCTOR: case StorageCraftGUI.CONSTRUCTOR:
return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile);
default: default:
return null; return null;

3
src/main/java/storagecraft/item/ItemWirelessGrid.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import storagecraft.StorageCraft; import storagecraft.StorageCraft;
import storagecraft.StorageCraftGUI;
import storagecraft.tile.TileGrid; import storagecraft.tile.TileGrid;
import storagecraft.tile.TileWirelessTransmitter; import storagecraft.tile.TileWirelessTransmitter;
@@ -80,7 +81,7 @@ public class ItemWirelessGrid extends ItemBase
} }
else else
{ {
player.openGui(StorageCraft.INSTANCE, StorageCraft.GUI.GRID, world, grid.xCoord, grid.yCoord, grid.zCoord); player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.xCoord, grid.yCoord, grid.zCoord);
} }
} }
else else