Unfortunately disable the Curry dex for now due to issues with serialization and deserialization for 1.0.0. Rework in 1.6.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.java

@@ -144,7 +144,7 @@ public static void init(GenerationsImplementation implementation) {
 		PlayerDataExtensionRegistry.INSTANCE.register(AccountInfo.KEY, AccountInfo.class, false);
 		PlayerDataExtensionRegistry.INSTANCE.register(Caught.KEY, Caught.class, false);
 		PlayerDataExtensionRegistry.INSTANCE.register(BiomesVisited.KEY, BiomesVisited.class, false);
-		PlayerDataExtensionRegistry.INSTANCE.register(CurryDex.KEY, CurryDex.class, false);
+//		PlayerDataExtensionRegistry.INSTANCE.register(CurryDex.KEY, CurryDex.class, false);
 
 		GenerationsMolangFunctions.init();
 

common/src/main/java/generations/gg/generations/core/generationscore/common/api/events/CurryEvents.java

@@ -4,12 +4,18 @@
 import dev.architectury.event.Event;
 import dev.architectury.event.EventActor;
 import dev.architectury.event.EventFactory;
+import dev.architectury.event.EventResult;
 import generations.gg.generations.core.generationscore.common.api.player.CurryDex;
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryData;
+import generations.gg.generations.core.generationscore.common.world.item.curry.CurryTasteRating;
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryType;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.function.Function;
 
 public class  CurryEvents {
     public static final Event<EventActor<Cook>> COOK = EventFactory.createEventActorLoop();
@@ -43,6 +49,15 @@ public void setOutput(CurryData output) {
         }
     }
 
+    public static final Event<ModifyRating> MODIFY_RATING = EventFactory.of(eventActors -> (original, player, data) -> {
+        CurryTasteRating rating = null;
+
+        for (var actor : eventActors) {
+            rating = actor.modifyRating(original, player, data);
+        }
+
+        return rating != null ? rating : original;
+    });
 
     public static final Event<EventActor<AddEntry>> ADD_ENTRY = EventFactory.createEventActorLoop();
     public static class AddEntry {
@@ -72,4 +87,8 @@ public ServerPlayer getPlayer() {
             return player;
         }
     }
+
+    public static interface ModifyRating {
+        public @Nullable CurryTasteRating modifyRating(@NotNull CurryTasteRating original, @NotNull ServerPlayer player, @NotNull CurryData data);
+    }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/api/player/CurryDex.kt

@@ -126,7 +126,7 @@ class CurryDex @JvmOverloads constructor(var entries: MutableList<CurryDexEntry>
         }
 
         private val comparator: Comparator<CurryDexEntry> =
-            Comparator.comparingInt { a: CurryDexEntry -> a.type!!.ordinal }
+            Comparator.comparingInt { a: CurryDexEntry -> a.type.ordinal }
                 .thenComparingInt { a: CurryDexEntry -> a.flavor!!.ordinal }
 
         fun of(player: ServerPlayer): CurryDex {

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/curry/ItemCurry.kt

@@ -6,6 +6,7 @@ import com.cobblemon.mod.common.api.text.plus
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import generations.gg.generations.core.generationscore.common.GenerationsCore
+import generations.gg.generations.core.generationscore.common.api.events.CurryEvents
 import generations.gg.generations.core.generationscore.common.api.player.CurryDex
 import generations.gg.generations.core.generationscore.common.util.GenerationsUtils.getFlavorLocalizedName
 import generations.gg.generations.core.generationscore.common.util.add
@@ -54,12 +55,12 @@ class ItemCurry(properties: Properties) : Item(properties.stacksTo(64)), Pokemon
 
     override fun onCraftedBy(stack: ItemStack, level: Level, player: Player) {
         if (player is ServerPlayer) {
-            val rating = CurryDex.of(player).currentTaste
             val data = getData(stack)
+            val rating = CurryEvents.MODIFY_RATING.invoker().modifyRating(CurryTasteRating.Koffing, player, data)!! //CurryDex.of(player).currentTaste
             data.setRating(rating)
             rating.configureData(data)
             setData(stack, data)
-            CurryDex.add(player, data)
+//            CurryDex.add(player, data)
         }
     }