Update to 1.18.2

Ladysnake · Mar 3, 2022 · c8f9ba7 · c8f9ba7
1 parent 6a9c8ec
commit c8f9ba7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,8 @@
 import java.time.Year
 
 plugins {
-    id 'fabric-loom' version '0.10-SNAPSHOT'
-    id 'org.quiltmc.quilt-mappings-on-loom' version "3.1.1"
-    id 'io.github.juuxel.loom-quiltflower-mini' version "1.1.0"
+    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'io.github.juuxel.loom-quiltflower' version "1.6.0"
     id 'org.cadixdev.licenser' version "0.6.1"
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id 'com.jfrog.artifactory' version '4.21.0'
@@ -54,9 +53,7 @@ repositories {
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings(loom.layered {
-        addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${project.quilt_mappings}:v2"))
-    })
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
     modLocalRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"

diff --git a/gradle.properties b/gradle.properties
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.18
-yarn_mappings=1.18+build.1
-loader_version=0.12.6
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.1
+loader_version=0.13.3
 
 #Fabric api
-fabric_version=0.43.1+1.18
+fabric_version=0.47.8+1.18.2
 
 quilt_mappings=1
 

diff --git a/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java b/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java
@@ -55,7 +55,7 @@ public abstract class WorldRendererMixin {
             ),
             to = @At(
                 value = "INVOKE",
-                target = "Lnet/minecraft/client/render/SkyProperties;isDarkened()Z"
+                target = "Lnet/minecraft/client/render/DimensionEffects;isDarkened()Z"
             )
         ),
         locals = LocalCapture.CAPTURE_FAILSOFT

diff --git a/src/main/java/ladysnake/satin/mixin/client/iris/IrisRenderLayerWrapperMixin.java b/src/main/java/ladysnake/satin/mixin/client/iris/IrisRenderLayerWrapperMixin.java
@@ -17,7 +17,6 @@
  */
 package ladysnake.satin.mixin.client.iris;
 
-import ladysnake.satin.api.util.RenderLayerHelper;
 import ladysnake.satin.impl.RenderLayerDuplicator;
 import net.coderbot.iris.layer.IrisRenderTypeWrapper;
 import net.coderbot.iris.layer.UseProgramRenderStateShard;

diff --git a/src/testmod/java/ladysnake/satinrenderlayer/SatinRenderLayerTest.java b/src/testmod/java/ladysnake/satinrenderlayer/SatinRenderLayerTest.java
@@ -91,7 +91,7 @@ public static void onInitializeClient() {
                     illusionEffect.render(tickDelta);
                     client.getFramebuffer().beginWrite(true);
                     RenderSystem.enableBlend();
-                    RenderSystem.blendFuncSeparate(GlStateManager.class_4535.SRC_ALPHA, GlStateManager.class_4534.ONE_MINUS_SRC_ALPHA, GlStateManager.class_4535.ZERO, GlStateManager.class_4534.ONE);
+                    RenderSystem.blendFuncSeparate(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcFactor.ZERO, GlStateManager.DstFactor.ONE);
                     illusionBuffer.draw(client.getWindow().getFramebufferWidth(), client.getWindow().getFramebufferHeight(), false);
                     illusionBuffer.clear();
                     client.getFramebuffer().beginWrite(true);