update to 1.19.3-rc1+build

btwonion · Dec 5, 2022 · 919b739 · 919b739
1 parent 3d87e35
commit 919b739
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,10 +2,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.7.21"
-    kotlin("plugin.serialization") version "1.7.21"
+    kotlin("jvm") version "1.7.22"
+    kotlin("plugin.serialization") version "1.7.22"
     id("fabric-loom") version "1.0-SNAPSHOT"
-    id("io.github.juuxel.loom-quiltflower") version "1.7.4"
+    id("io.github.juuxel.loom-quiltflower") version "1.8.0"
     id("org.quiltmc.quilt-mappings-on-loom") version "4.2.1"
 
     id("com.modrinth.minotaur") version "2.4.4"
@@ -16,7 +16,7 @@ plugins {
 
 group = "dev.nyon"
 val majorVersion = "1.1.6"
-version = "$majorVersion-22w45a"
+version = "$majorVersion-1.19.3-rc1"
 description = "Adds an telekinesis enchantment to minecraft"
 val authors = listOf("btwonion")
 val githubRepo = "btwonion/telekinesis"
@@ -26,14 +26,14 @@ repositories {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:22w45a")
+    minecraft("com.mojang:minecraft:1.19.3-rc1")
     mappings(loom.layered {
-        //addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:22w45a+build.2:v2"))
+        //addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:1.19.3-rc1+build.4:v2"))
         officialMojangMappings()
     })
-    modImplementation("net.fabricmc:fabric-loader:0.14.10")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.66.1+1.19.3")
-    modImplementation("net.fabricmc:fabric-language-kotlin:1.8.6+kotlin.1.7.21")
+    modImplementation("net.fabricmc:fabric-loader:0.14.11")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.68.1+1.19.3")
+    modImplementation("net.fabricmc:fabric-language-kotlin:1.8.7+kotlin.1.7.22")
 
     include("com.akuleshov7:ktoml-core-jvm:0.3.0")
     implementation("com.akuleshov7:ktoml-core-jvm:0.3.0")
@@ -90,7 +90,7 @@ modrinth {
     versionNumber.set("${project.version}")
     versionType.set("release")
     uploadFile.set(tasks["remapJar"])
-    gameVersions.set(listOf("22w45a"))
+    gameVersions.set(listOf("1.19.3-pre2", "1.19.3-pre1"))
     loaders.set(listOf("fabric", "quilt"))
     dependencies {
         required.project("fabric-api")

diff --git a/src/main/java/dev/nyon/telekinesis/mixins/BlockMixin.java b/src/main/java/dev/nyon/telekinesis/mixins/BlockMixin.java
@@ -2,7 +2,6 @@
 
 import dev.nyon.telekinesis.TelekinesisKt;
 import dev.nyon.telekinesis.check.TelekinesisUtils;
-import dev.nyon.telekinesis.config.Config;
 import dev.nyon.telekinesis.config.ConfigKt;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;

diff --git a/src/main/java/dev/nyon/telekinesis/mixins/EnderManMixin.java b/src/main/java/dev/nyon/telekinesis/mixins/EnderManMixin.java
@@ -5,6 +5,7 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.monster.EnderMan;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,19 +18,19 @@ public class EnderManMixin {
         method = "dropCustomDeathLoot",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/monster/EnderMan;spawnAtLocation(Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/entity/item/ItemEntity;"
+            target = "Lnet/minecraft/world/entity/monster/EnderMan;spawnAtLocation(Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity;"
         )
     )
-    public ItemEntity manipulateDrops(EnderMan instance, ItemLike itemLike, DamageSource damageSource) {
+    public ItemEntity manipulateDrops(EnderMan instance, ItemStack itemStack, DamageSource damageSource, int i, boolean bl) {
         var enderman = (EnderMan) (Object) this;
         var telekinesisResult = TelekinesisUtils.hasNoTelekinesis(damageSource, enderman);
         if (
             !ConfigKt.getConfig().getMobDrops()
             || (telekinesisResult.component1() && !ConfigKt.getConfig().getOnByDefault())
             || telekinesisResult.component2() == null
-        ) return enderman.spawnAtLocation(itemLike);
+        ) return enderman.spawnAtLocation(itemStack);
         var player = telekinesisResult.component2();
-        if (!player.addItem(itemLike.asItem().getDefaultInstance())) return enderman.spawnAtLocation(itemLike);
+        if (!player.addItem(itemStack)) return enderman.spawnAtLocation(itemStack);
         return null;
     }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -17,9 +17,9 @@
   "version": "${version}",
   "environment": "*",
   "depends": {
-    "fabric-language-kotlin": ">=1.8.6+kotlin.1.7.21",
-    "fabric-api": ">=0.66.1+1.19.3",
-    "minecraft": ">=1.19.3-alpha.22.45.a"
+    "fabric-language-kotlin": ">=1.8.7+kotlin.1.7.22",
+    "fabric-api": ">=0.68.1+1.19.3",
+    "minecraft": ">=1.19.3-pre1"
   },
   "suggests": {
     "modmenu": ">=4.0.6"