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

Visibility fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-02 22:27:18 +02:00
parent a88b335307
commit a431f17e6f
25 changed files with 69 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Set; import java.util.Set;
public final class RefinedStorageUtils { public final class RefinedStorageUtils {
public static final String NBT_INVENTORY = "Inventory_%d"; private static final String NBT_INVENTORY = "Inventory_%d";
public static final String NBT_SLOT = "Slot"; private static final String NBT_SLOT = "Slot";
public static void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) { public static void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();

8
src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java
View File

@@ -16,10 +16,10 @@ import java.util.List;
public class BasicCraftingTask implements ICraftingTask { public class BasicCraftingTask implements ICraftingTask {
public static final int ID = 0; public static final int ID = 0;
public static final String NBT_SATISFIED = "Satisfied"; private static final String NBT_SATISFIED = "Satisfied";
public static final String NBT_CHECKED = "Checked"; private static final String NBT_CHECKED = "Checked";
public static final String NBT_CHILD_TASKS = "ChildTasks"; private static final String NBT_CHILD_TASKS = "ChildTasks";
public static final String NBT_TOOK = "Took"; private static final String NBT_TOOK = "Took";
private ICraftingPattern pattern; private ICraftingPattern pattern;
private boolean satisfied[]; private boolean satisfied[];

6
src/main/java/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
View File

@@ -13,9 +13,9 @@ import refinedstorage.tile.TileCrafter;
public class CraftingPattern implements ICraftingPattern { public class CraftingPattern implements ICraftingPattern {
public static final String NBT = "Pattern"; public static final String NBT = "Pattern";
public static final String NBT_CRAFTER_X = "CrafterX"; private static final String NBT_CRAFTER_X = "CrafterX";
public static final String NBT_CRAFTER_Y = "CrafterY"; private static final String NBT_CRAFTER_Y = "CrafterY";
public static final String NBT_CRAFTER_Z = "CrafterZ"; private static final String NBT_CRAFTER_Z = "CrafterZ";
private int crafterX; private int crafterX;
private int crafterY; private int crafterY;

2
src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
View File

@@ -7,7 +7,7 @@ import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster; import refinedstorage.api.network.INetworkMaster;
public class CraftingTaskScheduler { public class CraftingTaskScheduler {
public static final String NBT_SCHEDULED = "CraftingTaskScheduled"; private static final String NBT_SCHEDULED = "CraftingTaskScheduled";
private ItemStack scheduledItem; private ItemStack scheduledItem;

6
src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
View File

@@ -13,9 +13,9 @@ import refinedstorage.api.network.INetworkMaster;
public class ProcessingCraftingTask implements ICraftingTask { public class ProcessingCraftingTask implements ICraftingTask {
public static final int ID = 1; public static final int ID = 1;
public static final String NBT_INSERTED = "Inserted"; private static final String NBT_INSERTED = "Inserted";
public static final String NBT_CHILD_TASKS = "ChildTasks"; private static final String NBT_CHILD_TASKS = "ChildTasks";
public static final String NBT_SATISFIED = "Satisfied"; private static final String NBT_SATISFIED = "Satisfied";
private ICraftingPattern pattern; private ICraftingPattern pattern;
private boolean inserted[]; private boolean inserted[];

18
src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java
View File

@@ -21,18 +21,18 @@ public abstract class NBTStorage implements IStorage {
* The current save protocol that is used. It's set to every {@link NBTStorage} to allow for * The current save protocol that is used. It's set to every {@link NBTStorage} to allow for
* safe backwards compatibility breaks. * safe backwards compatibility breaks.
*/ */
public static final int PROTOCOL = 1; private static final int PROTOCOL = 1;
public static final String NBT_PROTOCOL = "Protocol"; private static final String NBT_PROTOCOL = "Protocol";
public static final String NBT_ITEMS = "Items"; private static final String NBT_ITEMS = "Items";
public static final String NBT_STORED = "Stored"; private static final String NBT_STORED = "Stored";
public static final String NBT_ITEM_TYPE = "Type"; private static final String NBT_ITEM_TYPE = "Type";
public static final String NBT_ITEM_QUANTITY = "Quantity"; private static final String NBT_ITEM_QUANTITY = "Quantity";
public static final String NBT_ITEM_DAMAGE = "Damage"; private static final String NBT_ITEM_DAMAGE = "Damage";
public static final String NBT_ITEM_NBT = "NBT"; private static final String NBT_ITEM_NBT = "NBT";
public static final String NBT_ITEM_CAPS = "Caps"; private static final String NBT_ITEM_CAPS = "Caps";
private NBTTagCompound tag; private NBTTagCompound tag;
private int capacity; private int capacity;

4
src/main/java/refinedstorage/gui/GuiBase.java
View File

@@ -17,8 +17,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
public abstract class GuiBase extends GuiContainer { public abstract class GuiBase extends GuiContainer {
public static final int SIDE_BUTTON_WIDTH = 20; protected static final int SIDE_BUTTON_WIDTH = 20;
public static final int SIDE_BUTTON_HEIGHT = 20; protected static final int SIDE_BUTTON_HEIGHT = 20;
private List<SideButton> sideButtons = new ArrayList<SideButton>(); private List<SideButton> sideButtons = new ArrayList<SideButton>();

2
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -11,7 +11,7 @@ import refinedstorage.tile.controller.TileController;
import java.util.List; import java.util.List;
public class GuiController extends GuiBase { public class GuiController extends GuiBase {
public static final int VISIBLE_ROWS = 2; private static final int VISIBLE_ROWS = 2;
private TileController controller; private TileController controller;

6
src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -15,10 +15,10 @@ import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
public class GuiCraftingMonitor extends GuiBase { public class GuiCraftingMonitor extends GuiBase {
public static final int VISIBLE_ROWS = 3; private static final int VISIBLE_ROWS = 3;
public static final int ITEM_WIDTH = 72; private static final int ITEM_WIDTH = 72;
public static final int ITEM_HEIGHT = 30; private static final int ITEM_HEIGHT = 30;
private TileCraftingMonitor craftingMonitor; private TileCraftingMonitor craftingMonitor;

2
src/main/java/refinedstorage/gui/GuiCraftingSettings.java
View File

@@ -15,7 +15,7 @@ import refinedstorage.network.MessageGridCraftingStart;
import java.io.IOException; import java.io.IOException;
public class GuiCraftingSettings extends GuiBase { public class GuiCraftingSettings extends GuiBase {
public static final int DEFAULT_AMOUNT = 1; private static final int DEFAULT_AMOUNT = 1;
private GuiTextField amountField; private GuiTextField amountField;
private GuiGrid gui; private GuiGrid gui;

15
src/main/java/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -26,17 +26,18 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
public static final int TYPE_NORMAL = 0; public static final int TYPE_NORMAL = 0;
public static final int TYPE_CREATIVE = 1; public static final int TYPE_CREATIVE = 1;
public static final String NBT_CONTROLLER_X = "ControllerX"; public static final int USAGE_OPEN = 30;
public static final String NBT_CONTROLLER_Y = "ControllerY"; public static final int USAGE_PULL = 3;
public static final String NBT_CONTROLLER_Z = "ControllerZ"; public static final int USAGE_PUSH = 3;
public static final String NBT_DIMENSION_ID = "DimensionID";
public static final String NBT_SORTING_TYPE = "SortingType"; public static final String NBT_SORTING_TYPE = "SortingType";
public static final String NBT_SORTING_DIRECTION = "SortingDirection"; public static final String NBT_SORTING_DIRECTION = "SortingDirection";
public static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode"; public static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode";
public static final int USAGE_OPEN = 30; private static final String NBT_CONTROLLER_X = "ControllerX";
public static final int USAGE_PULL = 3; private static final String NBT_CONTROLLER_Y = "ControllerY";
public static final int USAGE_PUSH = 3; private static final String NBT_CONTROLLER_Z = "ControllerZ";
private static final String NBT_DIMENSION_ID = "DimensionID";
public ItemWirelessGrid() { public ItemWirelessGrid() {
super(3200); super(3200);

2
src/main/java/refinedstorage/tile/TileBase.java
View File

@@ -19,7 +19,7 @@ import refinedstorage.network.MessageTileContainerUpdate;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public abstract class TileBase extends TileEntity implements ITickable { public abstract class TileBase extends TileEntity implements ITickable {
public static final String NBT_DIRECTION = "Direction"; private static final String NBT_DIRECTION = "Direction";
private EnumFacing direction = EnumFacing.NORTH; private EnumFacing direction = EnumFacing.NORTH;

4
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -24,9 +24,9 @@ import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.ICompareConfig;
public class TileConstructor extends TileSlave implements ICompareConfig { public class TileConstructor extends TileSlave implements ICompareConfig {
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final int BASE_SPEED = 20; private static final int BASE_SPEED = 20;
private BasicItemHandler filter = new BasicItemHandler(1, this) { private BasicItemHandler filter = new BasicItemHandler(1, this) {
@Override @Override

6
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -27,10 +27,10 @@ import refinedstorage.tile.config.ModeFilter;
import java.util.List; import java.util.List;
public class TileDestructor extends TileSlave implements ICompareConfig, IModeConfig { public class TileDestructor extends TileSlave implements ICompareConfig, IModeConfig {
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
public static final int BASE_SPEED = 20; private static final int BASE_SPEED = 20;
private BasicItemHandler filters = new BasicItemHandler(9, this); private BasicItemHandler filters = new BasicItemHandler(9, this);
private BasicItemHandler upgrades = new BasicItemHandler( private BasicItemHandler upgrades = new BasicItemHandler(

8
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -21,10 +21,10 @@ public class TileDetector extends TileSlave implements ICompareConfig {
public static final int MODE_EQUAL = 1; public static final int MODE_EQUAL = 1;
public static final int MODE_ABOVE = 2; public static final int MODE_ABOVE = 2;
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
public static final String NBT_AMOUNT = "Amount"; private static final String NBT_AMOUNT = "Amount";
public static final String NBT_POWERED = "Powered"; private static final String NBT_POWERED = "Powered";
private BasicItemHandler filter = new BasicItemHandler(1, this); private BasicItemHandler filter = new BasicItemHandler(1, this);

6
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -47,9 +47,9 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
} }
} }
public static final String NBT_PRIORITY = "Priority"; private static final String NBT_PRIORITY = "Priority";
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
private BasicItemHandler disks = new BasicItemHandler(8, this, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK)) { private BasicItemHandler disks = new BasicItemHandler(8, this, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK)) {
@Override @Override

2
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -20,7 +20,7 @@ import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.ICompareConfig;
public class TileExporter extends TileSlave implements ICompareConfig { public class TileExporter extends TileSlave implements ICompareConfig {
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
private BasicItemHandler filters = new BasicItemHandler(9, this); private BasicItemHandler filters = new BasicItemHandler(9, this);
private BasicItemHandler upgrades = new BasicItemHandler( private BasicItemHandler upgrades = new BasicItemHandler(

4
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -21,8 +21,8 @@ import refinedstorage.tile.config.ModeConstants;
import refinedstorage.tile.config.ModeFilter; import refinedstorage.tile.config.ModeFilter;
public class TileImporter extends TileSlave implements ICompareConfig, IModeConfig { public class TileImporter extends TileSlave implements ICompareConfig, IModeConfig {
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
private BasicItemHandler filters = new BasicItemHandler(9, this); private BasicItemHandler filters = new BasicItemHandler(9, this);
private BasicItemHandler upgrades = new BasicItemHandler( private BasicItemHandler upgrades = new BasicItemHandler(

2
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -19,7 +19,7 @@ import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.ICompareConfig;
public class TileInterface extends TileSlave implements ICompareConfig { public class TileInterface extends TileSlave implements ICompareConfig {
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
private BasicItemHandler importItems = new BasicItemHandler(9, this); private BasicItemHandler importItems = new BasicItemHandler(9, this);
private BasicItemHandler exportSpecimenItems = new BasicItemHandler(9, this); private BasicItemHandler exportSpecimenItems = new BasicItemHandler(9, this);

2
src/main/java/refinedstorage/tile/TileSlave.java
View File

@@ -19,7 +19,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
public abstract class TileSlave extends TileBase implements INetworkSlave, ISynchronizedContainer, IRedstoneModeConfig { public abstract class TileSlave extends TileBase implements INetworkSlave, ISynchronizedContainer, IRedstoneModeConfig {
public static final String NBT_CONNECTED = "Connected"; private static final String NBT_CONNECTED = "Connected";
private RedstoneMode redstoneMode = RedstoneMode.IGNORE; private RedstoneMode redstoneMode = RedstoneMode.IGNORE;
private boolean active; private boolean active;

4
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -21,8 +21,8 @@ import refinedstorage.inventory.SoldererItemHandler;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
public class TileSolderer extends TileSlave { public class TileSolderer extends TileSlave {
public static final String NBT_WORKING = "Working"; private static final String NBT_WORKING = "Working";
public static final String NBT_PROGRESS = "Progress"; private static final String NBT_PROGRESS = "Progress";
private BasicItemHandler items = new BasicItemHandler(4, this); private BasicItemHandler items = new BasicItemHandler(4, this);
private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED)); private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED));

7
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -45,9 +45,10 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage
} }
public static final String NBT_STORAGE = "Storage"; public static final String NBT_STORAGE = "Storage";
public static final String NBT_PRIORITY = "Priority";
public static final String NBT_COMPARE = "Compare"; private static final String NBT_PRIORITY = "Priority";
public static final String NBT_MODE = "Mode"; private static final String NBT_COMPARE = "Compare";
private static final String NBT_MODE = "Mode";
private BasicItemHandler filters = new BasicItemHandler(9, this); private BasicItemHandler filters = new BasicItemHandler(9, this);

3
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -50,10 +50,11 @@ import refinedstorage.tile.config.RedstoneMode;
import java.util.*; import java.util.*;
public class TileController extends TileBase implements INetworkMaster, IEnergyReceiver, ISynchronizedContainer, IRedstoneModeConfig { public class TileController extends TileBase implements INetworkMaster, IEnergyReceiver, ISynchronizedContainer, IRedstoneModeConfig {
public static final String NBT_CRAFTING_TASKS = "CraftingTasks";
public static final String NBT_ENERGY = "Energy"; public static final String NBT_ENERGY = "Energy";
public static final String NBT_ENERGY_CAPACITY = "EnergyCapacity"; public static final String NBT_ENERGY_CAPACITY = "EnergyCapacity";
private static final String NBT_CRAFTING_TASKS = "CraftingTasks";
private GridHandler gridHandler = new GridHandler(this); private GridHandler gridHandler = new GridHandler(this);
private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this); private WirelessGridHandler wirelessGridHandler = new WirelessGridHandler(this);

6
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TileExternalStorage extends TileSlave implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { public class TileExternalStorage extends TileSlave implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler {
public static final String NBT_PRIORITY = "Priority"; private static final String NBT_PRIORITY = "Priority";
public static final String NBT_COMPARE = "Compare"; private static final String NBT_COMPARE = "Compare";
public static final String NBT_MODE = "Mode"; private static final String NBT_MODE = "Mode";
private BasicItemHandler filters = new BasicItemHandler(9, this); private BasicItemHandler filters = new BasicItemHandler(9, this);

6
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -29,9 +29,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TileGrid extends TileSlave implements IGrid { public class TileGrid extends TileSlave implements IGrid {
public static final String NBT_SORTING_DIRECTION = "SortingDirection"; private static final String NBT_SORTING_DIRECTION = "SortingDirection";
public static final String NBT_SORTING_TYPE = "SortingType"; private static final String NBT_SORTING_TYPE = "SortingType";
public static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode"; private static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode";
public static final int SORTING_DIRECTION_ASCENDING = 0; public static final int SORTING_DIRECTION_ASCENDING = 0;
public static final int SORTING_DIRECTION_DESCENDING = 1; public static final int SORTING_DIRECTION_DESCENDING = 1;