Skip to content

Commit 6734d8c

Browse files
authored
fix failing builds due to Vintagium (#2521)
1 parent ec6b70e commit 6734d8c

4 files changed

Lines changed: 37 additions & 12 deletions

File tree

dependencies.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@ dependencies {
5757
compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
5858
compileOnly rfg.deobf("curse.maven:chisel-235279:2915375") // Chisel 1.0.2.45
5959

60-
// Special Vintagium Hackery
61-
// Vintagium is currently only distributed as a .zip containing the reobf and -dev jars on Github Actions, which is not ideal
62-
// Using a fake Ivy repo to download it does not work, as nightly.link does not support http HEAD requests, which Gradle wants
63-
mkdir("libs")
64-
// Using Gradle's Ant integration seems to be the least hacky way to download an arbitrary file without a plugin
65-
ant.get(src: "https://nightly.link/Asek3/sodium-1.12/workflows/gradle/12.x%2Fforge/Vintagium.zip",
66-
dest: "libs",
67-
skipexisting: 'true')
68-
ant.unzip(src: "libs/Vintagium.zip",
69-
dest: "libs")
70-
compileOnly(files("libs/vintagium-mc1.12.2-0.1-dev.jar"))
71-
7260
// Mods with Soft compat but which have no need to be in code, such as isModLoaded() checks and getModItem() recipes.
7361
// Uncomment any of these to test them in-game.
7462

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package me.jellysquid.mods.sodium.client.render.chunk.passes;
2+
3+
/**
4+
* Adapted and minimized from <a href="https://github.com/Asek3/sodium-1.12/blob/12.x/forge/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/passes/BlockRenderPass.java">BlockRenderPass.java</a>
5+
*/
6+
public enum BlockRenderPass {
7+
;
8+
9+
public static BlockRenderPass[] VALUES;
10+
public static int COUNT;
11+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package me.jellysquid.mods.sodium.client.util;
2+
3+
import net.minecraft.util.BlockRenderLayer;
4+
5+
import java.util.HashMap;
6+
import java.util.Map;
7+
8+
/**
9+
* Adapted and minimized from <a href="https://github.com/Asek3/sodium-1.12/blob/12.x/forge/src/main/java/me/jellysquid/mods/sodium/client/util/BufferSizeUtil.java">BufferSizeUtil.java</a>
10+
*/
11+
public class BufferSizeUtil {
12+
13+
public static final Map<BlockRenderLayer, Integer> BUFFER_SIZES = new HashMap<>();
14+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package me.jellysquid.mods.sodium.client.util;
2+
3+
import net.minecraft.util.BlockRenderLayer;
4+
5+
/**
6+
* Adapted and minimized from <a href="https://github.com/Asek3/sodium-1.12/blob/12.x/forge/src/main/java/me/jellysquid/mods/sodium/client/util/EnumUtil.java">EnumUtil.java</a>
7+
*/
8+
public class EnumUtil {
9+
10+
public static BlockRenderLayer[] LAYERS = BlockRenderLayer.values();
11+
12+
}

0 commit comments

Comments
 (0)