Created
June 13, 2022 21:27
-
-
Save magneticflux-/1f0b736f320399e71654229878d477e0 to your computer and use it in GitHub Desktop.
CullLessLeaves Sodium/next (b98aca11) patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java | |
--- a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java (revision 24be5bb32ad04a2c3393aba5adb35e7ed7a081cf) | |
+++ b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java (date 1655154435535) | |
@@ -1,11 +1,14 @@ | |
package dev.isxander.culllessleaves.mixins.sodiumcompat; | |
import dev.isxander.culllessleaves.compat.SodiumCompat; | |
-import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages; | |
-import me.jellysquid.mods.sodium.client.gui.options.*; | |
-import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; | |
-import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl; | |
-import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl; | |
+import net.caffeinemc.sodium.config.user.UserConfigCategories; | |
+import net.caffeinemc.sodium.config.user.options.OptionFlag; | |
+import net.caffeinemc.sodium.config.user.options.OptionGroup; | |
+import net.caffeinemc.sodium.config.user.options.OptionImpact; | |
+import net.caffeinemc.sodium.config.user.options.OptionImpl; | |
+import net.caffeinemc.sodium.gui.config.ControlValueFormatter; | |
+import net.caffeinemc.sodium.gui.config.SliderControl; | |
+import net.caffeinemc.sodium.gui.config.TickBoxControl; | |
import net.minecraft.text.Text; | |
import org.spongepowered.asm.mixin.Mixin; | |
import org.spongepowered.asm.mixin.Pseudo; | |
@@ -15,7 +18,7 @@ | |
import java.util.List; | |
@Pseudo | |
-@Mixin(value = SodiumGameOptionPages.class, remap = false) | |
+@Mixin(value = UserConfigCategories.class, remap = false) | |
public class SodiumGameOptionPagesMixin { | |
@ModifyVariable(method = "performance", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;copyOf(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;")) | |
private static List<OptionGroup> addLeavesCulling(List<OptionGroup> groups) { | |
Index: src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java | |
--- a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java (revision 24be5bb32ad04a2c3393aba5adb35e7ed7a081cf) | |
+++ b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java (date 1655154384242) | |
@@ -17,7 +17,7 @@ | |
* culling leaves when set to fast | |
* | |
* this mixin simply reverts to vanilla behaviour | |
- * @see me.jellysquid.mods.sodium.mixin.features.render_layer.leaves.MixinLeavesBlock | |
+ * @see net.caffeinemc.sodium.mixin.features.render_layer.leaves.MixinLeavesBlock | |
*/ | |
@Override | |
@SuppressWarnings("deprecation") | |
Index: src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java | |
--- a/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java (revision 24be5bb32ad04a2c3393aba5adb35e7ed7a081cf) | |
+++ b/src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java (date 1655154384236) | |
@@ -2,7 +2,7 @@ | |
import com.llamalad7.mixinextras.injector.ModifyExpressionValue; | |
import dev.isxander.culllessleaves.CullLessLeaves; | |
-import me.jellysquid.mods.sodium.client.render.occlusion.BlockOcclusionCache; | |
+import net.caffeinemc.sodium.render.terrain.BlockOcclusionCache; | |
import net.minecraft.block.BlockState; | |
import net.minecraft.block.LeavesBlock; | |
import net.minecraft.util.math.BlockPos; | |
Index: build.gradle.kts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/build.gradle.kts b/build.gradle.kts | |
--- a/build.gradle.kts (revision 24be5bb32ad04a2c3393aba5adb35e7ed7a081cf) | |
+++ b/build.gradle.kts (date 1655155416671) | |
@@ -47,7 +47,7 @@ | |
} | |
// sodium compat | |
- modImplementation("me.jellysquid.mods:sodium-fabric:0.4.2-beta.1+rev.0cb72af") | |
+ modImplementation(files("libs/sodium-fabric-0.5.0+mc1.19-unstable.jar")) | |
} | |
tasks { | |
Index: src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java b/src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java | |
--- a/src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java (revision 24be5bb32ad04a2c3393aba5adb35e7ed7a081cf) | |
+++ b/src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java (date 1655154384254) | |
@@ -2,9 +2,9 @@ | |
import dev.isxander.culllessleaves.CullLessLeaves; | |
import dev.isxander.culllessleaves.config.CullLessLeavesConfig; | |
-import me.jellysquid.mods.sodium.client.SodiumClientMod; | |
-import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; | |
import me.shedaniel.autoconfig.AutoConfig; | |
+import net.caffeinemc.sodium.SodiumClientMod; | |
+import net.caffeinemc.sodium.config.user.options.storage.OptionStorage; | |
import net.minecraft.client.MinecraftClient; | |
public class SodiumCompat { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment