Words cannot describe how much I hate 1.19.2

hybridlabs · Jul 25, 2024 · 44a084e · 44a084e
1 parent 2e079c8
commit 44a084e
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,9 @@
 //file:noinspection ALL
 
 plugins {
-    id "fabric-loom" version "1.6-SNAPSHOT"
+    id "fabric-loom" version "1.7-SNAPSHOT"
     id "maven-publish"
-    id "org.jetbrains.kotlin.jvm"
+    id "org.jetbrains.kotlin.jvm" version "1.9.20"
 }
 
 version = mod_version
@@ -62,12 +62,11 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:$loader_version"
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
-    modImplementation "net.fabricmc:fabric-language-kotlin:$fabric_kotlin_version+kotlin.$kotlin_version"
+    modImplementation "net.fabricmc:fabric-language-kotlin:$fabric_kotlin_version"
 
     modImplementation "software.bernie.geckolib:geckolib-fabric-$geckolib_version"
     modImplementation "com.terraformersmc:modmenu:$mod_menu_version"
 
-    modRuntimeOnly "io.github.flemmli97:debugutils:$minecraft_version-$debug_utils_version-fabric"
     modRuntimeOnly "maven.modrinth:carpet:$carpet_version"
 
     include modImplementation("com.jamieswhiteshirt:reach-entity-attributes:$reach_entity_attributes_version")

diff --git a/gradle.properties b/gradle.properties
@@ -6,22 +6,21 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.19.2
 yarn_build=28
-loader_version=0.14.24
-fabric_kotlin_version=1.10.13+kotlin.1.9.20
+loader_version=0.15.11
+fabric_kotlin_version=1.11.0+kotlin.2.0.0
 
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.3.4
 maven_group=dev.hybridlabs
 archives_base_name=hybrid-aquatic
 
 # Dependencies
-fabric_version=0.76.1+1.19.2
+fabric_version=0.77.0+1.19.2
 
 mod_menu_version=7.2.2
-geckolib_version=1.20.1:4.4.4
-debug_utils_version=1.0.5
+geckolib_version=1.19:3.1.40
 carpet_version=1.4.112
-reach_entity_attributes_version=2.4.0
+reach_entity_attributes_version=2.3.2
 
 # Meta
 mod_id=hybrid-aquatic
diff --git a/settings.gradle b/settings.gradle
@@ -8,10 +8,6 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-
-    plugins {
-        id("org.jetbrains.kotlin.jvm").version(kotlin_version)
-    }
 }
 
 rootProject.name = "hybrid-aquatic"
diff --git a/src/main/java/dev/hybridlabs/aquatic/mixin/FishingBobberEntityMixin.java b/src/main/java/dev/hybridlabs/aquatic/mixin/FishingBobberEntityMixin.java
@@ -94,6 +94,7 @@ else if (lureItem.equals(HybridAquaticItems.INSTANCE.getGLOWING_HOOK()) && this.
     // Gets objects for the functions below
     @Unique
     ItemStack usedItem;
+
     @Unique
     PlayerEntity usedPlayer;
 
@@ -168,7 +169,7 @@ private boolean changeSpawnEntity(World instance, Entity entity) {
             var entityType = ITEM_TO_ENTITY.get(generatedItem.getItem());
             Enchantment liveCatch = HybridAquaticEnchantments.INSTANCE.getLIVECATCH();
             if (entityType != null && EnchantmentHelper.getLevel(liveCatch, usedItem) > 0) {
-                var liveFish = entityType.spawn(serverWorld, this.getBlockPos(), SpawnReason.SPAWN_EGG);
+                var liveFish = entityType.create(serverWorld);
                 if (liveFish == null) {
                     return false;
                 }
@@ -292,4 +293,4 @@ private void retrieveLure(PlayerEntity player) {
             this.getWorld().spawnEntity(itemEntity);
         }
     }
-}
+}
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt b/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt
@@ -1,6 +1,5 @@
 package dev.hybridlabs.aquatic
 
-//import dev.hybridlabs.aquatic.world.biome.HybridAquaticBiomes
 import dev.hybridlabs.aquatic.block.HybridAquaticBlocks
 import dev.hybridlabs.aquatic.block.PlushieBlock
 import dev.hybridlabs.aquatic.block.SeaMessage
