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

Complete PR for #1730. Fixes #1730

Browse Source
This commit is contained in:
raoulvdberge
2018-06-26 19:15:29 +02:00
parent 06a762022c
commit d9ccd97871
4 changed files with 29 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -24,6 +24,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S
- Fixed bug where External Storage could only handle 1 fluid inventory per block (raoulvdberge)
- Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
- Added a missing config option for Crafter Manager energy usage (raoulvdberge)
- Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)
- If an Interface is configured to expose the entire network storage (by configuring no export slots), it will no longer expose the entire RS storage, due to performance issues (raoulvdberge)
- The Portable Grid no longer exposes a inventory for crossmod interaction, due to performance issues (raoulvdberge)
- The Crafting Monitor is now resizable and its size can be configured (stretched, small, medium, large) (raoulvdberge)

9
src/main/java/com/raoulvdberge/refinedstorage/api/storage/disk/IStorageDiskManager.java
View File

@@ -19,15 +19,6 @@ public interface IStorageDiskManager {
@Nullable
IStorageDisk get(UUID id);
/**
* Gets the UUID of the given Storage Disk
*
* @param disk the storage disk
* @return the storage disk's UUID, or null if no UUID is found
*/
@Nullable
UUID getUuid(IStorageDisk disk);
/**
* Gets a storage disk by disk stack (a {@link IStorageDiskProvider}).
*

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java
View File

@@ -40,12 +40,6 @@ public class StorageDiskManager extends WorldSavedData implements IStorageDiskMa
return disks.get(id);
}
@Nullable
public UUID getUuid(IStorageDisk disk) {
// Return random UUID for now
return UUID.randomUUID();
}
@Nullable
@Override
public IStorageDisk getByStack(ItemStack disk) {

62
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
View File

@@ -6,12 +6,8 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.storage.IStorage;
import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskManager;
import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskRegistry;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.StorageDiskItemDriveWrapper;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskManager;
import li.cil.oc.api.Network;
import li.cil.oc.api.machine.Arguments;
import li.cil.oc.api.machine.Callback;
@@ -19,7 +15,6 @@ import li.cil.oc.api.machine.Context;
import li.cil.oc.api.network.Visibility;
import li.cil.oc.api.prefab.AbstractManagedEnvironment;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.FluidRegistry;
@@ -334,50 +329,49 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
return new Object[]{node.getNetwork().getItemStorageCache().getList().getStacks()};
}
@Callback(doc = "function():table -- Gets a list of all connected Storage Disks / Blocks in this network.")
public Object[] getStorage(final Context context, final Arguments args) {
@Callback(doc = "function():table -- Gets a list of all connected storage disks and blocks in this network.")
public Object[] getStorages(final Context context, final Arguments args) {
int totalItemStored = 0;
int totalItemCapacity = 0;
int totalFluidStored = 0;
int totalFluidCapacity = 0;
HashMap<String, HashMap<String, Object>> devices = new HashMap<String, HashMap<String, Object>>();
List<HashMap<String, Object>> devices = new ArrayList<>();
IStorageDiskManager sdm = API.instance().getStorageDiskManager(node.getWorld());
if (node.getNetwork() != null) {
for (IStorage s : node.getNetwork().getItemStorageCache().getStorages()) {
if (s instanceof IStorageDisk) {
IStorageDisk disk = (IStorageDisk) s;
for (IStorage s : node.getNetwork().getItemStorageCache().getStorages()) {
if (s instanceof IStorageDisk) {
IStorageDisk sd = (IStorageDisk) s;
String id = sd.getId();
HashMap<String, Object> data = new HashMap();
HashMap<String, Object> data = new HashMap<>();
data.put("type", "item");
data.put("usage", sd.getStored());
data.put("capacity", sd.getCapacity());
data.put("type", "item");
data.put("usage", disk.getStored());
data.put("capacity", disk.getCapacity());
totalItemStored += sd.getStored();
totalItemCapacity += sd.getCapacity();
totalItemStored += disk.getStored();
totalItemCapacity += disk.getCapacity();
UUID uuid = sdm.getUuid(sd);
devices.put(uuid.toString(), data);
devices.add(data);
}
}
}
for (IStorage s : node.getNetwork().getFluidStorageCache().getStorages()) {
if (s instanceof IStorageDisk) {
IStorageDisk sd = (IStorageDisk) s;
String id = sd.getId();
HashMap<String, Object> data = new HashMap();
for (IStorage s : node.getNetwork().getFluidStorageCache().getStorages()) {
if (s instanceof IStorageDisk) {
IStorageDisk disk = (IStorageDisk) s;
data.put("type", "fluid");
data.put("usage", sd.getStored());
data.put("capacity", sd.getCapacity());
HashMap<String, Object> data = new HashMap<>();
totalFluidStored += sd.getStored();
totalFluidCapacity += sd.getCapacity();
data.put("type", "fluid");
data.put("usage", disk.getStored());
data.put("capacity", disk.getCapacity());
UUID uuid = sdm.getUuid(sd);
devices.put(uuid.toString(), data);
totalFluidStored += disk.getStored();
totalFluidCapacity += disk.getCapacity();
devices.add(data);
}
}
}