Merge pull request #93 from Lolothepro/1.18

Oculus 1.5.2 compat
iPortalTeam · Apr 21, 2023 · 212719f · 212719f
2 parents 99ad548 + 9356ca1
commit 212719f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,18 +13,18 @@ cloth_config_version=6.2.57
 
 minecraft_version=1.18.2
 mapping_version=2022.07.10
-loader_version=40.1.60
+loader_version=40.2.1
 
 # Dependencies
-pehkui_version=3.6.2-1.18.2-forge
+pehkui_version=3.7.3-1.18.2-forge
 #twilightforest_version=4.1.999
-twilightforest_fileid=3998681
+twilightforest_fileid=4337390
 flywheel_version=0.6.8-98
-rubidium_fileid=4024781
-oculus_fileid=4110355
+rubidium_fileid=4494903
+oculus_fileid=4451905
 curios_version=1.18.2-5.0.7.1
-tconstruct_fileid=3829979
-mantle_fileid=3829975
-sereneseasons_fileid=3804257
+tconstruct_fileid=4395997
+mantle_fileid=4353120
+sereneseasons_fileid=3693807
 mekanism_fileid=3875976
-immersiveengineering_fileid=3964014
+immersiveengineering_fileid=4412849
diff --git a/...src/main/java/qouteall/imm_ptl/core/compat/mixin/MixinIrisSodiumChunkShaderInterface.java b/...src/main/java/qouteall/imm_ptl/core/compat/mixin/MixinIrisSodiumChunkShaderInterface.java
@@ -4,6 +4,7 @@
 import net.coderbot.iris.compat.sodium.impl.shader_overrides.ShaderBindingContextExt;
 import net.coderbot.iris.gl.blending.BlendModeOverride;
 import net.coderbot.iris.pipeline.SodiumTerrainPipeline;
+import net.coderbot.iris.uniforms.custom.CustomUniforms;
 
 import org.lwjgl.opengl.GL20C;
 import org.lwjgl.opengl.GL21;
@@ -35,8 +36,8 @@ private void ip_init(int shaderId) {
     )
     private void onInit(
         int handle,
-        ShaderBindingContextExt par2, SodiumTerrainPipeline par3,
-        boolean par4, BlendModeOverride par5, List par6, float par7, CallbackInfo ci
+        ShaderBindingContextExt par2, SodiumTerrainPipeline par3, boolean par4,
+        BlendModeOverride par5, List par6, float par7, CustomUniforms par8, CallbackInfo ci
     ) {
         ip_init(handle);
     }