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

Revert "1.16 Save writing for data files (#2607)"

Browse Source 
This reverts commit 324199828d.
This commit is contained in:
raoulvdberge
2020-07-14 16:39:49 +02:00
parent 4efda40a4e
commit 74000f8552
23 changed files with 81 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java
View File

@@ -125,10 +125,11 @@ public interface IRSAPI {
IStorageDiskRegistry getStorageDiskRegistry();
/**
* @param anyWorld any world associated with the server
* @return the storage disk manager
*/
@Nonnull
IStorageDiskManager getStorageDiskManager();
IStorageDiskManager getStorageDiskManager(ServerWorld anyWorld);
/**
* @return the storage disk sync manager

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java
View File

@@ -39,12 +39,10 @@ import com.refinedmods.refinedstorage.apiimpl.util.Comparer;
import com.refinedmods.refinedstorage.apiimpl.util.FluidStackList;
import com.refinedmods.refinedstorage.apiimpl.util.ItemStackList;
import com.refinedmods.refinedstorage.apiimpl.util.QuantityFormatter;
import com.refinedmods.refinedstorage.util.SaveDataManager;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.INBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.ModList;
@@ -127,12 +125,12 @@ public class API implements IRSAPI {
@Override
public INetworkNodeManager getNetworkNodeManager(ServerWorld world) {
return SaveDataManager.INSTANCE.getManager(NetworkNodeManager.class, world.func_234923_W_());
return world.getSavedData().getOrCreate(() -> new NetworkNodeManager("network_nodes", world), "network_nodes");
}
@Override
public INetworkManager getNetworkManager(ServerWorld world) {
return SaveDataManager.INSTANCE.getManager(NetworkManager.class, world.func_234923_W_());
return world.getSavedData().getOrCreate(() -> new NetworkManager("networks", world), "networks");
}
@Override
@@ -191,8 +189,10 @@ public class API implements IRSAPI {
@Nonnull
@Override
public IStorageDiskManager getStorageDiskManager() {
return SaveDataManager.INSTANCE.getManager(StorageDiskManager.class, World.field_234918_g_);
public IStorageDiskManager getStorageDiskManager(ServerWorld anyWorld) {
ServerWorld world = anyWorld.getServer().func_241755_D_(); // Get the overworld
return world.getSavedData().getOrCreate(() -> new StorageDiskManager(StorageDiskManager.NAME, world), StorageDiskManager.NAME);
}
@Nonnull

35
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java
View File

@@ -3,13 +3,11 @@ package com.refinedmods.refinedstorage.apiimpl.network;
import com.refinedmods.refinedstorage.api.network.INetwork;
import com.refinedmods.refinedstorage.api.network.INetworkManager;
import com.refinedmods.refinedstorage.api.network.NetworkType;
import com.refinedmods.refinedstorage.util.ISaveData;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.RegistryKey;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.WorldSavedData;
import net.minecraftforge.common.util.Constants;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -18,7 +16,7 @@ import javax.annotation.Nullable;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
public class NetworkManager implements INetworkManager, ISaveData {
public class NetworkManager extends WorldSavedData implements INetworkManager {
public static final String NAME = "refinedstorage_networks";
private static final String NBT_NETWORKS = "Networks";
@@ -26,14 +24,20 @@ public class NetworkManager implements INetworkManager, ISaveData {
private static final String NBT_DATA = "Data";
private static final String NBT_POS = "Pos";
private boolean dirty;
private final World world;
private final Logger logger = LogManager.getLogger(getClass());
private final ConcurrentHashMap<BlockPos, INetwork> networks = new ConcurrentHashMap<>();
public NetworkManager(String name, World world) {
super(name);
this.world = world;
}
@Override
public void read(CompoundNBT tag, ServerWorld world) {
public void read(CompoundNBT tag) {
if (tag.contains(NBT_NETWORKS)) {
ListNBT networksTag = tag.getList(NBT_NETWORKS, Constants.NBT.TAG_COMPOUND);
@@ -60,12 +64,7 @@ public class NetworkManager implements INetworkManager, ISaveData {
}
@Override
public String getName() {
return NAME;
}
@Override
public void write(CompoundNBT tag) {
public CompoundNBT write(CompoundNBT tag) {
ListNBT list = new ListNBT();
for (INetwork network : all()) {
@@ -83,16 +82,8 @@ public class NetworkManager implements INetworkManager, ISaveData {
}
tag.put(NBT_NETWORKS, list);
}
@Override
public boolean isMarkedForSaving() {
return dirty;
}
@Override
public void markSaved() {
dirty = false;
return tag;
}
@Nullable
@@ -130,6 +121,6 @@ public class NetworkManager implements INetworkManager, ISaveData {
@Override
public void markForSaving() {
dirty = true;
markDirty();
}
}

36
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java
View File

@@ -4,12 +4,12 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
import com.refinedmods.refinedstorage.api.network.node.INetworkNodeFactory;
import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.util.ISaveData;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.storage.WorldSavedData;
import net.minecraftforge.common.util.Constants;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -18,7 +18,7 @@ import javax.annotation.Nullable;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
public class NetworkNodeManager implements INetworkNodeManager, ISaveData {
public class NetworkNodeManager extends WorldSavedData implements INetworkNodeManager {
public static final String NAME = "refinedstorage_nodes";
private static final String NBT_NODES = "Nodes";
@@ -26,14 +26,20 @@ public class NetworkNodeManager implements INetworkNodeManager, ISaveData {
private static final String NBT_NODE_DATA = "Data";
private static final String NBT_NODE_POS = "Pos";
private boolean dirty;
private final World world;
private final Logger logger = LogManager.getLogger(getClass());
private final ConcurrentHashMap<BlockPos, INetworkNode> nodes = new ConcurrentHashMap<>();
public NetworkNodeManager(String name, World world) {
super(name);
this.world = world;
}
@Override
public void read(CompoundNBT tag, ServerWorld world) {
public void read(CompoundNBT tag) {
if (tag.contains(NBT_NODES)) {
ListNBT nodesTag = tag.getList(NBT_NODES, Constants.NBT.TAG_COMPOUND);
@@ -68,22 +74,7 @@ public class NetworkNodeManager implements INetworkNodeManager, ISaveData {
}
@Override
public boolean isMarkedForSaving() {
return dirty;
}
@Override
public void markSaved() {
dirty = false;
}
@Override
public String getName() {
return NAME;
}
@Override
public void write(CompoundNBT tag) {
public CompoundNBT write(CompoundNBT tag) {
ListNBT list = new ListNBT();
for (INetworkNode node : all()) {
@@ -102,6 +93,7 @@ public class NetworkNodeManager implements INetworkNodeManager, ISaveData {
tag.put(NBT_NODES, list);
return tag;
}
@Nullable
@@ -139,6 +131,6 @@ public class NetworkNodeManager implements INetworkNodeManager, ISaveData {
@Override
public void markForSaving() {
dirty = true;
markDirty();
}
}

1
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java
View File

@@ -66,6 +66,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
.addListener((handler, slot, reading) -> {
if (!world.isRemote) {
StackUtils.createStorages(
(ServerWorld) world,
handler.getStackInSlot(slot),
slot,
itemDisks,

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java
View File

@@ -78,6 +78,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
.addListener((handler, slot, reading) -> {
if (!world.isRemote) {
StackUtils.createStorages(
(ServerWorld) world,
handler.getStackInSlot(slot),
slot,
itemDisks,
@@ -98,6 +99,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
.addListener(((handler, slot, reading) -> {
if (!world.isRemote) {
StackUtils.createStorages(
(ServerWorld) world,
handler.getStackInSlot(slot),
3 + slot,
itemDisks,

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java
View File

@@ -139,11 +139,11 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre
}
public void loadStorage() {
IStorageDisk disk = API.instance().getStorageDiskManager().get(storageId);
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).get(storageId);
if (disk == null) {
API.instance().getStorageDiskManager().set(storageId, disk = API.instance().createDefaultFluidDisk((ServerWorld) world, type.getCapacity()));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).set(storageId, disk = API.instance().createDefaultFluidDisk((ServerWorld) world, type.getCapacity()));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
}
this.storage = new FluidStorageWrapperStorageDisk(this, disk);

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java
View File

@@ -139,11 +139,11 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I
}
public void loadStorage() {
IStorageDisk disk = API.instance().getStorageDiskManager().get(storageId);
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).get(storageId);
if (disk == null) {
API.instance().getStorageDiskManager().set(storageId, disk = API.instance().createDefaultItemDisk((ServerWorld) world, type.getCapacity()));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).set(storageId, disk = API.instance().createDefaultItemDisk((ServerWorld) world, type.getCapacity()));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
}
this.storage = new ItemStorageWrapperStorageDisk(this, disk);

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java
View File

@@ -203,7 +203,7 @@ public class FluidStorageDisk implements IStorageDisk<FluidStack> {
}
if (world != null) {
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager(world).markForSaving();
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java
View File

@@ -204,7 +204,7 @@ public class ItemStorageDisk implements IStorageDisk<ItemStack> {
}
if (world != null) {
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager(world).markForSaving();
}
}
}

36
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java
View File

@@ -5,12 +5,12 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.util.ISaveData;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.WorldSavedData;
import net.minecraftforge.common.util.Constants;
import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class StorageDiskManager implements IStorageDiskManager, ISaveData {
public class StorageDiskManager extends WorldSavedData implements IStorageDiskManager {
public static final String NAME = "refinedstorage_disks";
private static final String NBT_DISKS = "Disks";
@@ -27,9 +27,13 @@ public class StorageDiskManager implements IStorageDiskManager, ISaveData {
private static final String NBT_DISK_DATA = "Data";
private final Map<UUID, IStorageDisk> disks = new HashMap<>();
private final ServerWorld world;
private boolean dirty;
public StorageDiskManager(String name, ServerWorld world) {
super(name);
this.world = world;
}
@Override
@Nullable
@@ -86,13 +90,13 @@ public class StorageDiskManager implements IStorageDiskManager, ISaveData {
@Override
public void markForSaving() {
dirty = true;
markDirty();
}
@Override
public void read(CompoundNBT nbt, ServerWorld world) {
if (nbt.contains(NBT_DISKS)) {
ListNBT disksTag = nbt.getList(NBT_DISKS, Constants.NBT.TAG_COMPOUND);
public void read(CompoundNBT tag) {
if (tag.contains(NBT_DISKS)) {
ListNBT disksTag = tag.getList(NBT_DISKS, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < disksTag.size(); ++i) {
CompoundNBT diskTag = disksTag.getCompound(i);
@@ -110,7 +114,7 @@ public class StorageDiskManager implements IStorageDiskManager, ISaveData {
}
@Override
public void write(CompoundNBT nbt) {
public CompoundNBT write(CompoundNBT tag) {
ListNBT disks = new ListNBT();
for (Map.Entry<UUID, IStorageDisk> entry : this.disks.entrySet()) {
@@ -122,21 +126,9 @@ public class StorageDiskManager implements IStorageDiskManager, ISaveData {
disks.add(diskTag);
}
nbt.put(NBT_DISKS, disks);
}
@Override
public String getName() {
return NAME;
}
tag.put(NBT_DISKS, disks);
@Override
public boolean isMarkedForSaving() {
return dirty;
}
@Override
public void markSaved() {
dirty = false;
return tag;
}
}

10
src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java
View File

@@ -49,8 +49,8 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider {
if (!world.isRemote && !stack.hasTag()) {
UUID id = UUID.randomUUID();
API.instance().getStorageDiskManager().set(id, API.instance().createDefaultFluidDisk((ServerWorld) world, getCapacity(stack)));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).set(id, API.instance().createDefaultFluidDisk((ServerWorld) world, getCapacity(stack)));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
setId(stack, id);
}
@@ -85,7 +85,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider {
ItemStack diskStack = player.getHeldItem(hand);
if (!world.isRemote && player.isCrouching() && type != FluidStorageType.CREATIVE) {
IStorageDisk disk = API.instance().getStorageDiskManager().getByStack(diskStack);
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack);
if (disk != null && disk.getStored() == 0) {
ItemStack storagePart = new ItemStack(FluidStoragePartItem.getByType(type), diskStack.getCount());
@@ -94,8 +94,8 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider {
InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart);
}
API.instance().getStorageDiskManager().remove(getId(diskStack));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).remove(getId(diskStack));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING));
}

10
src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java
View File

@@ -49,8 +49,8 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider {
if (!world.isRemote && !stack.hasTag()) {
UUID id = UUID.randomUUID();
API.instance().getStorageDiskManager().set(id, API.instance().createDefaultItemDisk((ServerWorld) world, getCapacity(stack)));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).set(id, API.instance().createDefaultItemDisk((ServerWorld) world, getCapacity(stack)));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
setId(stack, id);
}
@@ -85,7 +85,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider {
ItemStack diskStack = player.getHeldItem(hand);
if (!world.isRemote && player.isCrouching() && type != ItemStorageType.CREATIVE) {
IStorageDisk disk = API.instance().getStorageDiskManager().getByStack(diskStack);
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack);
if (disk != null && disk.getStored() == 0) {
ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type), diskStack.getCount());
@@ -94,8 +94,8 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider {
InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart);
}
API.instance().getStorageDiskManager().remove(getId(diskStack));
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).remove(getId(diskStack));
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING));
}

6
src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java
View File

@@ -75,7 +75,7 @@ public class FluidStorageBlockItem extends BaseBlockItem {
if (isValid(storageStack)) {
diskId = getId(storageStack);
disk = API.instance().getStorageDiskManager().get(diskId);
disk = API.instance().getStorageDiskManager((ServerWorld) world).get(diskId);
}
// Newly created fluid storages won't have a tag yet, so allow invalid disks as well.
@@ -99,8 +99,8 @@ public class FluidStorageBlockItem extends BaseBlockItem {
}
if (disk != null) {
API.instance().getStorageDiskManager().remove(diskId);
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).remove(diskId);
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
}
return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING));

6
src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java
View File

@@ -73,7 +73,7 @@ public class StorageBlockItem extends BaseBlockItem {
if (isValid(storageStack)) {
diskId = getId(storageStack);
disk = API.instance().getStorageDiskManager().get(diskId);
disk = API.instance().getStorageDiskManager((ServerWorld) world).get(diskId);
}
// Newly created storages won't have a tag yet, so allow invalid disks as well.
@@ -85,8 +85,8 @@ public class StorageBlockItem extends BaseBlockItem {
}
if (disk != null) {
API.instance().getStorageDiskManager().remove(diskId);
API.instance().getStorageDiskManager().markForSaving();
API.instance().getStorageDiskManager((ServerWorld) world).remove(diskId);
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
}
return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING));

2
src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java
View File

@@ -26,7 +26,7 @@ public class StorageDiskSizeRequestMessage {
public static void handle(StorageDiskSizeRequestMessage message, Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
IStorageDisk disk = API.instance().getStorageDiskManager().get(message.id);
IStorageDisk disk = API.instance().getStorageDiskManager(ctx.get().getSender().getServerWorld()).get(message.id);
if (disk != null) {
RS.NETWORK_HANDLER.sendTo(ctx.get().getSender(), new StorageDiskSizeResponseMessage(message.id, disk.getStored(), disk.getCapacity()));

11
src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java
View File

@@ -16,9 +16,7 @@ import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.FluidCrafting
import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ItemCraftingPreviewElement;
import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.CraftingTaskFactory;
import com.refinedmods.refinedstorage.apiimpl.network.NetworkListener;
import com.refinedmods.refinedstorage.apiimpl.network.NetworkManager;
import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeListener;
import com.refinedmods.refinedstorage.apiimpl.network.NetworkNodeManager;
import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.*;
import com.refinedmods.refinedstorage.apiimpl.network.node.*;
import com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode;
@@ -27,7 +25,6 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageN
import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType;
import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType;
import com.refinedmods.refinedstorage.apiimpl.storage.disk.StorageDiskManager;
import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageDiskFactory;
import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory;
import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorageProvider;
@@ -47,7 +44,6 @@ import com.refinedmods.refinedstorage.tile.data.TileDataManager;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.SaveDataManager;
import net.minecraft.block.Block;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.Item;
@@ -55,8 +51,6 @@ import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.RegistryKey;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.extensions.IForgeContainerType;
import net.minecraftforge.event.RegistryEvent;
@@ -143,11 +137,6 @@ public class CommonSetup {
if (InventorySorterIntegration.isLoaded()) {
InventorySorterIntegration.register();
}
//The StorageDiskManager needs to be loaded before the Network!
SaveDataManager.INSTANCE.registerManager(StorageDiskManager.class, StorageDiskManager::new);
SaveDataManager.INSTANCE.registerManager(NetworkNodeManager.class, NetworkNodeManager::new);
SaveDataManager.INSTANCE.registerManager(NetworkManager.class, NetworkManager::new);
}
private INetworkNode readAndReturn(CompoundNBT tag, NetworkNode node) {

27
src/main/java/com/refinedmods/refinedstorage/setup/ServerSetup.java
View File

@@ -1,11 +1,7 @@
package com.refinedmods.refinedstorage.setup;
import com.refinedmods.refinedstorage.command.PatternDumpCommand;
import com.refinedmods.refinedstorage.util.SaveDataManager;
import net.minecraft.command.Commands;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
@@ -17,27 +13,4 @@ public class ServerSetup {
.then(PatternDumpCommand.register(e.getCommandDispatcher()))
);
}
@SubscribeEvent
public void onWorldSave(WorldEvent.Save e) {
if (!e.getWorld().isRemote()) {
SaveDataManager.INSTANCE.save((ServerWorld) e.getWorld());
}
}
@SubscribeEvent
public void onWorldLoad(WorldEvent.Load e) {
if (!e.getWorld().isRemote()) {
SaveDataManager.INSTANCE.read((ServerWorld) e.getWorld());
}
}
@SubscribeEvent
public void onWorldUnload(WorldEvent.Unload e) {
//Overworld is the only dimension that only gets unloaded when the save game is switched
//Other dimensions may get unloaded at any point
if (!e.getWorld().isRemote()) {
SaveDataManager.INSTANCE.removeManagers((ServerWorld) e.getWorld());
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java
View File

@@ -107,7 +107,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
storage = null;
cache = null;
} else {
IStorageDisk disk = API.instance().getStorageDiskManager().getByStack(getDisk().getStackInSlot(0));
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) player.world).getByStack(getDisk().getStackInSlot(0));
if (disk != null) {
StorageType type = ((IStorageDiskProvider) getDisk().getStackInSlot(0).getItem()).getType();

2
src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
View File

@@ -190,7 +190,7 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid,
this.storage = null;
this.cache = null;
} else {
IStorageDisk disk = API.instance().getStorageDiskManager().getByStack(getDisk().getStackInSlot(0));
IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(getDisk().getStackInSlot(0));
if (disk != null) {
StorageType type = ((IStorageDiskProvider) getDisk().getStackInSlot(0).getItem()).getType();

36
src/main/java/com/refinedmods/refinedstorage/util/ISaveData.java
View File

@@ -1,36 +0,0 @@
package com.refinedmods.refinedstorage.util;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.RegistryKey;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
public interface ISaveData {
/**
* @return file name
*/
String getName();
/**
* @param nbt tag to write data to
*/
void write(CompoundNBT nbt);
/**
* @param nbt tag to read data from
* @param world that the data is being loaded for
*/
void read(CompoundNBT nbt, ServerWorld world);
/**
* Does this file need to be saved?
*
* @return isDirty
*/
boolean isMarkedForSaving();
/**
* mark file as not in need of saving
*/
void markSaved();
}

