More 1.21.8 rendering fixes

CHANGELOG-LATEST.md

···
-### Added
-- Backported all content from Infinite Dimensions v2.5 to 1.20.1. Primarily, this includes:
-  - A new amendments system, which allows for easy handling of modular config files - changing weights of any entries in any randomization pools or eliminating them altogether, based on a robust system of selectors. Default amendments bundled with the mod resolve some major earlier incompatibilities (aether, alex's caves, oritech) and it is recommended to have [Mod Menu](https://modrinth.com/mod/modmenu) and [Cloth Config](https://modrinth.com/mod/cloth-config) installed if you want to add more of them.
-  - Random lakes are back, ocean vegetation is no longer hardcoded, fossils and Bonus Chests are introduced (rarity of both under review). 
-  - A `/warp random` command that does what you'd expect (good for datapacks that randomly warp you every `n` minutes)
-  - A new "safe mode" setting is introduced that disables all block entities from being used in future dimensions for terrain generation - may be useful in heavily modded environments.
-  - Every end gateway in random dimensions now teleports to a different point.
-  - Coral no longer decays in random dimensions.
-- Ported to 1.21.8. This port is in beta, please note the following:
-  - This port is experimental and some features may not work as intended, notably custom skies and shaders, including the iridesecence shaders. Fixes for these are planned.
-  - Item and entity rendering *should* be working as intended despite major rewrites, please report if you find this to not be the case.
-  - Create integration has been modified to support [Create Fly](<https://modrinth.com/mod/create-fly>) and EMI integration has been changed to support [EIV](<https://modrinth.com/mod/eiv>).
-  - This version will likely be dropped in the future in favour of 26.1.
-
-### Changed
-- Major internal refactors to allow Infinite Dimensions to build for multiple versions of Minecraft at once.
-- Required elements of Forgified Fabric API are now bundled on 1.20.1. All versions now only depend on Architectury API.
-
 ### Fixed
-- Infinite Dimensions now gracefully handles mods with invalid block entities instead of allowing Minecraft to crash with from invalid player data.
-- Crash from Coral Blocks attempting to generate too early.
+- Star and sky rendering on 1.21.8
+- Iridesence tinting in EIV.
+- Crash rendering Chaos Pawns.
+- Crash on dedicated NeoForge servers.
+- Crash from `alphatree` on NeoForge.

CHANGELOG.md

···
+### Added
+- Backported all content from Infinite Dimensions v2.5 to 1.20.1. Primarily, this includes:
+    - A new amendments system, which allows for easy handling of modular config files - changing weights of any entries in any randomization pools or eliminating them altogether, based on a robust system of selectors. Default amendments bundled with the mod resolve some major earlier incompatibilities (aether, alex's caves, oritech) and it is recommended to have [Mod Menu](https://modrinth.com/mod/modmenu) and [Cloth Config](https://modrinth.com/mod/cloth-config) installed if you want to add more of them.
+    - Random lakes are back, ocean vegetation is no longer hardcoded, fossils and Bonus Chests are introduced (rarity of both under review).
+    - A `/warp random` command that does what you'd expect (good for datapacks that randomly warp you every `n` minutes)
+    - A new "safe mode" setting is introduced that disables all block entities from being used in future dimensions for terrain generation - may be useful in heavily modded environments.
+    - Every end gateway in random dimensions now teleports to a different point.
+    - Coral no longer decays in random dimensions.
+- Ported to 1.21.8. This port is in beta, please note the following:
+    - This port is experimental and some features may not work as intended, notably custom skies and shaders, including the iridesecence shaders. Fixes for these are planned.
+    - Item and entity rendering *should* be working as intended despite major rewrites, please report if you find this to not be the case.
+    - Create integration has been modified to support [Create Fly](<https://modrinth.com/mod/create-fly>) and EMI integration has been changed to support [EIV](<https://modrinth.com/mod/eiv>).
+    - This version will likely be dropped in the future in favour of 26.1.
+
+### Changed
+- Major internal refactors to allow Infinite Dimensions to build for multiple versions of Minecraft at once.
+- Required elements of Forgified Fabric API are now bundled on 1.20.1. All versions now only depend on Architectury API.
+
+### Fixed
+- Infinite Dimensions now gracefully handles mods with invalid block entities instead of allowing Minecraft to crash with from invalid player data.
+- Crash from Coral Blocks attempting to generate too early.

build.forge.gradle.kts

···
     ?: emptyList()
 
 publishMods {
-    file = tasks.jar.map { it.archiveFile.get() }
+    file = (tasks.named<org.gradle.jvm.tasks.Jar>("reobfJar").map { it.archiveFile.get() })
     additionalFiles.from(tasks.named<org.gradle.jvm.tasks.Jar>("sourcesJar").map { it.archiveFile.get() })
 
     type = STABLE

src/main/java/net/lerariemann/infinity/compat/eiv/iridescence_crafting/IridescenceCraftingViewType.java

···
 
 import de.crafty.eiv.common.api.recipe.IEivRecipeViewType;
 import de.crafty.eiv.common.recipe.inventory.RecipeViewMenu;
+import net.lerariemann.infinity.registry.core.ModBlocks;
 import net.lerariemann.infinity.registry.core.ModItems;
 import net.lerariemann.infinity.util.InfinityMethods;
 import net.minecraft.network.chat.Component;
···
 
     @Override
     public List<ItemStack> getCraftReferences() {
-        return List.of(ModItems.IRIDESCENCE_BUCKET.get().getDefaultInstance());
+        return List.of(ModItems.IRIDESCENCE_BUCKET.get().getDefaultInstance(), new ItemStack(ModBlocks.IRIDESCENCE.get()));
     }
 
 }

src/main/java/net/lerariemann/infinity/entity/client/ChaosPawnRenderer.java

···
     public ChaosPawnRenderState createRenderState() {
         return new ChaosPawnRenderState();
     }
+
+    @Override
+    public void extractRenderState(ChaosPawn entity, ChaosPawnRenderState reusedState, float partialTick) {
+        super.extractRenderState(entity, reusedState, partialTick);
+        reusedState.colors = entity.getColors();
+        reusedState.id = entity.getId();
+        if (entity.hasCustomName())
+            reusedState.customName = entity.getCustomName().getString();
+    }
+
     @Override
     public ResourceLocation getTextureLocation(ChaosPawnRenderState renderState) {
         return TEXTURE;

src/main/java/net/lerariemann/infinity/entity/custom/ChaosPawn.java

···
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.codec.ByteBufCodecs;
-import net.minecraft.world.entity.SpawnPlacementType;
 //?}
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
···
 @ParametersAreNonnullByDefault
 //?}
 public class ChaosPawn extends AbstractChessFigure {
-    public static final EntityDataAccessor<CompoundTag> colors = SynchedEntityData.defineId(ChaosPawn.class,
-            //? if >1.21.4 {
-            EntityDataSerializer.forValueType(ByteBufCodecs.COMPOUND_TAG)
-            //?} else {
-            /*EntityDataSerializers.COMPOUND_TAG
-            *///?}
-    );
+
+    public static final EntityDataAccessor<CompoundTag> colors = SynchedEntityData.defineId(ChaosPawn.class, EntityDataSerializers.COMPOUND_TAG);
     public static final EntityDataAccessor<Integer> special_case = SynchedEntityData.defineId(ChaosPawn.class, EntityDataSerializers.INT);
 
     public ChaosPawn(EntityType<? extends ChaosPawn> entityType, Level world) {

src/main/java/net/lerariemann/infinity/mixin/eiv/FluidItemRendererMixin.java

···
+package net.lerariemann.infinity.mixin.eiv;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+//? >1.21.4
+import de.crafty.eiv.common.extra.FluidItemSpecialRenderer;
+import net.lerariemann.infinity.iridescence.Iridescence;
+import net.lerariemann.infinity.registry.core.ModBlocks;
+import net.lerariemann.infinity.util.platform.InfinityPlatform;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.awt.*;
+
+//? if >1.21.4 {
+@Pseudo
+@Mixin(FluidItemSpecialRenderer.class)
+// EIV only tints fluids if they are water. This provides the appropriate tinting to Iridescence.
+public class FluidItemRendererMixin {
+
+	@WrapOperation(method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IIZ)V", at = @At(value = "INVOKE", target = "Ljava/awt/Color;getRed()I"))
+	int fixRed(Color instance, Operation<Integer> original, @Local ItemStack stack) {
+		if (stack.is(ModBlocks.IRIDESCENCE.get().asItem())) {
+			return new Color(Iridescence.getTimeBasedColor()).getRed();
+		}
+		return original.call(instance);
+	}
+
+	@WrapOperation(method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IIZ)V", at = @At(value = "INVOKE", target = "Ljava/awt/Color;getBlue()I"))
+	int fixBlue(Color instance, Operation<Integer> original, @Local ItemStack stack) {
+		if (stack.is(ModBlocks.IRIDESCENCE.get().asItem())) {
+			return new Color(Iridescence.getTimeBasedColor()).getBlue();
+		}
+		return original.call(instance);
+	}
+
+	@WrapOperation(method = "render(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IIZ)V", at = @At(value = "INVOKE", target = "Ljava/awt/Color;getGreen()I"))
+	int fixGreen(Color instance, Operation<Integer> original, @Local ItemStack stack) {
+		if (stack.is(ModBlocks.IRIDESCENCE.get().asItem())) {
+			return new Color(Iridescence.getTimeBasedColor()).getGreen();
+		}
+		return original.call(instance);
+	}
+}
+//?} else {
+/*@Mixin(Iridescence.class)
+public class FluidItemRendererMixin {}
+*///?}

src/main/java/net/lerariemann/infinity/mixin/iridescence/PostEffectProcessorMixin.java

···
 package net.lerariemann.infinity.mixin.iridescence;
 
 //? if <1.21.2 {
-/*
-import net.lerariemann.infinity.util.loading.ShaderLoader;
+
+/*import net.lerariemann.infinity.util.loading.ShaderLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.PostPass;
 import org.spongepowered.asm.mixin.Final;

src/main/java/net/lerariemann/infinity/util/VersionMethods.java

···
 
 import net.lerariemann.infinity.access.GameRendererAccess;
 import net.lerariemann.infinity.registry.core.ModComponentTypes;
+import net.minecraft.client.Minecraft;
 //? if >1.21 {
 import dev.architectury.registry.registries.RegistrySupplier;
-import net.minecraft.client.Minecraft;
 import net.minecraft.core.*;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.component.DataComponentType;

src/main/java/net/lerariemann/infinity/util/core/NbtUtils.java

···
         *///?}
     }
     static int getInt(CompoundTag data, String key, int def) {
+        if (data == null) return def;
         //? if >1.21.5 {
         return data.getIntOr(key, def);
         //?} else {

src/main/java/net/lerariemann/infinity/util/platform/neoforge/InfinityModNeoforge.java

···
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackSource;
-import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.event.AddPackFindersEvent;
 import net.neoforged.neoforge.event.entity.RegisterSpawnPlacementsEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
···
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
 import static net.lerariemann.infinity.InfinityMod.MOD_ID;
-import static net.lerariemann.infinity.registry.var.ModPayloads.*;
 
 @Mod(MOD_ID)
 @EventBusSubscriber(modid = MOD_ID)

src/main/resources/accesswideners/1.21.10.accesswidener

···
 accessible method net/minecraft/world/level/block/NetherPortalBlock getDimensionTransitionFromExit (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition;
 accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
 accessible class net/minecraft/server/level/ServerPlayer$RespawnPosAngle
-accessible class net/minecraft/core/MappedRegistry$TagSet
+accessible class net/minecraft/core/MappedRegistry$TagSet
+accessible method net/minecraft/client/renderer/GameRenderer setPostEffect (Lnet/minecraft/resources/ResourceLocation;)V

src/main/resources/accesswideners/1.21.8.accesswidener

···
 accessible method net/minecraft/world/level/block/NetherPortalBlock getDimensionTransitionFromExit (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition;
 accessible method net/minecraft/world/level/levelgen/structure/Structure findGenerationPoint (Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;)Ljava/util/Optional;
 accessible class net/minecraft/server/level/ServerPlayer$RespawnPosAngle
-accessible class net/minecraft/core/MappedRegistry$TagSet
+accessible class net/minecraft/core/MappedRegistry$TagSet
+accessible method net/minecraft/client/renderer/GameRenderer setPostEffect (Lnet/minecraft/resources/ResourceLocation;)V

src/main/resources/infinity.mixins.json

···
     "core.ServerPlayerEntityMixin",
     "core.SimpleRegistryMixin",
     "core.StructureMixin",
+    "eiv.FluidItemRendererMixin",
     "fixes.AquifierSamplerImplMixin",
     "fixes.BeeGoalMixin",
     "fixes.BeeGoalMixin$BeeGoalMixin2",
···
     "iridescence.RenderSystemMixin",
     "options.BackgroundRendererMixin",
     "options.ClientWorldMixin",
-    "options.GameRendererMixin",
     "options.FogRendererMixin",
+    "options.GameRendererMixin",
     "options.MinecraftClientMixin",
     "options.SoundSystemMixin",
     "options.WorldRendererMixin",