From 196b38214acbbd7d0a75a9bdf5e72bfb711d2883 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Mon, 25 Nov 2024 17:41:46 -0600 Subject: [PATCH] port work --- build.gradle | 2 +- gradle.properties | 24 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../rainglow/config/CustomModeScreen.java | 2 +- .../ix0rai/rainglow/mixin/DyeItemMixin.java | 2 +- .../rainglow/mixin/GlowSquidEntityMixin.java | 2 +- .../client/SlimeEntityRendererMixin.java | 5 ++-- .../mixin/client/SquidInkParticleMixin.java | 4 ++-- src/main/resources/fabric.mod.json | 6 ++--- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 16c449d..9de9fd6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.6.+" + id "fabric-loom" version "1.7.+" id "com.github.johnrengelman.shadow" version "7.1.+" id "me.modmuss50.mod-publish-plugin" version "0.5.2" } diff --git a/gradle.properties b/gradle.properties index 0fd3931..a1f7c89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,22 @@ # increase gradle memory -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs = -Xmx1G # minecraft, mappings and loader dependencies # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.1 -quilt_mappings=2 -loader_version=0.15.11 -kaleido_config_version=0.3.1+1.3.2 +minecraft_version = 1.21.3 +quilt_mappings = 6 +loader_version = 0.16.7 +kaleido_config_version = 0.3.1+1.3.2 # mod properties -mod_version=1.3.5+mc1.21.1 -maven_group=rainglow -archives_base_name=rainglow +mod_version = 1.3.5+mc1.21.3 +maven_group = rainglow +archives_base_name = rainglow # other dependencies -java_version=21 -mod_menu_version=11.0.1 -fabric_api_version=0.102.0+1.21.1 +java_version = 21 +mod_menu_version = 12.0.0-beta.1 +fabric_api_version = 0.107.0+1.21.3 pub.should_publish = true -pub.additional_versions = 1.21 \ No newline at end of file +pub.additional_versions = 1.21.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/io/ix0rai/rainglow/config/CustomModeScreen.java b/src/main/java/io/ix0rai/rainglow/config/CustomModeScreen.java index 2b593b6..5377505 100644 --- a/src/main/java/io/ix0rai/rainglow/config/CustomModeScreen.java +++ b/src/main/java/io/ix0rai/rainglow/config/CustomModeScreen.java @@ -111,7 +111,7 @@ protected void repositionElements() { private static void sendNoColoursToast() { Toast toast = new SystemToast(SystemToast.Id.PACK_LOAD_FAILURE, Rainglow.translatableText("config.no_custom_colours"), Rainglow.translatableText("config.no_custom_colours_description")); - MinecraftClient.getInstance().getToastManager().add(toast); + MinecraftClient.getInstance().method_1566().method_1999(toast); } @Override diff --git a/src/main/java/io/ix0rai/rainglow/mixin/DyeItemMixin.java b/src/main/java/io/ix0rai/rainglow/mixin/DyeItemMixin.java index 40a4a07..7685cb4 100644 --- a/src/main/java/io/ix0rai/rainglow/mixin/DyeItemMixin.java +++ b/src/main/java/io/ix0rai/rainglow/mixin/DyeItemMixin.java @@ -37,7 +37,7 @@ private void useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity } Rainglow.setColour(entity, colour); - cir.setReturnValue(ActionResult.success(user.getWorld().isClient())); + cir.setReturnValue(ActionResult.SUCCESS); } } } diff --git a/src/main/java/io/ix0rai/rainglow/mixin/GlowSquidEntityMixin.java b/src/main/java/io/ix0rai/rainglow/mixin/GlowSquidEntityMixin.java index cf06b45..5bf411d 100644 --- a/src/main/java/io/ix0rai/rainglow/mixin/GlowSquidEntityMixin.java +++ b/src/main/java/io/ix0rai/rainglow/mixin/GlowSquidEntityMixin.java @@ -5,7 +5,7 @@ import io.ix0rai.rainglow.data.RainglowEntity; import io.ix0rai.rainglow.data.GlowSquidVariantProvider; import net.minecraft.entity.EntityType; -import net.minecraft.entity.mob.WaterCreatureEntity; +import net.minecraft.entity.passive.WaterCreatureEntity; import net.minecraft.entity.passive.GlowSquidEntity; import net.minecraft.entity.passive.SquidEntity; import net.minecraft.nbt.NbtCompound; diff --git a/src/main/java/io/ix0rai/rainglow/mixin/client/SlimeEntityRendererMixin.java b/src/main/java/io/ix0rai/rainglow/mixin/client/SlimeEntityRendererMixin.java index fe16520..b41e81a 100644 --- a/src/main/java/io/ix0rai/rainglow/mixin/client/SlimeEntityRendererMixin.java +++ b/src/main/java/io/ix0rai/rainglow/mixin/client/SlimeEntityRendererMixin.java @@ -3,6 +3,7 @@ import io.ix0rai.rainglow.data.RainglowEntity; import net.minecraft.client.render.entity.SlimeEntityRenderer; import net.minecraft.entity.mob.SlimeEntity; +import net.minecraft.unmapped.C_oeatwgky; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -11,8 +12,8 @@ @Mixin(SlimeEntityRenderer.class) public class SlimeEntityRendererMixin { - @Inject(method = "getTexture*", at = @At("HEAD"), cancellable = true) - public void getTexture(SlimeEntity entity, CallbackInfoReturnable cir) { + @Inject(method = "m_vhdjjpxx", at = @At("HEAD"), cancellable = true) + public void getTexture(C_oeatwgky c_oeatwgky, CallbackInfoReturnable cir) { RainglowEntity.SLIME.overrideTexture(entity, cir); } } diff --git a/src/main/java/io/ix0rai/rainglow/mixin/client/SquidInkParticleMixin.java b/src/main/java/io/ix0rai/rainglow/mixin/client/SquidInkParticleMixin.java index a6ae80b..638327d 100644 --- a/src/main/java/io/ix0rai/rainglow/mixin/client/SquidInkParticleMixin.java +++ b/src/main/java/io/ix0rai/rainglow/mixin/client/SquidInkParticleMixin.java @@ -6,9 +6,9 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.particle.SquidInkParticle; -import net.minecraft.client.util.ColorUtil; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.DefaultParticleType; +import net.minecraft.util.ArgbHelper; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -50,7 +50,7 @@ public void createParticle(DefaultParticleType defaultParticleType, ClientWorld rgb = RainglowColour.WHITE.getInkRgb(); } - cir.setReturnValue(new SquidInkParticle(clientWorld, d, e, f, g, h, i, ColorUtil.Argb32.of(255, (int) rgb.r(), (int) rgb.g(), (int) rgb.b()), this.spriteProvider)); + cir.setReturnValue(new SquidInkParticle(clientWorld, d, e, f, g, h, i, ArgbHelper.color(255, (int) rgb.r(), (int) rgb.g(), (int) rgb.b()), this.spriteProvider)); } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 672c8dd..2e356bd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,14 +37,14 @@ }, "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.16.7", "fabric-resource-loader-v0": "*", "fabric-networking-api-v1": "*", - "minecraft": ">=1.21" + "minecraft": ">=1.21.2" }, "suggests": { - "modmenu": ">=11.0.0-" + "modmenu": ">=12.0.0-" }, "custom": {