migration: solve 1.20.6 compiling error

gloridifice · Jun 17, 2024 · 7d8d64c · 7d8d64c
1 parent ac162c9
commit 7d8d64c
Show file tree

Hide file tree

Showing 57 changed files with 647 additions and 690 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,11 +64,11 @@ dependencies {
 	implementation 'com.akuleshov7:ktoml-core:0.5.1'
 	implementation 'com.akuleshov7:ktoml-file:0.5.1'
 
-	// compile against the JEI API but do not include it at runtime
-	modCompileOnlyApi("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
-	modCompileOnlyApi("mezz.jei:jei-${mc_version}-fabric-api:${jei_version}")
-	// at runtime, use the full JEI jar for Fabric
-	modRuntimeOnly("mezz.jei:jei-${mc_version}-fabric:${jei_version}")
+//	// compile against the JEI API but do not include it at runtime
+//	modCompileOnlyApi("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+//	modCompileOnlyApi("mezz.jei:jei-${mc_version}-fabric-api:${jei_version}")
+//	// at runtime, use the full JEI jar for Fabric
+//	modRuntimeOnly("mezz.jei:jei-${mc_version}-fabric:${jei_version}")
 }
 
 processResources {
@@ -80,12 +80,12 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 	kotlinOptions {
-		jvmTarget = 17
+		jvmTarget = 21
 	}
 }
 
@@ -95,8 +95,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-mc_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.15.7
-fabric_kotlin_version=1.10.18+kotlin.1.9.22
+mc_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.10
+fabric_kotlin_version=1.11.0+kotlin.2.0.0
 
 # Mod Properties
 mod_version=2.0.0
@@ -16,5 +16,4 @@ maven_group=xyz.koiro.watersource
 archives_base_name=watersource
 
 # Dependencies
-fabric_version=0.92.0+1.20.1
-jei_version=15.3.0.4
+fabric_version=0.97.8+1.20.6
diff --git a/src/client/kotlin/xyz/koiro/watersource/api/VertexConsumersExt.kt b/src/client/kotlin/xyz/koiro/watersource/api/VertexConsumersExt.kt
@@ -51,6 +51,6 @@ fun VertexConsumer.quadFace(
             .overlay(OverlayTexture.DEFAULT_UV)
             .texture(u, v)
             .light(240)
-            .normal(matrixStack.peek().normalMatrix, normalN.x, normalN.y, normalN.z).next()
+            .normal(matrixStack.peek(), normalN.x, normalN.y, normalN.z).next()
     }
 }
