I think recipes are actually done now

DaFuqs · Feb 3, 2025 · fe53ec0 · fe53ec0
1 parent e0f72ca
commit fe53ec0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/components/MemoryComponent.java b/src/main/java/de/dafuqs/spectrum/components/MemoryComponent.java
@@ -12,10 +12,10 @@ public record MemoryComponent(int ticksToManifest, boolean spawnAsAdult, boolean
 	public static final MemoryComponent DEFAULT = new MemoryComponent(-1, false, false, false);
 
 	public static final Codec<MemoryComponent> CODEC = RecordCodecBuilder.create(i -> i.group(
-		Codec.INT.fieldOf("ticks_to_manifest").forGetter(MemoryComponent::ticksToManifest),
-		Codec.BOOL.fieldOf("spawn_as_adult").forGetter(MemoryComponent::spawnAsAdult),
-		Codec.BOOL.fieldOf("broken_promise").forGetter(MemoryComponent::brokenPromise),
-		Codec.BOOL.fieldOf("unrecognizable").forGetter(MemoryComponent::unrecognizable)
+			Codec.INT.optionalFieldOf("ticks_to_manifest", -1).forGetter(MemoryComponent::ticksToManifest),
+			Codec.BOOL.optionalFieldOf("spawn_as_adult", false).forGetter(MemoryComponent::spawnAsAdult),
+			Codec.BOOL.optionalFieldOf("broken_promise", false).forGetter(MemoryComponent::brokenPromise),
+			Codec.BOOL.optionalFieldOf("unrecognizable", false).forGetter(MemoryComponent::unrecognizable)
 	).apply(i, MemoryComponent::new));
 
 	public static final PacketCodec<ByteBuf, MemoryComponent> PACKET_CODEC = PacketCodec.tuple(

diff --git a/src/main/java/de/dafuqs/spectrum/explosion/ModularExplosionDefinition.java b/src/main/java/de/dafuqs/spectrum/explosion/ModularExplosionDefinition.java
@@ -26,7 +26,7 @@ public class ModularExplosionDefinition {
 
 	public static final Codec<ModularExplosionDefinition> CODEC = RecordCodecBuilder.create(i -> i.group(
 			StringIdentifiable.createCodec(ExplosionArchetype::values).fieldOf("archetype").forGetter(c -> c.archetype),
-			SpectrumRegistries.EXPLOSION_MODIFIERS.getCodec().listOf().fieldOf("modifiers").forGetter(c -> c.modifiers)
+			SpectrumRegistries.EXPLOSION_MODIFIERS.getCodec().listOf().optionalFieldOf("modifiers", List.of()).forGetter(c -> c.modifiers)
 	).apply(i, ModularExplosionDefinition::new));
 
 	public static final PacketCodec<RegistryByteBuf, ModularExplosionDefinition> PACKET_CODEC = PacketCodec.tuple(

diff --git a/src/main/resources/data/spectrum/recipe/crystallarieum/vanilla/quartz.json b/src/main/resources/data/spectrum/recipe/crystallarieum/vanilla/quartz.json
@@ -7,13 +7,13 @@
   ],
   "growth_stage_states": [
     {
-      "Name": "spectrum:small_quarz_bud",
+      "Name": "spectrum:small_quartz_bud",
       "Properties": {
         "facing": "up"
       }
     },
     {
-      "Name": "spectrum:large_quarz_bud",
+      "Name": "spectrum:large_quartz_bud",
       "Properties": {
         "facing": "up"
       }

diff --git a/src/main/resources/data/spectrum/recipe/enchanter/vanilla_books/protection.json b/src/main/resources/data/spectrum/recipe/enchanter/vanilla_books/protection.json
@@ -14,7 +14,7 @@
       "item": "spectrum:pink_pigment"
     },
     {
-      "item": "minecraft:scute"
+      "item": "minecraft:turtle_scute"
     },
     {
       "item": "spectrum:bedrock_dust"
@@ -26,7 +26,7 @@
       "item": "spectrum:pink_pigment"
     },
     {
-      "item": "minecraft:scute"
+      "item": "minecraft:turtle_scute"
     },
     {
       "item": "spectrum:bedrock_dust"

diff --git a/...ources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json b/...ources/data/spectrum/recipe/mod_integration/ae2/crystallarieum/certus_quartz_crystal.json
@@ -5,19 +5,19 @@
   },
   "growth_stage_states": [
     {
-      "Name": "spectrum:small_certus_quarz_bud",
+      "Name": "spectrum:small_certus_quartz_bud",
       "Properties": {
         "facing": "up"
       }
     },
     {
-      "Name": "spectrum:large_certus_quarz_bud",
+      "Name": "spectrum:large_certus_quartz_bud",
       "Properties": {
         "facing": "up"
       }
     },
     {
-      "Name": "spectrum:certus_quarz_cluster",
+      "Name": "spectrum:certus_quartz_cluster",
       "Properties": {
         "facing": "up"
       }

diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/tools/lucky_pickaxe.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/tools/lucky_pickaxe.json
@@ -24,7 +24,7 @@
       "enchantments": {
         "minecraft:fortune": 3
       }
-    }
+    },
     "count": 1
   },
   "required_advancement": "spectrum:unlocks/equipment/lucky_pickaxe"

diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/vanilla/unstable_tnt.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/vanilla/unstable_tnt.json
@@ -23,7 +23,9 @@
       "block_state": {
         "unstable": "true"
       },
-      "lore": "{\"text\":\"unstable\"}"
+      "lore": [
+        "{\"text\":\"unstable\"}"
+      ]
     },
     "count": 2
   },