1.20.5 port

build.gradle

@@ -68,7 +68,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {

common/build.gradle

@@ -1,5 +1,5 @@
 architectury {
-    common("fabric", "forge", "neoforge")
+    common("fabric", "neoforge")
 }
 
 loom {

common/src/main/java/terrails/colorfulhearts/config/ConfigUtils.java

@@ -1,5 +1,6 @@
 package terrails.colorfulhearts.config;
 
+import net.minecraft.core.Holder;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffects;
@@ -76,7 +77,7 @@ public static void loadStatusEffectHearts() {
         LoaderExpectPlatform.heartRegistryEvent(registry);
     }
 
-    private static StatusEffectHeart buildEffectHearts(List<String> healthColors, List<String> absorptionColors, String effectName, MobEffect effect, ResourceLocation id) {
+    private static StatusEffectHeart buildEffectHearts(List<String> healthColors, List<String> absorptionColors, String effectName, Holder<MobEffect> effect, ResourceLocation id) {
         return buildEffectHearts(healthColors, absorptionColors, effectName, player -> player.hasEffect(effect), id);
     }
 

common/src/main/java/terrails/colorfulhearts/config/screen/ColorSelectionScreen.java

@@ -66,10 +66,6 @@ protected void init() {
         // create scrollable list widget and add it to this screen's children
         this.colorSelectionList = this.addRenderableWidget(new ScrollableWidgetList(Minecraft.getInstance(), width, height - marginY * 2, marginY, Button.DEFAULT_HEIGHT + 6));
 
-        // set background type
-        assert this.minecraft != null;
-        this.colorSelectionList.setRenderBackground(this.minecraft.level == null);
-
         // add elements to the scrollable widget
         this.addColorElements();
 

common/src/main/java/terrails/colorfulhearts/render/atlas/sources/ColoredHearts.java

@@ -4,6 +4,7 @@
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.client.renderer.texture.SpriteContents;
 import net.minecraft.client.renderer.texture.atlas.SpriteResourceLoader;
@@ -29,7 +30,7 @@
 
 public class ColoredHearts implements SpriteSource {
 
-    public static SpriteSourceType COLORED_HEARTS;
+    public static SpriteSourceType TYPE;
 
     private static final Codec<Boolean> IS_HEALTH = Codec.STRING.comapFlatMap(
             s -> {
@@ -45,9 +46,9 @@ public class ColoredHearts implements SpriteSource {
             bool -> bool ? "HEALTH" : "ABSORPTION"
     );
 
-    public static final Codec<ColoredHearts> CODEC = RecordCodecBuilder.create(
+    public static final MapCodec<ColoredHearts> CODEC = RecordCodecBuilder.mapCodec(
             instance -> instance.group(
-                    ColoredHearts.IS_HEALTH.fieldOf("heart").forGetter(codec -> codec.isHealth)
+                    ColoredHearts.IS_HEALTH.fieldOf("heart").forGetter(source -> source.isHealth)
             ).apply(instance, ColoredHearts::new)
     );
 
@@ -178,7 +179,7 @@ private Consumer<NativeImage> getBlendApplier(ResourceManager resourceManager, R
 
     @Override
     public @NotNull SpriteSourceType type() {
-        return ColoredHearts.COLORED_HEARTS;
+        return ColoredHearts.TYPE;
     }
 
     private record ColoredHeartsSupplier(

common/src/main/resources/colorfulhearts.accesswidener

@@ -1,5 +1,4 @@
 accessWidener   v2  named
 accessible  class   net/minecraft/client/gui/components/PlayerTabOverlay$HealthState
-accessible  class   net/minecraft/client/gui/Gui$HeartType
 accessible  method  com/mojang/blaze3d/platform/NativeImage isOutsideBounds (II)Z
-accessible  method  net/minecraft/client/renderer/texture/atlas/SpriteSources register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/client/renderer/texture/atlas/SpriteSourceType;
+accessible  method  net/minecraft/client/renderer/texture/atlas/SpriteSources register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;)Lnet/minecraft/client/renderer/texture/atlas/SpriteSourceType;

fabric/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     modImplementation("maven.modrinth:modmenu:${fabric_modmenu_version}")
     modImplementation("maven.modrinth:appleskin:${fabric_appleskin_version}")
     modRuntimeOnly("maven.modrinth:cloth-config:${fabric_clothconfig_version}")
-    modRuntimeOnly("maven.modrinth:raised:${fabric_raised_version}")
+//    modRuntimeOnly("maven.modrinth:raised:${fabric_raised_version}")
 }
 
 processResources {

fabric/src/main/java/terrails/colorfulhearts/fabric/ColorfulHearts.java

@@ -1,9 +1,14 @@
 package terrails.colorfulhearts.fabric;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.AtlasSourceTypeRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ObjectShare;
+import net.minecraft.client.renderer.texture.atlas.SpriteSourceType;
+import net.minecraft.resources.ResourceLocation;
+import terrails.colorfulhearts.CColorfulHearts;
 import terrails.colorfulhearts.fabric.config.FabConfig;
+import terrails.colorfulhearts.render.atlas.sources.ColoredHearts;
 
 public class ColorfulHearts implements ClientModInitializer {
 
@@ -12,9 +17,15 @@ public class ColorfulHearts implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         CONFIG = new FabConfig();
+        this.setupSpriteSource();
         this.setupObjectShare();
     }
 
+    private void setupSpriteSource() {
+        ColoredHearts.TYPE = new SpriteSourceType(ColoredHearts.CODEC);
+        AtlasSourceTypeRegistry.register(new ResourceLocation(CColorfulHearts.MOD_ID, "colored_hearts"), ColoredHearts.TYPE);
+    }
+
     private void setupObjectShare() {
         final ObjectShare objectShare = FabricLoader.getInstance().getObjectShare();
 

fabric/src/main/resources/colorfulhearts.mixins.json

@@ -6,7 +6,6 @@
   "plugin": "terrails.colorfulhearts.fabric.FabMixinPlugin",
   "client": [
     "GuiMixin",
-    "SpriteSourcesMixin",
     "compat.appleskin.HUDOverlayHandlerAccessor"
   ],
   "injectors": {

fabric/src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
   "depends": {
     "fabricloader": ">=0.14.19",
     "fabric-api": "*",
-    "minecraft": "=1.20.4",
+    "minecraft": "=1.20.5",
     "java": ">=17"
   }
 }