Skip to content

Commit eedc05d

Browse files
committed
Merge branch '1.21.8' into 1.21.10
2 parents 46e21e5 + e3b09c6 commit eedc05d

4 files changed

Lines changed: 21 additions & 10 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ repositories {
1414
dependencies {
1515
implementation("dev.architectury:architectury-loom:1.17.+")
1616
implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.5.+")
17-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.3")
17+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.5.1")
1818
}
1919

fabric/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
modRuntimeOnly(libs.immediatelyfast)
7070
runtimeOnly("net.lenni0451:Reflect:1.6.1") // immediatelyfast jij
7171
modImplementation(libs.modmenu)
72-
modImplementation(libs.sodium.fabric)
72+
modCompileOnly(libs.sodium.fabric) // todo: remove on next xaero update when he fixes sodium crash
7373
modRuntimeOnly(libs.spark.fabric)
7474
modRuntimeOnly(libs.fabric.permissions.api)
7575
implementation(shadow(libs.caffeine.get())!!)

fabric/src/gametest/java/xaeroplus/fabric/gametest/XaeroPlusClientGameTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package xaeroplus.fabric.gametest;
22

3+
import it.unimi.dsi.fastutil.longs.Long2LongArrayMap;
34
import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
45
import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
56
import net.minecraft.client.Minecraft;
@@ -17,8 +18,10 @@
1718
import xaero.map.WorldMapSession;
1819
import xaero.map.gui.GuiMap;
1920
import xaero.map.gui.GuiWorldMapSettings;
21+
import xaeroplus.Globals;
2022
import xaeroplus.feature.extensions.DrawOrderScreen;
2123
import xaeroplus.feature.extensions.SyncedWaypoint;
24+
import xaeroplus.feature.render.DrawFeatureFactory;
2225
import xaeroplus.feature.render.line.Line;
2326
import xaeroplus.feature.render.text.Text;
2427
import xaeroplus.feature.waypoint.WaypointAPI;
@@ -55,6 +58,14 @@ public void runTest(ClientGameTestContext context) {
5558
var lz = ChunkUtils.chunkCoordToCoord(ChunkUtils.actualPlayerChunkZ());
5659
ModuleManager.getModule(Drawing.class).addLine(new Line(lx - 128, lz - 128, lx + 128, lz + 128), ColorHelper.getColor(255, 0, 0, 200));
5760
ModuleManager.getModule(Drawing.class).addText(new Text("bottom text", lx, lz + 64, ColorHelper.getColor(255, 255, 255, 255), 1f));
61+
var testHighlights = new Long2LongArrayMap();
62+
testHighlights.put(ChunkUtils.chunkPosToLong(ChunkUtils.actualPlayerChunkX() - 5, ChunkUtils.actualPlayerChunkZ() + 5), 0);
63+
Globals.drawManager.registry().register(DrawFeatureFactory.chunkHighlights(
64+
"test",
65+
dim -> testHighlights,
66+
() -> ColorHelper.getColor(0, 255, 0, 150),
67+
50
68+
));
5869
HudMod.INSTANCE.getHudConfigs().getClientConfigManager().getCurrentProfile().set(MinimapProfiledConfigOptions.SIZE, 200);
5970
HudMod.INSTANCE.getHudConfigs().getClientConfigManager().getCurrentProfile().set(MinimapProfiledConfigOptions.NORTH_LOCKED, true);
6071
HudMod.INSTANCE.getHudConfigs().getClientConfigManager().getCurrentProfile().set(MinimapProfiledConfigOptions.WAYPOINT_DISTANCE_IN_WORLD, 2);

gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ org.gradle.parallel=false
33
enabled_platforms=fabric,neoforge
44
loom.ignoreDependencyLoomVersionValidation=true
55

6-
mod_version=2.34.2
6+
mod_version=2.34.3
77

88
minecraft_version=1.21.10
99

1010
parchment_version=2025.10.12
1111

12-
worldmap_version_fabric=1.42.0
12+
worldmap_version_fabric=1.43.0
1313

14-
minimap_version_fabric=26.2.0
14+
minimap_version_fabric=26.3.0
1515

16-
worldmap_version_forge=1.42.0
16+
worldmap_version_forge=1.43.0
1717

18-
minimap_version_forge=26.2.0
18+
minimap_version_forge=26.3.0
1919

20-
worldmap_version_neo=1.42.0
20+
worldmap_version_neo=1.43.0
2121

22-
minimap_version_neo=26.2.0
22+
minimap_version_neo=26.3.0
2323

24-
xaerolib_version=1.5.0
24+
xaerolib_version=1.6.0

0 commit comments

Comments
 (0)