129
src/main/java/com/refinedmods/refinedstorage/util/SaveDataManager.java
View File

@@ -1,129 +0,0 @@
package com.refinedmods.refinedstorage.util;
import com.refinedmods.refinedstorage.apiimpl.storage.disk.StorageDiskManager;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.util.RegistryKey;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.FolderName;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Supplier;
public class SaveDataManager {
public static final SaveDataManager INSTANCE = new SaveDataManager();
private static final Logger LOGGER = LogManager.getLogger(SaveDataManager.class);
private final Map<RegistryKey<World>, Map<Class<?>, ISaveData>> worldSaveData = new HashMap<>();
private final LinkedHashMap<Class<?>, Supplier<ISaveData>> managerTypes = new LinkedHashMap<>();
public void registerManager(Class<?> clazz, Supplier<ISaveData> supplier) {
managerTypes.put(clazz, supplier);
}
private void createManagers(RegistryKey<World> worldKey) {
Map<Class<?>, ISaveData> map = new LinkedHashMap<>();
managerTypes.forEach((clazz, supplier) -> {
if (clazz == StorageDiskManager.class) {
if (worldKey == World.field_234918_g_) {
map.put(clazz, supplier.get());
}
} else {
map.put(clazz, supplier.get());
}
});
worldSaveData.put(worldKey, map);
}
public <T extends ISaveData> T getManager(Class<T> clazz, RegistryKey<World> worldKey) {
return clazz.cast(worldSaveData.get(worldKey).get(clazz));
}
public void removeManagers(ServerWorld world) {
worldSaveData.remove(world.func_234923_W_());
}
public void read(ServerWorld world) {
RegistryKey<World> worldKey = world.func_234923_W_();
if (!worldSaveData.containsKey(worldKey)) {
createManagers(worldKey);
}
for (ISaveData saveData : worldSaveData.get(worldKey).values()) {
CompoundNBT nbt = readTagFromFile(world, saveData.getName());
saveData.read(nbt, world);
}
}
public void save(ServerWorld world) {
for (ISaveData saveData : worldSaveData.get(world.func_234923_W_()).values()) {
if (saveData.isMarkedForSaving()) {
CompoundNBT nbt = new CompoundNBT();
saveData.write(nbt);
try {
writeTagToFile(world, saveData.getName(), nbt);
} catch (IOException e) {
LOGGER.error("Unable to save " + saveData.getName(), e);
}
}
saveData.markSaved();
}
}
private void writeTagToFile(ServerWorld world, String fileName, CompoundNBT nbt) throws IOException {
String dataDirectory = world.getServer().func_240776_a_(new FolderName("data")).toString();
File backupFile = new File(dataDirectory, fileName + "_backup.dat");
File file = new File(dataDirectory, fileName + ".dat");
if (backupFile.exists()) {
backupFile.delete();
}
CompressedStreamTools.writeCompressed(nbt, new FileOutputStream(backupFile));
if (file.exists()) {
if (!file.delete()) {
throw new IOException("Cannot delete " + file.getAbsolutePath() + " aborting");
}
}
backupFile.renameTo(file);
}
private CompoundNBT readTagFromFile(ServerWorld world, String fileName) {
String dataDirectory = world.getServer().func_240776_a_(new FolderName("data")).toString();
File backupFile = new File(dataDirectory, fileName + "_backup.dat");
File file = new File(dataDirectory, fileName + ".dat");
CompoundNBT nbt = null;
if (file.exists()) {
try {
nbt = CompressedStreamTools.readCompressed(new FileInputStream(file));
} catch (IOException e) {
LOGGER.warn("Unable to read " + fileName, e);
}
}
if (nbt == null && backupFile.exists()) {
LOGGER.warn("Unable to read " + fileName + ", trying backup file");
try {
nbt = CompressedStreamTools.readCompressed(new FileInputStream(backupFile));
} catch (IOException e) {
LOGGER.warn("Unable to read " + fileName + "'s backup. Continuing without data", e);
}
}
if (nbt == null) {// no file exists yet
return new CompoundNBT();
}
return nbt;
}
}

4
src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java
View File

@@ -161,12 +161,12 @@ public final class StackUtils {
}
@SuppressWarnings("unchecked")
public static void createStorages(ItemStack diskStack, int slot, IStorageDisk<ItemStack>[] itemDisks, IStorageDisk<FluidStack>[] fluidDisks, Function<IStorageDisk<ItemStack>, IStorageDisk> itemDiskWrapper, Function<IStorageDisk<FluidStack>, IStorageDisk> fluidDiskWrapper) {
public static void createStorages(ServerWorld world, ItemStack diskStack, int slot, IStorageDisk<ItemStack>[] itemDisks, IStorageDisk<FluidStack>[] fluidDisks, Function<IStorageDisk<ItemStack>, IStorageDisk> itemDiskWrapper, Function<IStorageDisk<FluidStack>, IStorageDisk> fluidDiskWrapper) {
if (diskStack.isEmpty()) {
itemDisks[slot] = null;
fluidDisks[slot] = null;
} else {
IStorageDisk disk = API.instance().getStorageDiskManager().getByStack(diskStack);
IStorageDisk disk = API.instance().getStorageDiskManager(world).getByStack(diskStack);
if (disk != null) {
switch (((IStorageDiskProvider) diskStack.getItem()).getType()) {