Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

riftDataMap -> dataMap

Browse source
This commit is contained in:
CreepyCre 2021-03-27 13:25:28 +01:00
parent 36fb8f3641
commit 505445681f
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java
View file

@ -2,10 +2,6 @@ package org.dimdev.dimdoors.pockets;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@ -16,7 +12,6 @@ import com.google.gson.*;
import com.mojang.serialization.JsonOps;
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
import net.fabricmc.fabric.api.util.NbtType;
import net.minecraft.nbt.*;
import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier;
@ -24,7 +19,6 @@ import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.api.util.NbtUtil;
import org.dimdev.dimdoors.block.entity.RiftData;
import org.dimdev.dimdoors.pockets.generator.PocketGenerator;
import org.dimdev.dimdoors.pockets.virtual.VirtualPocket;
import org.dimdev.dimdoors.api.util.WeightedList;
@ -37,7 +31,7 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
private Map<Identifier, PocketGenerator> pocketGeneratorMap = new ConcurrentHashMap<>();
private Map<Identifier, VirtualPocket> pocketGroups = new ConcurrentHashMap<>();
private Map<Identifier, PocketTemplate> templates = new ConcurrentHashMap<>();
private Map<Identifier, CompoundTag> riftDataMap = new ConcurrentHashMap<>();
private Map<Identifier, Tag> dataMap = new ConcurrentHashMap<>();
private PocketLoader() {
}
@ -47,14 +41,15 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
pocketGeneratorMap.clear();
pocketGroups.clear();
templates.clear();
riftDataMap.clear();
dataMap.clear();
dataMap = loadResourcePathFromJsonToMap(manager, "pockets/json", t -> t).join();
CompletableFuture<Map<Identifier, CompoundTag>> futureRiftDataMap = loadResourcePathFromJsonToMap(manager, "pockets/json", t -> NbtUtil.asCompoundTag(t, "Could not load rift data since its json does not represent a CompoundTag!"));
CompletableFuture<Map<Identifier, PocketGenerator>> futurePocketGeneratorMap = loadResourcePathFromJsonToMap(manager, "pockets/generators", this::loadPocketGenerator);
CompletableFuture<Map<Identifier, VirtualPocket>> futurePocketGroups = loadResourcePathFromJsonToMap(manager, "pockets/groups", this::loadPocketGroup);
CompletableFuture<Map<Identifier, PocketTemplate>> futureTemplates = loadResourcePathFromCompressedNbtToMap(manager, "pockets/schematic", ".schem", this::loadPocketTemplate);
riftDataMap = futureRiftDataMap.join();
pocketGeneratorMap = futurePocketGeneratorMap.join();
pocketGroups = futurePocketGroups.join();
templates = futureTemplates.join();
@ -114,8 +109,12 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
// }
// }
public Tag getRiftDataTag(String id) {
return this.riftDataMap.get(new Identifier(id));
public Tag getDataTag(String id) {
return this.dataMap.get(new Identifier(id));
}
public CompoundTag getDataCompoundTag(String id) {
return NbtUtil.asCompoundTag(getDataTag(id), "Could not convert Tag \"" + id + "\" to CompoundTag!");
}
private VirtualPocket loadPocketGroup(Tag tag) {

2
src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java
View file

@ -66,7 +66,7 @@ public class DimensionalDoorModifier implements LazyCompatibleModifier {
if (tag.getType("rift_data") == NbtType.STRING) {
doorDataReference = tag.getString("rift_data");
doorData = (CompoundTag) PocketLoader.getInstance().getRiftDataTag(doorDataReference);
doorData = PocketLoader.getInstance().getDataCompoundTag(doorDataReference);
}
else if (tag.getType("rift_data") == NbtType.COMPOUND) doorData = tag.getCompound("rift_data");

2
src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java
View file

@ -32,7 +32,7 @@ public class RiftDataModifier implements Modifier {
public Modifier fromTag(CompoundTag tag) {
if (tag.getType("rift_data") == NbtType.STRING) {
doorDataReference = tag.getString("rift_data");
doorData = (CompoundTag) PocketLoader.getInstance().getRiftDataTag(doorDataReference);
doorData = PocketLoader.getInstance().getDataCompoundTag(doorDataReference);
}
else if (tag.getType("rift_data") == NbtType.COMPOUND) doorData = tag.getCompound("rift_data");