Automatically migrate pre-InkColor registry InkStorages (#619)

Signed-off-by: unilock <unilock@fennet.rentals>
DaFuqs · Dec 2, 2024 · 31fe916 · 31fe916
1 parent c453b36
commit 31fe916
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/InkStorage.java b/src/main/java/de/dafuqs/spectrum/api/energy/InkStorage.java
@@ -1,7 +1,6 @@
 package de.dafuqs.spectrum.api.energy;
 
 import de.dafuqs.spectrum.api.energy.color.*;
-import de.dafuqs.spectrum.registries.*;
 import net.minecraft.nbt.*;
 import net.minecraft.text.*;
 import net.minecraft.util.*;
@@ -165,9 +164,11 @@ default float getTotalFillPercent() {
 		Map<InkColor, Long> energy = new HashMap<>();
 		if (compound != null) {
 			for (String key : compound.getKeys()) {
-				InkColor inkColor = SpectrumRegistries.INK_COLORS.get(new Identifier(key));
-				long amount = compound.getLong(key);
-				energy.put(inkColor, amount);
+				Optional<InkColor> color = InkColor.ofIdString(key);
+				if (color.isPresent()) {
+					long amount = compound.getLong(key);
+					energy.put(color.get(), amount);
+				}
 			}
 		}
 		return energy;

diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/color/InkColor.java b/src/main/java/de/dafuqs/spectrum/api/energy/color/InkColor.java
@@ -1,5 +1,6 @@
 package de.dafuqs.spectrum.api.energy.color;
 
+import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.helpers.*;
 import de.dafuqs.spectrum.registries.*;
 import net.minecraft.registry.tag.*;
@@ -46,7 +47,12 @@ public static Optional<InkColor> ofId(Identifier id) {
 	}
 
 	public static Optional<InkColor> ofIdString(String idString) {
-		return SpectrumRegistries.INK_COLORS.getOrEmpty(new Identifier(idString));
+		try {
+			Identifier id = new Identifier(idString);
+			return SpectrumRegistries.INK_COLORS.getOrEmpty(id).or(() -> SpectrumRegistries.INK_COLORS.getOrEmpty(SpectrumCommon.locate(idString)));
+		} catch (InvalidIdentifierException ignored) {
+			return Optional.empty();
+		}
 	}
 
 	public DyeColor getDyeColor() {

diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/storage/IndividualCappedInkStorage.java b/src/main/java/de/dafuqs/spectrum/api/energy/storage/IndividualCappedInkStorage.java
@@ -130,7 +130,7 @@ public boolean isFull() {
 
 	public static IndividualCappedInkStorage fromNbt(@NotNull NbtCompound compound) {
 		long maxEnergyPerColor = compound.getLong("MaxEnergyPerColor");
-		Map<InkColor, Long> colors = InkStorage.readEnergy(compound.getCompound("Energy"));
+		Map<InkColor, Long> colors = InkStorage.readEnergy(compound.contains("Energy") ? compound.getCompound("Energy") : compound);
 		return new IndividualCappedInkStorage(maxEnergyPerColor, colors);
 	}
 

diff --git a/...main/java/de/dafuqs/spectrum/api/energy/storage/TotalCappedElementalMixingInkStorage.java b/...main/java/de/dafuqs/spectrum/api/energy/storage/TotalCappedElementalMixingInkStorage.java
@@ -132,7 +132,7 @@ public NbtCompound toNbt() {
 
 	public static TotalCappedElementalMixingInkStorage fromNbt(@NotNull NbtCompound compound) {
 		long maxEnergyTotal = compound.getLong("MaxEnergyTotal");
-		Map<InkColor, Long> energy = InkStorage.readEnergy(compound.getCompound("Energy"));
+		Map<InkColor, Long> energy = InkStorage.readEnergy(compound.contains("Energy") ? compound.getCompound("Energy") : compound);
 		return new TotalCappedElementalMixingInkStorage(maxEnergyTotal, energy);
 	}
 

diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/storage/TotalCappedInkStorage.java b/src/main/java/de/dafuqs/spectrum/api/energy/storage/TotalCappedInkStorage.java
@@ -116,7 +116,7 @@ public NbtCompound toNbt() {
 
 	public static TotalCappedInkStorage fromNbt(@NotNull NbtCompound compound) {
 		long maxEnergyTotal = compound.getLong("MaxEnergyTotal");
-		Map<InkColor, Long> colors = InkStorage.readEnergy(compound.getCompound("Energy"));
+		Map<InkColor, Long> colors = InkStorage.readEnergy(compound.contains("Energy") ? compound.getCompound("Energy") : compound);
 		return new TotalCappedInkStorage(maxEnergyTotal, colors);
 	}