Skip to content

Commit 3edb45c

Browse files
committed
Compat with stable malilib
Signed-off-by: Hendrix-Shen <HendrixShen@hendrixshen.top>
1 parent 2977b69 commit 3edb45c

File tree

3 files changed

+7
-27
lines changed

3 files changed

+7
-27
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ mod.version=4.0
1818
## Annotation processor
1919
dependencies.lombok_version=1.18.38
2020
## MagicLib
21-
dependencies.magiclib_dependency=0.8.693
22-
dependencies.magiclib_version=0.8.693
21+
dependencies.magiclib_dependency=0.8.697-beta
22+
dependencies.magiclib_version=0.8.697-beta
2323

2424
# Gradle Plugins
2525
architectury_loom_version=1.10-SNAPSHOT

src/main/java/com/plusls/MasaGadget/util/RenderUtil.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public static void drawLine(Vec3 pos1, Vec3 pos2, Color4f color) {
3535
//#if MC > 12104
3636
//$$ RenderContext ctx = new RenderContext(MaLiLibPipelines.DEBUG_LINES_MASA_SIMPLE_NO_DEPTH_NO_CULL, BufferUsage.STATIC_WRITE);
3737
//$$ BufferBuilder builder = ctx.getBuilder();
38-
//$$ PoseStack poseStack = new PoseStack();
39-
//$$ poseStack.pushPose();
4038
//#else
4139
Tesselator tesselator = Tesselator.getInstance();
4240
//#if MC > 12006
@@ -62,8 +60,6 @@ public static void drawLine(Vec3 pos1, Vec3 pos2, Color4f color) {
6260
//$$ ctx.close();
6361
//$$ } catch (Exception ignored) {
6462
//$$ }
65-
//$$
66-
//$$ poseStack.popPose();
6763
//#else
6864
//$$ RenderUtil.end(builder);
6965
//#endif
@@ -79,10 +75,8 @@ public static void drawOutlineBox(Vec3 pos, double expend, Color4f color) {
7975
pos = pos.subtract(camPos);
8076

8177
//#if MC > 12104
82-
//$$ RenderContext ctx = new RenderContext(MaLiLibPipelines.LINES_MASA_SIMPLE_NO_DEPTH_NO_CULL, BufferUsage.STATIC_WRITE);
78+
//$$ RenderContext ctx = new RenderContext(MaLiLibPipelines.DEBUG_LINES_MASA_SIMPLE_NO_DEPTH_NO_CULL, BufferUsage.STATIC_WRITE);
8379
//$$ BufferBuilder builder = ctx.getBuilder();
84-
//$$ PoseStack poseStack = new PoseStack();
85-
//$$ poseStack.pushPose();
8680
//#else
8781
Tesselator tesselator = Tesselator.getInstance();
8882
//#if MC > 12006
@@ -100,12 +94,7 @@ public static void drawOutlineBox(Vec3 pos, double expend, Color4f color) {
10094
(float) (pos.y() + expend),
10195
(float) (pos.z() + expend),
10296
color,
103-
//#if MC > 12104
104-
//$$ builder,
105-
//$$ poseStack.last()
106-
//#else
10797
builder
108-
//#endif
10998
);
11099
//#if MC > 12104
111100
//$$
@@ -120,8 +109,6 @@ public static void drawOutlineBox(Vec3 pos, double expend, Color4f color) {
120109
//$$ ctx.close();
121110
//$$ } catch (Exception ignored) {
122111
//$$ }
123-
//$$
124-
//$$ poseStack.popPose();
125112
//#elseif MC > 12006
126113
//$$ RenderUtil.end(builder);
127114
//#else

versions/1.21.5-fabric/gradle.properties

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@ dependencies.minecraft_dependency=>=1.21.5- <1.21.6-
33
dependencies.minecraft_version=1.21.5
44

55
# Compatible Libraries
6-
dependencies.api.itemscroller_version=1.21.5-0.27.0-sakura.5
7-
dependencies.api.itemscroller_version.use_sakura_fork=true
8-
dependencies.api.litematica_version=1.21.5-0.22.0-sakura.7
9-
dependencies.api.litematica_version.use_sakura_fork=true
10-
dependencies.api.malilib_version=1.21.5-0.24.0-sakura.8
11-
dependencies.api.malilib_version.override=true
12-
dependencies.api.malilib_version.use_sakura_fork=true
13-
dependencies.api.minihud_version=1.21.5-0.35.0-sakura.7
14-
dependencies.api.minihud_version.use_sakura_fork=true
15-
dependencies.api.tweakeroo_version=1.21.5-0.24.0-sakura.5
16-
dependencies.api.tweakeroo_version.use_sakura_fork=true
6+
dependencies.api.itemscroller_version=0.27.0
7+
dependencies.api.litematica_version=0.22.0
8+
dependencies.api.minihud_version=0.35.0
9+
dependencies.api.tweakeroo_version=0.24.0
1710

1811
# Publish properties
1912
publish.game_version=1.21.5

0 commit comments

Comments
 (0)