From 505445681f026b5afedc85f90aa2da2e51aef4df Mon Sep 17 00:00:00 2001 From: CreepyCre Date: Sat, 27 Mar 2021 13:25:28 +0100 Subject: [PATCH] riftDataMap -> dataMap --- .../dimdev/dimdoors/pockets/PocketLoader.java | 23 +++++++++---------- .../modifier/DimensionalDoorModifier.java | 2 +- .../pockets/modifier/RiftDataModifier.java | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java b/src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java index c8647864..6af05eb5 100644 --- a/src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java +++ b/src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java @@ -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 pocketGeneratorMap = new ConcurrentHashMap<>(); private Map pocketGroups = new ConcurrentHashMap<>(); private Map templates = new ConcurrentHashMap<>(); - private Map riftDataMap = new ConcurrentHashMap<>(); + private Map 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> futureRiftDataMap = loadResourcePathFromJsonToMap(manager, "pockets/json", t -> NbtUtil.asCompoundTag(t, "Could not load rift data since its json does not represent a CompoundTag!")); CompletableFuture> futurePocketGeneratorMap = loadResourcePathFromJsonToMap(manager, "pockets/generators", this::loadPocketGenerator); CompletableFuture> futurePocketGroups = loadResourcePathFromJsonToMap(manager, "pockets/groups", this::loadPocketGroup); CompletableFuture> 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) { diff --git a/src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java b/src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java index 43355af7..f21082fd 100644 --- a/src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java +++ b/src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java @@ -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"); diff --git a/src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java b/src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java index 66528796..dced7df6 100644 --- a/src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java +++ b/src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java @@ -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");