Current batch. ><

Author: Waterpicker

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

@@ -1,12 +1,9 @@
 package generations.gg.generations.core.generationscore.common;
 
 import dev.architectury.registry.registries.DeferredRegister;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
@@ -17,7 +14,6 @@
 import java.util.function.Supplier;
 
 public interface GenerationsImplementation {
-    NetworkManager getNetworkManager();
 
     void registerResourceReloader(ResourceLocation identifier, PreparableReloadListener reloader, PackType type, Collection<ResourceLocation> dependencies);
 
@@ -45,10 +41,6 @@ public interface GenerationsImplementation {
 
     Supplier<CreativeModeTab> create(String name, Supplier<ItemStack> o, DeferredRegister<? extends ItemLike>... deferredRegister);
 
-    boolean canEquip(ItemStack carried, EquipmentSlot equipmentslottype, Entity entity);
-
-    CompoundTag serializeStack(ItemStack itemStack);
-
     enum ModAPI {
         FABRIC,
         FORGE

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt

@@ -6,5 +6,5 @@ import earth.terrarium.common_storage_lib.item.util.ItemStorageData
 object GenerationsStorage {
     val registry = DataManagerRegistry(GenerationsCore.MOD_ID)
 
-    val item_contents = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).buildAndRegister().componentType()
+    val item_contents = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).buildAndRegister("").componentType()
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/NetworkManager.kt

@@ -1,23 +1,23 @@
 package generations.gg.generations.core.generationscore.common.client.entity
 
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
-import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import generations.gg.generations.core.generationscore.common.client.render.CobblemonInstanceProvider
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.StatueInstance
 import generations.gg.generations.core.generationscore.common.world.entity.StatueSideDelegate
 import generations.gg.generations.core.generationscore.common.world.entity.statue.StatueEntity
-import net.minecraft.client.Minecraft
 import net.minecraft.network.syncher.EntityDataAccessor
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.Entity
 import org.joml.Matrix4f
 
 class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstanceProvider {
-    private var instance = StatueInstance(Matrix4f(), Matrix4f(), null)
+    override var instance = StatueInstance(Matrix4f(), Matrix4f(), null)
     lateinit var currentEntity: StatueEntity
 
     var trueAge: Int = 0
@@ -28,21 +28,27 @@ class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstan
     override val schedulingTracker
         get() = currentEntity.schedulingTracker
 
+
+
     override fun getEntity() = currentEntity
     override fun updatePoke(properties: PokemonProperties) {
+        currentEntity.properties = properties
+
+        var species = properties.species?.asIdentifierDefaultingNamespace()
 
-        modelEntity.pokemon = properties.create()
+        currentModel = species?.let { PokemonModelRepository.getPoser(it, this) }
+
+        if(currentModel != null) {
+            this.currentAspects = properties.aspects
+        } else {
+            this.currentAspects = emptySet()
+        }
     }
 
     override fun updateMaterial(value: String?) {
         instance.material = value
     }
 
-    override fun onSyncedDataUpdated(data: EntityDataAccessor<*>) {
-        super.onSyncedDataUpdated(data)
-
-    }
-
     override fun initialize(entity: StatueEntity) {
         super.initialize(entity)
         this.currentEntity = entity
@@ -91,8 +97,5 @@ class StatueClientDelegate : StatueSideDelegate, PosableState(), CobblemonInstan
 
     override fun getInstance(): CobblemonInstance = instance
 
-    override fun species(): ResourceLocation = modelEntity.exposedSpecies.resourceIdentifier
-
-    override fun aspects(): Set<String> = modelEntity.aspects
     fun getAge(): Float = age + currentPartialTicks
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/entity/StatueClientDelegate.kt

@@ -0,0 +1,7 @@
+package generations.gg.generations.core.generationscore.common.client.render
+
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
+
+interface CobblemonInstanceProvider {
+    val instance: CobblemonInstance
+}