Port to 1.21.11

Author: OpenBagTwo

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
+    id 'fabric-loom' version '1.13-SNAPSHOT'
     id "fr.brouillard.oss.gradle.jgitver" version "0.9.1"
     id 'com.gradleup.shadow' version '9.2.2'
     id 'maven-publish'
@@ -57,7 +57,7 @@ dependencies {
 
     modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
     modRuntimeOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
-    modRuntimeOnly("maven.modrinth:jade:${project.jade_version}")
+//    modRuntimeOnly("maven.modrinth:jade:${project.jade_version}")
     modCompileOnly("com.github.glitchfiend:TerraBlender-fabric:${project.terrablender_version}")
     // Only comment in the line below when you're explicitly testing TerraBlender compat
 //    modRuntimeOnly("com.github.glitchfiend:TerraBlender-fabric:${project.terrablender_version}")

gradle.properties

@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 # Fabric Properties
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.1
-loader_version=0.17.2
+minecraft_version=1.21.11-pre1
+yarn_mappings=1.21.11-pre1+build.2
+loader_version=0.18.1
 # Mod Properties
 mod_version=handled.by.jgitver
 maven_group=io.github.openbagtwo.lighterend
 archives_base_name=lighterend
 # Dependencies
-fabric_version=0.135.0+1.21.10
+fabric_version=0.139.1+1.21.11
 # Optional
-modmenu_version=16.0.0-rc.1
+modmenu_version=17.0.0-alpha.1
 jade_version=20.0.5+fabric
 terrablender_version=1.21.10-21.10.0.0

src/client/java/io/github/openbagtwo/lighterend/blocks/BlockLayerRenderer.java

@@ -64,21 +64,18 @@ public static void initialize() {
         LighterEndBlocks.NEEDLEGRASS,
         LighterEndBlocks.MURKWEED,
         LighterEndBlocks.DRAGON_SAPLING,
-        LighterEndBlocks.POTTED_DRAGON_SAPLING
-    );
-    for (Block chandelier : LighterEndBlocks.COPPER_CHANDELIERS.getAll()) {
-      BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT, chandelier);
-    }
-
-    BlockRenderLayerMap.putBlocks(
-        BlockRenderLayer.CUTOUT_MIPPED,
+        LighterEndBlocks.POTTED_DRAGON_SAPLING,
         LighterEndBlocks.END_MOSS,
         LighterEndBlocks.UMBRALITH.baseBlock,
         LighterEndBlocks.END_STONE_QUARTZ_ORE,
         LighterEndBlocks.END_STONE_REDSTONE_ORE,
         LighterEndBlocks.UMBRALITH_QUARTZ_ORE,
         LighterEndBlocks.UMBRALITH_REDSTONE_ORE
     );
+    for (Block chandelier : LighterEndBlocks.COPPER_CHANDELIERS.getAll()) {
+      BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT, chandelier);
+    }
+
   }
 
 }

src/client/java/io/github/openbagtwo/lighterend/mixin/client/EndBiomeMusicMixin.java

@@ -1,19 +1,16 @@
 package io.github.openbagtwo.lighterend.mixin.client;
 
 import io.github.openbagtwo.lighterend.LighterEnd;
-import java.util.Optional;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.sound.MusicInstance;
-import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.GameRenderer;
 import net.minecraft.sound.MusicSound;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Nullables;