@@ -23,12 +22,11 @@ import dev.hybridlabs.aquatic.world.gen.feature.FeatureBiomeModifications
 import dev.hybridlabs.aquatic.world.gen.feature.HybridAquaticFeatures
 import dev.hybridlabs.aquatic.world.gen.feature.HybridAquaticPlacedFeatures
 import net.fabricmc.api.ModInitializer
-import net.fabricmc.fabric.api.event.registry.DynamicRegistries
 import net.fabricmc.fabric.api.`object`.builder.v1.trade.TradeOfferHelper
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry
 import net.fabricmc.fabric.api.registry.StrippableBlockRegistry
 import net.minecraft.item.BlockItem
-import net.minecraft.registry.Registries
+import net.minecraft.util.registry.Registry
 import net.minecraft.village.TradeOffers.SellItemFactory
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -93,7 +91,7 @@ object HybridAquatic : ModInitializer {
 
     private fun registerWanderingTraderTrades() {
         // plushies
-        Registries.ITEM
+        Registry.ITEM
             .filter { it is BlockItem && it.block is PlushieBlock }
             .forEach { block ->
                 TradeOfferHelper.registerWanderingTraderOffers(2) { list ->

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/AnemoneBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/AnemoneBlock.kt
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemPlacementContext
 import net.minecraft.registry.tag.FluidTags
 import net.minecraft.state.StateManager
 import net.minecraft.state.property.Properties.WATERLOGGED
+import net.minecraft.tag.FluidTags
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.shape.VoxelShape

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/BuoyBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/BuoyBlock.kt
@@ -8,9 +8,9 @@ import net.minecraft.block.entity.BlockEntity
 import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
-import net.minecraft.registry.tag.FluidTags
 import net.minecraft.state.StateManager
 import net.minecraft.state.property.Properties
+import net.minecraft.tag.FluidTags
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.shape.VoxelShape

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt
@@ -12,12 +12,12 @@ import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.item.ItemStack
-import net.minecraft.registry.tag.FluidTags
 import net.minecraft.sound.SoundCategory
 import net.minecraft.sound.SoundEvents
 import net.minecraft.state.StateManager
 import net.minecraft.state.property.BooleanProperty
 import net.minecraft.state.property.Properties.WATERLOGGED
+import net.minecraft.tag.FluidTags
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/HydrothermalVentBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/HydrothermalVentBlock.kt
@@ -6,15 +6,14 @@ import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.particle.ParticleTypes
-import net.minecraft.registry.tag.FluidTags
+import net.minecraft.tag.FluidTags
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.random.Random
 import net.minecraft.util.shape.VoxelShape
 import net.minecraft.world.BlockView
 import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
-import net.minecraft.world.WorldView
 
 class HydrothermalVentBlock(settings: Settings?) :
     AbstractPlantStemBlock(settings, Direction.UP, SHAPE, true, 0.0),
@@ -26,7 +25,7 @@ class HydrothermalVentBlock(settings: Settings?) :
     override fun getPlant(): Block {
         return HybridAquaticBlocks.HYDROTHERMAL_VENT_SHAFT
     }
-    override fun isFertilizable(world: WorldView?, pos: BlockPos?, state: BlockState?, isClient: Boolean): Boolean {
+    override fun isFertilizable(world: BlockView?, pos: BlockPos?, state: BlockState?, isClient: Boolean): Boolean {
         return false
     }
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/HydrothermalVentShaftBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/HydrothermalVentShaftBlock.kt
@@ -9,7 +9,6 @@ import net.minecraft.util.math.Direction
 import net.minecraft.util.shape.VoxelShape
 import net.minecraft.world.BlockView
 import net.minecraft.world.WorldAccess
-import net.minecraft.world.WorldView
 
 class HydrothermalVentShaftBlock(settings: Settings?) :
     AbstractPlantBlock(settings, Direction.UP, SHAPE, true), FluidFillable {
@@ -29,7 +28,7 @@ class HydrothermalVentShaftBlock(settings: Settings?) :
         return false
     }
 
-    override fun isFertilizable(world: WorldView?, pos: BlockPos?, state: BlockState?, isClient: Boolean): Boolean {
+    override fun isFertilizable(world: BlockView?, pos: BlockPos?, state: BlockState?, isClient: Boolean): Boolean {
         return false
     }
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/SeaMessage.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/SeaMessage.kt
@@ -3,9 +3,9 @@ package dev.hybridlabs.aquatic.block
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import dev.hybridlabs.aquatic.registry.HybridAquaticRegistryKeys
-import net.minecraft.registry.DynamicRegistryManager
 import net.minecraft.util.Identifier
-import java.util.Optional
+import net.minecraft.util.registry.DynamicRegistryManager
+import java.util.*
 
 /**
  * Represents a message inside a Message in a Bottle.

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/TubeSpongeBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/TubeSpongeBlock.kt
@@ -6,9 +6,9 @@ import net.minecraft.block.entity.BlockEntity
 import net.minecraft.fluid.FluidState
 import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
-import net.minecraft.registry.tag.FluidTags
 import net.minecraft.state.StateManager
 import net.minecraft.state.property.Properties
+import net.minecraft.tag.FluidTags
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.shape.VoxelShape

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/HybridAquaticDataGenerator.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/HybridAquaticDataGenerator.kt
@@ -18,8 +18,8 @@ import dev.hybridlabs.aquatic.data.server.tag.ItemTagProvider
 import dev.hybridlabs.aquatic.registry.HybridAquaticRegistryKeys
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
-import net.minecraft.registry.Registry
-import net.minecraft.registry.RegistryBuilder
+import net.minecraft.util.registry.Registry
+import org.apache.http.config.RegistryBuilder
 
 object HybridAquaticDataGenerator : DataGeneratorEntrypoint {
     override fun onInitializeDataGenerator(generator: FabricDataGenerator) {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/EntityTypeTagProvider.kt
@@ -2,14 +2,12 @@ package dev.hybridlabs.aquatic.data.server.tag
 
 import dev.hybridlabs.aquatic.entity.HybridAquaticEntityTypes
 import dev.hybridlabs.aquatic.tag.HybridAquaticEntityTags
-import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider
 import net.minecraft.entity.EntityType
-import net.minecraft.registry.RegistryWrapper
 import java.util.concurrent.CompletableFuture
 
 class EntityTypeTagProvider(output: FabricDataOutput, registriesFuture: CompletableFuture<RegistryWrapper.WrapperLookup>) : FabricTagProvider.EntityTypeTagProvider(output, registriesFuture) {
-    override fun configure(arg: RegistryWrapper.WrapperLookup) {
+    override fun generateTags() {
         // prey source
         getOrCreateTagBuilder(HybridAquaticEntityTags.SMALL_PREY)
             .add(

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/DivingArmorItem.kt
@@ -7,6 +7,7 @@ import software.bernie.geckolib.animatable.GeoItem
 import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache
 import software.bernie.geckolib.core.animation.AnimatableManager
 import software.bernie.geckolib.util.GeckoLibUtil
+import software.bernie.geckolib3.util.GeckoLibUtil
 import java.util.function.Consumer
 import java.util.function.Supplier
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/loot/entry/HybridAquaticLootPoolEntryTypes.kt b/src/main/kotlin/dev/hybridlabs/aquatic/loot/entry/HybridAquaticLootPoolEntryTypes.kt
@@ -4,9 +4,9 @@ import dev.hybridlabs.aquatic.HybridAquatic
 import net.minecraft.loot.entry.LootPoolEntry
 import net.minecraft.loot.entry.LootPoolEntryType
 import net.minecraft.registry.Registries
-import net.minecraft.registry.Registry
 import net.minecraft.util.Identifier
 import net.minecraft.util.JsonSerializer
+import net.minecraft.util.registry.Registry
 
 object HybridAquaticLootPoolEntryTypes {
     val MESSAGE_IN_A_BOTTLE = register("message_in_a_bottle", MessageInABottleItemEntry.Serializer())

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/potions/HybridAquaticPotions.kt b/src/main/kotlin/dev/hybridlabs/aquatic/potions/HybridAquaticPotions.kt
@@ -13,6 +13,7 @@ import net.minecraft.recipe.BrewingRecipeRegistry
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
 import net.minecraft.util.Identifier
+import net.minecraft.util.registry.Registry
 
 object HybridAquaticPotions {
     val GLOWING_POTION = registerPotionWithRecipe(

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/registry/HybridAquaticRegistryKeys.kt b/src/main/kotlin/dev/hybridlabs/aquatic/registry/HybridAquaticRegistryKeys.kt
@@ -2,9 +2,9 @@ package dev.hybridlabs.aquatic.registry
 
 import dev.hybridlabs.aquatic.HybridAquatic
 import dev.hybridlabs.aquatic.block.SeaMessage
-import net.minecraft.registry.Registry
-import net.minecraft.registry.RegistryKey
 import net.minecraft.util.Identifier
+import net.minecraft.util.registry.Registry
+import net.minecraft.util.registry.RegistryKey
 
 /**
  * Registry keys for Hybrid Aquatic.

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticBiomeTags.kt b/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticBiomeTags.kt
@@ -3,6 +3,7 @@ package dev.hybridlabs.aquatic.tag
 import dev.hybridlabs.aquatic.HybridAquatic
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.registry.tag.TagKey
+import net.minecraft.tag.TagKey
 import net.minecraft.util.Identifier
 import net.minecraft.world.biome.Biome
 

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticBlockTags.kt b/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticBlockTags.kt
@@ -3,7 +3,7 @@ package dev.hybridlabs.aquatic.tag
 import dev.hybridlabs.aquatic.HybridAquatic
 import net.minecraft.block.Block
 import net.minecraft.registry.RegistryKeys
-import net.minecraft.registry.tag.TagKey
+import net.minecraft.tag.TagKey
 import net.minecraft.util.Identifier
 
 object HybridAquaticBlockTags {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticEntityTags.kt b/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticEntityTags.kt
@@ -3,7 +3,7 @@ package dev.hybridlabs.aquatic.tag
 import dev.hybridlabs.aquatic.HybridAquatic
 import net.minecraft.entity.EntityType
 import net.minecraft.registry.RegistryKeys
-import net.minecraft.registry.tag.TagKey
+import net.minecraft.tag.TagKey
 import net.minecraft.util.Identifier
 
 object HybridAquaticEntityTags {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticItemTags.kt b/src/main/kotlin/dev/hybridlabs/aquatic/tag/HybridAquaticItemTags.kt
@@ -6,7 +6,7 @@ import dev.hybridlabs.aquatic.HybridAquatic
 import net.fabricmc.fabric.impl.tag.convention.TagRegistration
 import net.minecraft.item.Item
 import net.minecraft.registry.RegistryKeys
-import net.minecraft.registry.tag.TagKey
+import net.minecraft.tag.TagKey
 import net.minecraft.util.Identifier
 
 object HybridAquaticItemTags {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/world/EntityBiomeModifications.kt b/src/main/kotlin/dev/hybridlabs/aquatic/world/EntityBiomeModifications.kt
@@ -6,7 +6,7 @@ import dev.hybridlabs.aquatic.utils.HybridAquaticSpawnGroup
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.SpawnGroup
-import net.minecraft.registry.tag.TagKey
+import net.minecraft.tag.TagKey
 import net.minecraft.world.biome.Biome
 
 /**

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/FeatureBiomeModifications.kt b/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/FeatureBiomeModifications.kt
@@ -3,7 +3,7 @@ package dev.hybridlabs.aquatic.world.gen.feature
 import dev.hybridlabs.aquatic.tag.HybridAquaticBiomeTags
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors
-import net.minecraft.registry.tag.BiomeTags
+import net.minecraft.tag.BiomeTags
 import net.minecraft.world.gen.GenerationStep
 
 /**

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/HybridAquaticConfiguredFeatures.kt b/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/HybridAquaticConfiguredFeatures.kt
@@ -1,9 +1,9 @@
 package dev.hybridlabs.aquatic.world.gen.feature
 
 import dev.hybridlabs.aquatic.HybridAquatic
-import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.util.Identifier
+import net.minecraft.util.registry.RegistryKey
 import net.minecraft.world.gen.feature.ConfiguredFeature
 
 /**

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/HybridAquaticPlacedFeatures.kt b/src/main/kotlin/dev/hybridlabs/aquatic/world/gen/feature/HybridAquaticPlacedFeatures.kt
@@ -1,9 +1,9 @@
 package dev.hybridlabs.aquatic.world.gen.feature
 
 import dev.hybridlabs.aquatic.HybridAquatic
-import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.util.Identifier
+import net.minecraft.util.registry.RegistryKey
 import net.minecraft.world.gen.feature.PlacedFeature
 
 /**