From bdd3cb1c54ffa734b36355d06377293dce8b8049 Mon Sep 17 00:00:00 2001
From: Alex-the-666 <alex.rowlands@cox.net>
Date: Wed, 29 Jun 2022 11:06:00 -0700
Subject: [PATCH] 1.18.6

---
 build.gradle                                                | 4 ++--
 .../java/com/github/alexthe666/alexsmobs/ClientProxy.java   | 5 +++++
 .../alexthe666/alexsmobs/client/event/ClientEvents.java     | 6 ------
 src/main/resources/META-INF/mods.toml                       | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 054922356..63bb17001 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ repositories{
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.18.5'
+version = '1.18.6'
 group = 'com.github.alexthe667' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'alexsmobs'
 
@@ -119,7 +119,7 @@ mixin {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.2-40.1.0'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.52'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     compileOnly "curse.maven:citadel4-331936:3683009" // change to 3548061
     runtimeOnly "curse.maven:citadel4-331936:3683009"
diff --git a/src/main/java/com/github/alexthe666/alexsmobs/ClientProxy.java b/src/main/java/com/github/alexthe666/alexsmobs/ClientProxy.java
index d0da80f53..fdf85cf14 100644
--- a/src/main/java/com/github/alexthe666/alexsmobs/ClientProxy.java
+++ b/src/main/java/com/github/alexthe666/alexsmobs/ClientProxy.java
@@ -38,6 +38,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.level.material.Fluids;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ColorHandlerEvent;
@@ -252,6 +253,10 @@ public void clientInit() {
         //BlockEntityRenderers.register(AMTileEntityRegistry.END_PIRATE_ANCHOR_WINCH.get(), RenderEndPirateAnchorWinch::new);
         //BlockEntityRenderers.register(AMTileEntityRegistry.END_PIRATE_SHIP_WHEEL.get(), RenderEndPirateShipWheel::new);
         //BlockEntityRenderers.register(AMTileEntityRegistry.END_PIRATE_FLAG.get(), RenderEndPirateFlag::new);
+        //required for lava vision
+        RenderType lavaType = RenderType.translucent();
+        ItemBlockRenderTypes.setRenderLayer(Fluids.LAVA, lavaType);
+        ItemBlockRenderTypes.setRenderLayer(Fluids.FLOWING_LAVA, lavaType);
         Sheets.BANNER_MATERIALS.put(AMItemRegistry.PATTERN_BEAR, new Material(Sheets.BANNER_SHEET, AMItemRegistry.PATTERN_BEAR.location(true)));
         Sheets.BANNER_MATERIALS.put(AMItemRegistry.PATTER_AUSTRALIA_0, new Material(Sheets.BANNER_SHEET, AMItemRegistry.PATTER_AUSTRALIA_0.location(true)));
         Sheets.BANNER_MATERIALS.put(AMItemRegistry.PATTER_AUSTRALIA_1, new Material(Sheets.BANNER_SHEET, AMItemRegistry.PATTER_AUSTRALIA_1.location(true)));
diff --git a/src/main/java/com/github/alexthe666/alexsmobs/client/event/ClientEvents.java b/src/main/java/com/github/alexthe666/alexsmobs/client/event/ClientEvents.java
index 2e339dffa..2b69621f0 100644
--- a/src/main/java/com/github/alexthe666/alexsmobs/client/event/ClientEvents.java
+++ b/src/main/java/com/github/alexthe666/alexsmobs/client/event/ClientEvents.java
@@ -352,9 +352,6 @@ public void onRenderWorldLastEvent(RenderLevelLastEvent event) {
         if (!AMConfig.shadersCompat) {
             if (Minecraft.getInstance().player.hasEffect(AMEffectRegistry.LAVA_VISION)) {
                 if (!previousLavaVision) {
-                    RenderType lavaType = RenderType.translucent();
-                    ItemBlockRenderTypes.setRenderLayer(Fluids.LAVA, lavaType);
-                    ItemBlockRenderTypes.setRenderLayer(Fluids.FLOWING_LAVA, lavaType);
                     previousFluidRenderer = Minecraft.getInstance().getBlockRenderer().liquidBlockRenderer;
                     Minecraft.getInstance().getBlockRenderer().liquidBlockRenderer = new LavaVisionFluidRenderer();
                     updateAllChunks();
@@ -362,9 +359,6 @@ public void onRenderWorldLastEvent(RenderLevelLastEvent event) {
             } else {
                 if (previousLavaVision) {
                     if (previousFluidRenderer != null) {
-                        RenderType lavaType = RenderType.solid();
-                        ItemBlockRenderTypes.setRenderLayer(Fluids.LAVA, lavaType);
-                        ItemBlockRenderTypes.setRenderLayer(Fluids.FLOWING_LAVA, lavaType);
                         Minecraft.getInstance().getBlockRenderer().liquidBlockRenderer = previousFluidRenderer;
                     }
                     updateAllChunks();
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index accb512a7..941ae4301 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ license="GNU LESSER GENERAL PUBLIC LICENSE"
 issueTrackerURL="https://github.com/Alex-the-666/AlexsMobs/issues" #optional
 [[mods]] #mandatory
 modId="alexsmobs" #mandatory
-version="1.18.5" #mandatory
+version="1.18.6" #mandatory
 displayName="Alex's Mobs" #mandatory
 displayURL="https://www.curseforge.com/minecraft/mc-mods/alexs-mobs" #optional
 authors="Alexthe668, Carro1001" #optional