-import net.minecraft.util.collection.Pool;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
+import net.minecraft.world.attribute.EnvironmentAttributes;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -33,34 +30,41 @@ public abstract class EndBiomeMusicMixin {
   @Shadow
   public InGameHud inGameHud;
 
+  @Shadow
+  public GameRenderer gameRenderer;
+
 
   @Inject(method = "getMusicInstance", at = @At("HEAD"), cancellable = true)
-  public void checkForEndMusic(CallbackInfoReturnable<MusicInstance> cir) {
+  public void checkForEndMusic(CallbackInfoReturnable<MusicSound> cir) {
     MusicSound musicSound = Nullables.map(this.currentScreen, Screen::getMusic);
-    if (LighterEnd.CONFIG.playEndBiomeMusic() && musicSound == null && this.player != null) {
+    Camera camera = this.gameRenderer.getCamera();
+    if (
+        LighterEnd.CONFIG.playEndBiomeMusic()
+            && musicSound == null
+            && this.player != null
+            && camera != null
+    ) {
       World world = this.player.getEntityWorld();
       if (
           world.getRegistryKey() == World.END
               && !this.inGameHud.getBossBarHud().shouldPlayDragonMusic()
       ) {
-        RegistryEntry<Biome> registryEntry = world.getBiome(this.player.getBlockPos());
-        Biome biome = registryEntry.value();
-        Optional<Pool<MusicSound>> biomeMusic = biome.getMusic();
-        if (biomeMusic.isPresent()) {
-          float f = biome.getMusicVolume();
-          Optional<MusicSound> music = biomeMusic.get().getOrEmpty(world.random);
-          cir.setReturnValue(new MusicInstance(music.orElse(null), f));
-        } else {
+        MusicSound biomeMusic = camera.getEnvironmentAttributeInterpolator()
+            .get(EnvironmentAttributes.BACKGROUND_MUSIC_AUDIO, 1.0F).getCurrent(
+                this.player.getAbilities().creativeMode && this.player.getAbilities().allowFlying,
+                this.player.isSubmergedInWater()
+            ).orElse(null);
+        if (biomeMusic != null && biomeMusic.replaceCurrentMusic()) {
           cir.setReturnValue(
-              new MusicInstance(
-                  new MusicSound(SoundEvents.MUSIC_END, 6000, 24000, false)
+              new MusicSound(
+                  biomeMusic.sound(),
+                  biomeMusic.minDelay(),
+                  biomeMusic.maxDelay(),
+                  false
               )
           );
         }
-        cir.cancel();
       }
     }
-
   }
-
 }

src/client/java/io/github/openbagtwo/lighterend/mobs/models/CubozoaModel.java

@@ -7,7 +7,7 @@
 import net.minecraft.client.model.ModelPartData;
 import net.minecraft.client.model.ModelTransform;
 import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.client.render.entity.model.EntityModelPartNames;
@@ -58,7 +58,7 @@ public static TexturedModelData getTexturedModelData() {
   }
 
   public CubozoaModel(ModelPart modelPart) {
-    super(modelPart, RenderLayer::getEntityTranslucent);
+    super(modelPart, RenderLayers::entityTranslucent);
     tentacle = new ModelPart[TENTACLE_COUNT];
     tentacle_center = new ModelPart[TENTACLE_COUNT];
 

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/CubozoaRenderer.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
@@ -24,9 +25,9 @@ public class CubozoaRenderer extends
       LighterEnd.of("textures/entity/cubozoa/cubozoa_sulphur.png")
   );
   private static final List<RenderLayer> GLOW = Arrays.asList(
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/cubozoa/cubozoa_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/cubozoa/cubozoa_sulphur_glow.png"))
   );
 

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/DragonflyRenderer.java

@@ -5,6 +5,7 @@
 import io.github.openbagtwo.lighterend.mobs.EntityModels;
 import io.github.openbagtwo.lighterend.mobs.models.DragonflyModel;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
 import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
@@ -15,7 +16,7 @@ public class DragonflyRenderer extends
     MobEntityRenderer<Dragonfly, LivingEntityRenderState, DragonflyModel> {
 
   private static final Identifier TEXTURE = LighterEnd.of("textures/entity/dragonfly.png");
-  private static final RenderLayer GLOW = RenderLayer.getEyes(
+  private static final RenderLayer GLOW = RenderLayers.eyes(
       LighterEnd.of("textures/entity/dragonfly_glow.png")
   );
 

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/EndFishRenderer.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
@@ -30,21 +31,21 @@ public class EndFishRenderer extends
       LighterEnd.of("textures/entity/end_fish/end_fish_7.png")
   );
   private static final List<RenderLayer> GLOW = Arrays.asList(
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_0_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_1_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_2_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_3_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_4_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_5_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_6_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_fish/end_fish_7_glow.png"))
   );
 

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/EndSlimeRenderer.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
@@ -31,13 +32,13 @@ public class EndSlimeRenderer extends
       LighterEnd.of("textures/entity/end_slime/end_slime_amber.png")
   );
   private static final List<RenderLayer> GLOW = Arrays.asList(
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_slime/end_slime_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_slime/end_slime_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_slime/end_slime_lake_glow.png")),
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/end_slime/end_slime_amber_glow.png"))
   );
 
@@ -142,7 +143,7 @@ public void render(
                   this.model,
                   state,
                   matrixStack,
-                  RenderLayer.getEntityTranslucent(TEXTURES.get(state.variant % TEXTURES.size())),
+                  RenderLayers.entityTranslucent(TEXTURES.get(state.variant % TEXTURES.size())),
                   light,
                   j,
                   -1,
@@ -156,7 +157,7 @@ public void render(
                   this.model,
                   state,
                   matrixStack,
-                  RenderLayer.getEntityTranslucent(TEXTURES.get(state.variant % TEXTURES.size())),
+                  RenderLayers.entityTranslucent(TEXTURES.get(state.variant % TEXTURES.size())),
                   light,
                   j,
                   -1,

src/client/java/io/github/openbagtwo/lighterend/mobs/renderers/GlossyMooshroomRenderer.java

@@ -10,6 +10,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.AgeableMobEntityRenderer;
@@ -35,7 +36,7 @@ public class GlossyMooshroomRenderer extends
   );
 
   private static final List<RenderLayer> GLOW = Arrays.asList(
-      RenderLayer.getEyes(
+      RenderLayers.eyes(
           LighterEnd.of("textures/entity/glossy_mooshroom_glow.png")
       )
   );
@@ -188,7 +189,7 @@ private void renderMushroom(
       if (renderAsModel) {
         queue.submitBlockStateModel(
             matrices,
-            RenderLayer.getOutline(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE),
+            RenderLayers.outlineNoCull(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE),
             mushroomModel,
             0.0F, 0.0F, 0.0F, light, overlay, color
         );