diff --git a/src/client/kotlin/xyz/koiro/watersource/event/ItemTooltipEventHandlers.kt b/src/client/kotlin/xyz/koiro/watersource/event/ItemTooltipEventHandlers.kt
@@ -20,7 +20,7 @@ object ItemTooltipEventHandlers {
 
     val renderItemTooltipHydrationData = ModClientEvents.DrawMouseoverTooltip { context, x, y, stack ->
         HydrationDataManager.findByItemStack(stack)?.let { hydrationData ->
-            val isThirty = hydrationData.effects.any { it.effect.effectType == ModStatusEffects.THIRSTY }
+            val isThirty = hydrationData.effects?.any { it.effect == ModStatusEffects.THIRSTY } ?: false
             if (hydrationData.isDry()) {
                 if (WSClientConfig.format.showHydrationDryItemTooltip)
                     drawDry(context, hydrationData, isThirty, x, y)
@@ -62,8 +62,8 @@ object ItemTooltipEventHandlers {
     }
 
     fun drawRestoration(context: DrawContext, hydrationData: HydrationData, isThirty: Boolean, x: Int, y: Int) {
-        val level = hydrationData.level
-        val saturation = hydrationData.saturation
+        val level = hydrationData.level ?: 0
+        val saturation = hydrationData.saturation ?: 0
 
         val levelCount = ceil(level.toFloat() / 2f).toInt()
         val isLevelEndHalf = level % 2 != 0

diff --git a/src/client/kotlin/xyz/koiro/watersource/network/ModClientNetworking.kt b/src/client/kotlin/xyz/koiro/watersource/network/ModClientNetworking.kt
@@ -7,19 +7,11 @@ import xyz.koiro.watersource.world.block.entity.FilterBlockEntity
 
 object ModClientNetworking {
     fun initialize() {
-        ClientPlayNetworking.registerGlobalReceiver(ModNetworking.UPDATE_WATER_DATA_ID){ client, _, buf, sent ->
-            val data = WaterLevelData.readBuf(buf)
-
+        ClientPlayNetworking.registerGlobalReceiver(ModNetworking.UPDATE_WATER_LEVEL){ payload, handler ->
+            val client = handler.client()
             client.execute {
                 val player = client.player!!
-                player.setAttached(ModAttachmentTypes.WATER_LEVEL, data)
-            }
-        }
-        ClientPlayNetworking.registerGlobalReceiver(ModNetworking.UPDATE_FILTER_ENTITY_ID) { mc, _, buf, sent ->
-            val pos = buf.readBlockPos()
-            val entity = mc.world?.getBlockEntity(pos)
-            if (entity is FilterBlockEntity) {
-                entity.readPacket(buf)
+                player.getAttachedOrCreate(ModAttachmentTypes.WATER_LEVEL).setData(payload.level, payload.saturation, payload.exhaustion)
             }
         }
     }

diff --git a/src/client/kotlin/xyz/koiro/watersource/render/blockentity/FilterBERenderer.kt b/src/client/kotlin/xyz/koiro/watersource/render/blockentity/FilterBERenderer.kt
@@ -1,7 +1,6 @@
 package xyz.koiro.watersource.render.blockentity
 
 import com.mojang.blaze3d.systems.RenderSystem
-import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.render.RenderLayer
 import net.minecraft.client.render.VertexConsumerProvider
@@ -63,7 +62,7 @@ class FilterBERenderer : BlockEntityRenderer<FilterBlockEntity> {
 
         matrices.push()
         RenderSystem.enableBlend()
-        val consumer = vertexConsumers.getBuffer(RenderLayer.getTranslucentNoCrumbling())
+        val consumer = vertexConsumers.getBuffer(RenderLayer.getGlintTranslucent())
         val u0 = fluidSprite.minU
         val v0 = fluidSprite.minV
         val u1 = fluidSprite.maxU

diff --git a/src/client/kotlin/xyz/koiro/watersource/render/color/ModItemColorProviders.kt b/src/client/kotlin/xyz/koiro/watersource/render/color/ModItemColorProviders.kt
@@ -2,28 +2,30 @@ package xyz.koiro.watersource.render.color
 
 import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry
+import net.fabricmc.fabric.api.client.rendering.v1.ColorResolverRegistry
 import net.minecraft.client.MinecraftClient
 import net.minecraft.item.ItemStack
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.ColorHelper
 import xyz.koiro.watersource.api.storage.getOrCreateFluidStorageData
 import xyz.koiro.watersource.world.fluid.ModFluids
 import xyz.koiro.watersource.world.item.ModItems
 
 object ModItemColorProviders {
     val cupColorProvider = { stack: ItemStack, layer: Int ->
-        if (layer == 1) {
+        ColorHelper.Argb.fullAlpha(if (layer == 1) {
             stack.getOrCreateFluidStorageData()?.let {
                 FluidRenderHandlerRegistry.INSTANCE?.get(it.fluid)?.getFluidColor(
-                    MinecraftClient.getInstance().world,
-                    BlockPos.ORIGIN,
-                    ModFluids.PURIFIED_WATER.defaultState
+                    MinecraftClient.getInstance().world, BlockPos.ORIGIN, ModFluids.PURIFIED_WATER.defaultState
                 )
             } ?: 0xFFFFFF
         } else {
             0xFFFFFF
-        }
+        })
     }
+
     fun initialize() {
+
         ColorProviderRegistry.ITEM.register(cupColorProvider, ModItems.WOODEN_CUP)
         ColorProviderRegistry.ITEM.register(cupColorProvider, ModItems.POTTERY_CUP)
     }

diff --git a/src/client/kotlin/xyz/koiro/watersource/render/hud/ModClientHUD.kt b/src/client/kotlin/xyz/koiro/watersource/render/hud/ModClientHUD.kt
@@ -7,6 +7,7 @@ import net.minecraft.util.hit.BlockHitResult
 import xyz.koiro.watersource.WSClientConfig
 import xyz.koiro.watersource.api.WaterBallRenderer
 import xyz.koiro.watersource.api.WaterLevelUiRenderUtils
+import xyz.koiro.watersource.api.entry
 import xyz.koiro.watersource.world.attachment.ModAttachmentTypes
 import xyz.koiro.watersource.world.block.entity.FilterBlockEntity
 import xyz.koiro.watersource.world.effect.ModStatusEffects
@@ -59,7 +60,7 @@ object ModClientHUD {
             var y: Int = context.scaledWindowHeight - 39 - offsetBetweenFoodBar
             if (player.isSubmergedInWater || player.air < player.maxAir) y -= 10
             val xStart: Int = context.scaledWindowWidth / 2 + 91
-            val isThirty = player.hasStatusEffect(ModStatusEffects.THIRSTY)
+            val isThirty = player.hasStatusEffect(ModStatusEffects.THIRSTY.entry())
 
             val yOffsetList = if (saturation <= 0.0f && elapsedTime.toInt() % (level * 3 + 1) == 0) {
                 List(10) {

diff --git a/src/client/resources/watersource.client.mixins.json b/src/client/resources/watersource.client.mixins.json
@@ -1,7 +1,7 @@
 {
 	"required": true,
 	"package": "xyz.koiro.watersource.mixin.client",
-	"compatibilityLevel": "JAVA_17",
+	"compatibilityLevel": "JAVA_21",
 	"client": [
 		"ExampleClientMixin", "HandledScreenMixin"
 	],

diff --git a/src/main/kotlin/xyz/koiro/watersource/ModItemGroups.kt b/src/main/kotlin/xyz/koiro/watersource/ModItemGroups.kt
@@ -1,19 +1,17 @@
 package xyz.koiro.watersource
 
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup
-import net.minecraft.enchantment.EnchantmentHelper
 import net.minecraft.enchantment.EnchantmentLevelEntry
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.EnchantedBookItem
 import net.minecraft.item.ItemStack
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
 import net.minecraft.text.Text
-import net.minecraft.village.TradeOffers.EnchantBookFactory
+import xyz.koiro.watersource.api.simpleStack
 import xyz.koiro.watersource.api.storage.insertFluid
 import xyz.koiro.watersource.world.enchantment.ModEnchantments
 import xyz.koiro.watersource.world.fluid.ModFluids
-import xyz.koiro.watersource.world.item.FluidContainerItem
 import xyz.koiro.watersource.world.item.ModItems
 
 object ModItemGroups {

diff --git a/src/main/kotlin/xyz/koiro/watersource/WSConfig.kt b/src/main/kotlin/xyz/koiro/watersource/WSConfig.kt
@@ -1,12 +1,15 @@
 package xyz.koiro.watersource
 
 import kotlinx.serialization.Serializable
+import net.minecraft.component.DataComponentTypes
 import net.minecraft.entity.effect.StatusEffect
 import net.minecraft.entity.effect.StatusEffectInstance
 import net.minecraft.entity.effect.StatusEffects
 import net.minecraft.item.ItemStack
 import net.minecraft.registry.Registries
+import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.util.Identifier
+import xyz.koiro.watersource.api.identifier
 import xyz.koiro.watersource.data.HydrationData
 import xyz.koiro.watersource.datagen.provider.HydrationDataProvider
 import xyz.koiro.watersource.world.effect.ModStatusEffects
@@ -91,7 +94,7 @@ object WSConfig {
                 }
             return raw.map {
                 StatusEffectInstance(
-                    Registries.STATUS_EFFECT.get(Identifier.tryParse(it.id)),
+                    RegistryEntry.of(Registries.STATUS_EFFECT.get(Identifier.tryParse(it.id))) ,
                     duration,
                     it.amplifier
                 )
@@ -104,7 +107,7 @@ object WSConfig {
         val id: String,
         val amplifier: Int = 0
     ) {
-        constructor(effectType: StatusEffect, amplifier: Int = 0) : this(effectType.identifier().toString(), amplifier)
+        constructor(effectType: RegistryEntry<StatusEffect>, amplifier: Int = 0) : this(effectType.identifier().toString(), amplifier)
 
         companion object {
             fun fromInstance(instance: StatusEffectInstance): EffectObject {
@@ -131,11 +134,8 @@ object WSConfig {
         return value * (1 + (mul - 1) / 2)
     }
 
-    fun getWaterThirstyProbabilityEffect(): HydrationData.ProbabilityStatusEffectInstance =
-        HydrationData.ProbabilityStatusEffectInstance(
-            0.8f,
-            StatusEffectInstance(ModStatusEffects.THIRSTY, 1200)
-        )
+    fun getWaterThirstyProbabilityEffect(): HydrationData.StatusEffectObject =
+        HydrationData.StatusEffectObject(ModStatusEffects.THIRSTY, 0, 10f, 0.8f)
 
     fun getMoisturizingRatio(levelSum: Int): Float {
         return 1f / (1f + levelSum.toFloat() * 0.15f)
@@ -181,8 +181,9 @@ object WSConfig {
     }
 
     fun getDefaultFoodDryData(itemStack: ItemStack): HydrationData? {
-        if (format.enableDefaultDryData && itemStack.isFood) {
-            itemStack.item.foodComponent?.hunger?.let {
+        val foodData = itemStack.get(DataComponentTypes.FOOD)
+        if (format.enableDefaultDryData && foodData != null) {
+            foodData.nutrition.let {
                 if (it > 1) {
                     return HydrationDataProvider.dryItem(itemStack.item, floor(it / 2f).toInt())
                 }

diff --git a/src/main/kotlin/xyz/koiro/watersource/WaterSource.kt b/src/main/kotlin/xyz/koiro/watersource/WaterSource.kt
@@ -7,8 +7,10 @@ import org.slf4j.LoggerFactory
 import xyz.koiro.watersource.config.ModConfigLoader
 import xyz.koiro.watersource.data.ModResourceRegistries
 import xyz.koiro.watersource.event.ModEventsHandlers
+import xyz.koiro.watersource.network.ModNetworking
 import xyz.koiro.watersource.world.block.ModBlocks
 import xyz.koiro.watersource.world.block.entity.ModBlockEntities
+import xyz.koiro.watersource.world.datacomponent.ModDataComponentTypes
 import xyz.koiro.watersource.world.effect.ModStatusEffects
 import xyz.koiro.watersource.world.fluid.ModFluids
 import xyz.koiro.watersource.world.item.ModFuelRegister
@@ -27,10 +29,12 @@ object WaterSource : ModInitializer {
         ModBlockEntities.active()
         ModStatusEffects.active()
         ModItemGroups.active()
+        ModDataComponentTypes.active()
         ModRecipes.initialize()
         ModResourceRegistries.initialize()
         ModEventsHandlers.initialize()
         ModCommands.initialize()
+        ModNetworking.initialize()
         WSConfig.format = ModConfigLoader.loadOrCreateConfig<WSConfig.Format>("common", WSConfig.Format())
     }
 

diff --git a/src/main/kotlin/xyz/koiro/watersource/WaterSourceDataGenerator.kt b/src/main/kotlin/xyz/koiro/watersource/WaterSourceDataGenerator.kt
@@ -2,27 +2,19 @@ package xyz.koiro.watersource
 
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
-import xyz.koiro.watersource.datagen.HydrationDataGenerator
-import xyz.koiro.watersource.datagen.ModChineseLangGenerator
-import xyz.koiro.watersource.datagen.ModEnglishLangGenerator
-import xyz.koiro.watersource.datagen.ModModelGenerator
-import xyz.koiro.watersource.datagen.ModItemTagGenerator
-import xyz.koiro.watersource.datagen.ModFluidTagGenerator
-import xyz.koiro.watersource.datagen.ModRecipeGenerator
-import xyz.koiro.watersource.datagen.FilterRecipeDataGenerator
-import xyz.koiro.watersource.datagen.ModBlockLootTableGenerator
+import xyz.koiro.watersource.datagen.*
 
 object WaterSourceDataGenerator : DataGeneratorEntrypoint {
-	override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {
-		val pack = fabricDataGenerator.createPack()
-		pack.addProvider(::HydrationDataGenerator)
-		pack.addProvider(::FilterRecipeDataGenerator)
-		pack.addProvider(::ModModelGenerator)
-		pack.addProvider(::ModChineseLangGenerator)
-		pack.addProvider(::ModEnglishLangGenerator)
-		pack.addProvider(::ModItemTagGenerator)
-		pack.addProvider(::ModFluidTagGenerator)
-		pack.addProvider(::ModRecipeGenerator)
-		pack.addProvider(::ModBlockLootTableGenerator)
-	}
+    override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {
+        val pack = fabricDataGenerator.createPack()
+        pack.addProvider(::HydrationDataGenerator)
+        pack.addProvider(::FilterRecipeDataGenerator)
+        pack.addProvider(::ModModelGenerator)
+        pack.addProvider(::ModChineseLangGenerator)
+        pack.addProvider(::ModEnglishLangGenerator)
+        pack.addProvider(::ModItemTagGenerator)
+        pack.addProvider(::ModFluidTagGenerator)
+        pack.addProvider(::ModRecipeGenerator)
+        pack.addProvider(::ModBlockLootTableGenerator)
+    }
 }
diff --git a/...ain/kotlin/xyz/koiro/watersource/Tools.kt → ...kotlin/xyz/koiro/watersource/api/Tools.kt b/...ain/kotlin/xyz/koiro/watersource/Tools.kt → ...kotlin/xyz/koiro/watersource/api/Tools.kt
@@ -1,10 +1,11 @@
-package xyz.koiro.watersource
+package xyz.koiro.watersource.api
 
 import net.minecraft.entity.effect.StatusEffect
 import net.minecraft.fluid.Fluid
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.registry.Registries
+import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.util.Identifier
 
 fun Item.identifier(): Identifier {
@@ -24,3 +25,16 @@ fun StatusEffect.identifier(): Identifier? {
     return Registries.STATUS_EFFECT.getId(this)
 }
 
+fun RegistryEntry<StatusEffect>.identifier(): Identifier? {
+    return if (this.hasKeyAndValue())
+        Registries.STATUS_EFFECT.getId(this.value())
+    else null
+}
+
+fun String.toIdentifier(): Identifier? {
+    return Identifier.tryParse(this)
+}
+
+fun StatusEffect.entry(): RegistryEntry<StatusEffect>{
+    return RegistryEntry.of(this)
+}