...GeneraitonsClient ported

Author: Waterpicker

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

@@ -72,10 +72,9 @@ object GenerationsCore {
 	val LOGGER: Logger = LogUtils.getLogger()
 
     /** The config for the Generations-Core mod.  */
-	@JvmField
-	var CONFIG: Config? = null
-    @JvmField
-	var implementation: GenerationsImplementation? = null
+
+	lateinit var CONFIG: Config
+	lateinit var implementation: GenerationsImplementation
 
     @JvmField
 	var dataProvider: DataProvider = GenerationsDataProvider.INSTANCE
@@ -84,7 +83,7 @@ object GenerationsCore {
      * Initializes the Generations-Core mod.
      */
 	@JvmStatic
-	fun init(implementation: GenerationsImplementation?) {
+	fun init(implementation: GenerationsImplementation) {
         CONFIG = loadConfig(
             Config::class.java, "core", "main"
         )

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

@@ -5,7 +5,7 @@ import generations.gg.generations.core.generationscore.common.GenerationsCore
 import net.minecraft.world.entity.player.Player
 import java.math.BigDecimal
 
-class AccountInfo(var balance: BigDecimal = BigDecimal.ZERO) : PlayerDataExtension {
+class AccountInfo(var balance: BigDecimal = BigDecimal.ZERO) : PlayerDataExtension() {
 
     override fun name(): String {
         return KEY

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

@@ -0,0 +1,12 @@
+package generations.gg.generations.core.generationscore.common.api.player
+
+import com.cobblemon.mod.common.api.storage.player.PlayerDataExtension
+import com.google.gson.JsonObject
+
+abstract class PlayerDataExtension : PlayerDataExtension {
+    override fun serialize(): JsonObject {
+        val json = JsonObject()
+        json.addProperty(PlayerDataExtension.NAME_KEY, name())
+        return json
+    }
+}

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

@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public class GenerationsBoatRenderer extends EntityRenderer<GenerationsBoatEntity> {
+public class GenerationsBoatRenderer<T extends GenerationsBoatEntity> extends EntityRenderer<T> {
     private final Map<GenerationsBoatEntity.Type, Pair<ResourceLocation, ListModel<Boat>>> boatResources;
 
     public GenerationsBoatRenderer(EntityRendererProvider.Context context, boolean bl) {
@@ -55,7 +55,7 @@ private static String getTextureLocation(GenerationsBoatEntity.Type type, boolea
         return bl ? "textures/entity/chest_boat/" + type.getName() + ".png" : "textures/entity/boat/" + type.getName() + ".png";
     }
 
-    public void render(GenerationsBoatEntity boat, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i) {
+    public void render(T boat, float f, float g, PoseStack poseStack, MultiBufferSource multiBufferSource, int i) {
         poseStack.pushPose();
         poseStack.translate(0.0F, 0.375F, 0.0F);
         poseStack.mulPose(Axis.YP.rotationDegrees(180.0F - f));

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.java

@@ -299,11 +299,11 @@ object Pipelines {
         return PIPELINE_MAP[if (useLegacy) LEGACY else MAIN]!!.apply(name)!!
     }
 
-    fun read(manager: ResourceManager, name: String?): String {
+    fun read(manager: ResourceManager, name: String): String {
         return read(manager, GenerationsCore.id(name))
     }
 
-    fun read(manager: ResourceManager, name: String, lib: String?): String {
+    fun read(manager: ResourceManager, name: String, lib: String): String {
         return read(manager, GenerationsCore.id(name), GenerationsCore.id(lib))
     }
 

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

@@ -3,7 +3,7 @@ package generations.gg.generations.core.generationscore.common.client.render.rar
 import com.cobblemon.mod.common.util.asResource
 import com.mojang.blaze3d.platform.NativeImage
 import com.mojang.blaze3d.systems.RenderSystem
-import generations.gg.generations.core.generationscore.common.GenerationsCore.*
+import generations.gg.generations.core.generationscore.common.GenerationsCore.id
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.texture.DynamicTexture
 import net.minecraft.resources.ResourceLocation

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/entity/GenerationsBoatRenderer.java

@@ -2,7 +2,6 @@ package generations.gg.generations.core.generationscore.common.util
 
 import com.google.gson.*
 import com.mojang.datafixers.kinds.App
-import com.mojang.datafixers.kinds.IdF.Instance
 import com.mojang.datafixers.util.Either
 import com.mojang.datafixers.util.Pair
 import com.mojang.serialization.Codec
@@ -18,7 +17,6 @@ import net.minecraft.network.codec.StreamCodec
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.tags.TagKey
-import org.joml.Vector3d
 import java.lang.reflect.Type
 import java.util.*
 import kotlin.jvm.optionals.getOrNull
@@ -447,5 +445,5 @@ object Codecs {
     }
 
     fun <A> mapCodec(block: RecordCodecBuilder.Instance<A>.() -> App<RecordCodecBuilder.Mu<A>, A>): MapCodec<A> = RecordCodecBuilder.mapCodec(block)
-    fun <T : GenericModelBlock<*>> modelCodec(): RecordCodecBuilder<T, ResourceLocation> = ResourceLocation.CODEC.fieldOf("model").forGetter { it.model!! }
+    fun <T : GenericModelBlock<*>> modelCodec(): RecordCodecBuilder<T, ResourceLocation> = ResourceLocation.CODEC.fieldOf("model").forGetter { it.getModel()!! }
 }