From 18fffef06a487f0e2fe9a3fcb952abf623c7e0d8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 29 Dec 2021 17:53:08 +0200 Subject: [PATCH] Change the empty key for spells to "none" --- .../ability/magic/spell/crafting/TraitRequirementRecipe.java | 3 +++ .../unicopia/ability/magic/spell/effect/SpellType.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/TraitRequirementRecipe.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/TraitRequirementRecipe.java index 1e2edf1f..0f503fe8 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/TraitRequirementRecipe.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/TraitRequirementRecipe.java @@ -15,6 +15,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.world.World; +/** + * Recipe that requires an item and a certain number of traits to produce a result. + */ public class TraitRequirementRecipe implements SpellbookRecipe { private final Identifier id; private final IngredientWithSpell requirement; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/SpellType.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/SpellType.java index fa1c4120..ed11b3a9 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/SpellType.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/SpellType.java @@ -33,7 +33,7 @@ import net.minecraft.util.Util; import net.minecraft.util.registry.Registry; public final class SpellType implements Affine, SpellPredicate { - public static final Identifier EMPTY_ID = new Identifier("unicopia", "null"); + public static final Identifier EMPTY_ID = new Identifier("unicopia", "none"); public static final SpellType EMPTY_KEY = new SpellType<>(EMPTY_ID, Affinity.NEUTRAL, 0xFFFFFF, false, SpellTraits.EMPTY, (t, c) -> null); private static final Registry> REGISTRY = Registries.createSimple(new Identifier("unicopia", "spells"));