From 4a2c351aaee6d0281935f9f26b6c245e3d2f1895 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 15 Dec 2022 11:15:50 +0000
Subject: [PATCH] Soften the dependency on sodium for being able to build

---
 build.gradle                                  | 40 +++----------------
 .../sodium/MixinSodiumWorldRenderer.java      |  3 +-
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/build.gradle b/build.gradle
index e3c4a6e0..50a0b24c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,41 +22,16 @@ loom {
 
 reckon {
     scopeFromProp()
-    stageFromProp('beta', 'rc', 'final')
+    stageFromProp 'beta', 'rc', 'final'
 }
 
 repositories {
     mavenLocal()
-    maven {
-        name = 'modrinth'
-        url = "https://api.modrinth.com/maven"
-    }
-    maven {
-        name = 'modmenu'
-        url = 'https://maven.terraformersmc.com/releases'
-    }
-    maven {
-        url "https://maven.jamieswhiteshirt.com/libs-release"
-        content {
-            includeGroup "com.jamieswhiteshirt"
-        }
-    }
-    maven {
-        name = 'minelp'
-        url = 'https://repo.minelittlepony-mod.com/maven/snapshot'
-    }
-    maven {
-        name = 'minelp-release'
-        url = 'https://repo.minelittlepony-mod.com/maven/release'
-    }
-    maven {
-        name = "TerraformersMC"
-        url = "https://maven.terraformersmc.com/"
-    }
-    maven {
-        name = "Ladysnake Libs"
-        url = "https://ladysnake.jfrog.io/artifactory/mods"
-    }
+    maven { name 'entity-reach-attributes'; url 'https://maven.jamieswhiteshirt.com/libs-release' }
+    maven { name 'trinkets'; url 'https://ladysnake.jfrog.io/artifactory/mods' }
+    maven { name 'mod-menu'; url 'https://maven.terraformersmc.com/' }
+    maven { name 'minelp'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' }
+    maven { name 'minelp-release'; url 'https://repo.minelittlepony-mod.com/maven/release' }
 }
 
 dependencies {
@@ -74,9 +49,6 @@ dependencies {
     include "com.jamieswhiteshirt:reach-entity-attributes:${project.reach_attributes_version}"
 
     modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-    modApi "maven.modrinth:sodium:mc1.19.2-0.4.4"
-    compileOnly "org.joml:joml:1.10.4"
-
     modCompileOnly "dev.emi:trinkets:3.4.0"
 }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/client/sodium/MixinSodiumWorldRenderer.java b/src/main/java/com/minelittlepony/unicopia/mixin/client/sodium/MixinSodiumWorldRenderer.java
index f1775201..387e18d8 100644
--- a/src/main/java/com/minelittlepony/unicopia/mixin/client/sodium/MixinSodiumWorldRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/client/sodium/MixinSodiumWorldRenderer.java
@@ -7,11 +7,10 @@ import org.spongepowered.asm.mixin.injection.*;
 import com.minelittlepony.unicopia.client.ClientBlockDestructionManager;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.*;
 
-@Mixin(SodiumWorldRenderer.class)
+@Mixin(targets = { "me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer" }, remap = false)
 abstract class MixinSodiumWorldRenderer {
     @ModifyVariable(method = "renderTileEntities", at = @At("HEAD"))
     public Long2ObjectMap<SortedSet<BlockBreakingInfo>> modifyDestruction(Long2ObjectMap<SortedSet<BlockBreakingInfo>> blockBreakingProgressions) {