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

Various code improvements

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-11-26 10:15:20 +01:00
parent 74519fb75b
commit f3d2d6675b
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

42
src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
View File

@@ -71,7 +71,7 @@ public final class RSUtils {
return Pair.of(buf.readInt(), new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)), buf.readInt(), ByteBufUtils.readTag(buf))); return Pair.of(buf.readInt(), new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)), buf.readInt(), ByteBufUtils.readTag(buf)));
} }
public static void constructFromDrive(ItemStack disk, int slot, ItemStorageNBT[] itemStorages, FluidStorageNBT[] fluidStorages, Function<ItemStack, ItemStorageNBT> itemStorageSupplier, Function<ItemStack, FluidStorageNBT> fluidStorageNBTSupplier) { public static void createStorages(ItemStack disk, int slot, ItemStorageNBT[] itemStorages, FluidStorageNBT[] fluidStorages, Function<ItemStack, ItemStorageNBT> itemStorageSupplier, Function<ItemStack, FluidStorageNBT> fluidStorageNBTSupplier) {
if (disk == null) { if (disk == null) {
itemStorages[slot] = null; itemStorages[slot] = null;
fluidStorages[slot] = null; fluidStorages[slot] = null;
@@ -84,29 +84,29 @@ public final class RSUtils {
} }
} }
public static void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) { public static void writeItems(IItemHandler handler, int id, NBTTagCompound tag) {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
for (int i = 0; i < handler.getSlots(); i++) { for (int i = 0; i < handler.getSlots(); i++) {
if (handler.getStackInSlot(i) != null) { if (handler.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound(); NBTTagCompound stackTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i); stackTag.setInteger(NBT_SLOT, i);
handler.getStackInSlot(i).writeToNBT(compoundTag); handler.getStackInSlot(i).writeToNBT(stackTag);
tagList.appendTag(compoundTag); tagList.appendTag(stackTag);
} }
} }
nbt.setTag(String.format(NBT_INVENTORY, id), tagList); tag.setTag(String.format(NBT_INVENTORY, id), tagList);
} }
public static void readItems(IItemHandlerModifiable handler, int id, NBTTagCompound nbt) { public static void readItems(IItemHandlerModifiable handler, int id, NBTTagCompound tag) {
String name = String.format(NBT_INVENTORY, id); String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) { if (tag.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); NBTTagList tagList = tag.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) { for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
@@ -120,29 +120,29 @@ public final class RSUtils {
} }
} }
public static void writeItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) { public static void writeItemsLegacy(IInventory inventory, int id, NBTTagCompound tag) {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
for (int i = 0; i < inventory.getSizeInventory(); i++) { for (int i = 0; i < inventory.getSizeInventory(); i++) {
if (inventory.getStackInSlot(i) != null) { if (inventory.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound(); NBTTagCompound stackTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i); stackTag.setInteger(NBT_SLOT, i);
inventory.getStackInSlot(i).writeToNBT(compoundTag); inventory.getStackInSlot(i).writeToNBT(stackTag);
tagList.appendTag(compoundTag); tagList.appendTag(stackTag);
} }
} }
nbt.setTag(String.format(NBT_INVENTORY, id), tagList); tag.setTag(String.format(NBT_INVENTORY, id), tagList);
} }
public static void readItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) { public static void readItemsLegacy(IInventory inventory, int id, NBTTagCompound tag) {
String name = String.format(NBT_INVENTORY, id); String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) { if (tag.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); NBTTagList tagList = tag.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) { for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
@@ -258,9 +258,9 @@ public final class RSUtils {
public static String formatQuantity(int qty) { public static String formatQuantity(int qty) {
if (qty >= 1000000) { if (qty >= 1000000) {
return RSUtils.QUANTITY_FORMATTER.format((float) qty / 1000000F) + "M"; return QUANTITY_FORMATTER.format((float) qty / 1000000F) + "M";
} else if (qty >= 1000) { } else if (qty >= 1000) {
return RSUtils.QUANTITY_FORMATTER.format((float) qty / 1000F) + "K"; return QUANTITY_FORMATTER.format((float) qty / 1000F) + "K";
} }
return String.valueOf(qty); return String.valueOf(qty);

2
src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
View File

@@ -157,7 +157,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
super.onContentsChanged(slot); super.onContentsChanged(slot);
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
RSUtils.constructFromDrive(getStackInSlot(slot), slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s)); RSUtils.createStorages(getStackInSlot(slot), slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s));
if (network != null) { if (network != null) {
network.getItemStorageCache().invalidate(); network.getItemStorageCache().invalidate();

4
src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
View File

@@ -77,7 +77,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
super.onContentsChanged(slot); super.onContentsChanged(slot);
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
RSUtils.constructFromDrive(getStackInSlot(slot), slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s)); RSUtils.createStorages(getStackInSlot(slot), slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s));
updateBlock(); updateBlock();
} }
@@ -103,7 +103,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
super.onContentsChanged(slot); super.onContentsChanged(slot);
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
RSUtils.constructFromDrive(getStackInSlot(slot), 3 + slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s)); RSUtils.createStorages(getStackInSlot(slot), 3 + slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s));
updateBlock(); updateBlock();
} }