Skip to content

Commit eecbdca

Browse files
BlueZeeKingBlueZeeKing
committed
Update to 26.1
Still waiting on the text placeholders api to update, but work is being done
1 parent 6e7559b commit eecbdca

21 files changed

Lines changed: 98 additions & 121 deletions

‎build.gradle‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.14-SNAPSHOT'
2+
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
33
id 'maven-publish'
44
}
55

@@ -36,21 +36,20 @@ loom {
3636

3737
dependencies {
3838
minecraft "com.mojang:minecraft:${project.minecraft_version}"
39-
mappings loom.officialMojangMappings()
40-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
39+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
4140

42-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
43-
modImplementation "me.lucko:fabric-permissions-api:${project.lucko_permissions_version}"
41+
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
42+
implementation "me.lucko:fabric-permissions-api:${project.lucko_permissions_version}"
4443
include "eu.pb4:sgui:${project.sgui_version}"
4544
include "com.flowpowered:flow-math:${project.flow_version}"
4645
implementation "com.flowpowered:flow-math:${project.flow_version}"
47-
modImplementation "eu.pb4:sgui:${project.sgui_version}"
48-
modImplementation "eu.pb4:placeholder-api:${project.papi_version}"
49-
modCompileOnly "us.dynmap:DynmapCoreAPI:${project.dynmap_api_version}"
50-
modCompileOnly "de.bluecolored.bluemap:BlueMapAPI:${project.bluemap_api_version}"
51-
modCompileOnly "maven.modrinth:styled-chat:${project.styled_chat_version}"
52-
modCompileOnly "xyz.jpenilla:squaremap-api:${project.squaremap_api_version}"
53-
modImplementation include("xyz.nucleoid:server-translations-api:${project.stapi_version}")
46+
implementation "eu.pb4:sgui:${project.sgui_version}"
47+
implementation "eu.pb4:placeholder-api:${project.papi_version}"
48+
compileOnly "us.dynmap:DynmapCoreAPI:${project.dynmap_api_version}"
49+
compileOnly "de.bluecolored.bluemap:BlueMapAPI:${project.bluemap_api_version}"
50+
compileOnly "maven.modrinth:styled-chat:${project.styled_chat_version}"
51+
compileOnly "xyz.jpenilla:squaremap-api:${project.squaremap_api_version}"
52+
implementation include("xyz.nucleoid:server-translations-api:${project.stapi_version}")
5453
}
5554

5655
processResources {
@@ -62,14 +61,14 @@ processResources {
6261
}
6362

6463
tasks.withType(JavaCompile).configureEach {
65-
it.options.release = 21
64+
it.options.release = 25
6665
}
6766

6867
java {
6968
withSourcesJar()
7069

71-
sourceCompatibility = JavaVersion.VERSION_21
72-
targetCompatibility = JavaVersion.VERSION_21
70+
sourceCompatibility = JavaVersion.VERSION_25
71+
targetCompatibility = JavaVersion.VERSION_25
7372
}
7473

7574
jar {

‎gradle.properties‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
org.gradle.jvmargs=-Xmx2G
22

33
# Fabric Properties
4-
minecraft_version=1.21.11
5-
yarn_mappings=1.21.11+build.1
6-
loader_version=0.18.1
4+
minecraft_version=26.1
5+
loader_version=0.18.4
76

87
# Mod Properties
98
mod_version = 2.9.3
109
maven_group = io.icker
1110
archives_base_name = factions
1211

1312
# Dependencies
14-
fabric_version=0.139.4+1.21.11
15-
lucko_permissions_version=0.6.1
13+
fabric_api_version=0.144.1+26.1
14+
lucko_permissions_version=0.7.0
1615
dynmap_api_version=3.7-SNAPSHOT
1716
papi_version=2.8.1+1.21.10
18-
styled_chat_version=nW0Cfq7D
17+
styled_chat_version=V5imDrbM
1918
bluemap_api_version=2.7.1
2019
squaremap_api_version=1.2.3
21-
sgui_version=1.11.0+1.21.9
22-
stapi_version=2.5.2+1.21.9-pre3
20+
sgui_version=2.0.0-beta.2+26.1
21+
stapi_version=3.0.1+26.1
2322
flow_version=1.0.3

‎gradle/wrapper/gradle-wrapper.jar‎

1.83 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/io/icker/factions/command/ClaimCommand.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private int addForced(CommandContext<CommandSourceStack> context, int size)
8383
for (int y = -size + 1; y < size; y++) {
8484
ChunkPos chunkPos =
8585
world.getChunk(player.blockPosition().offset(x * 16, 0, y * 16)).getPos();
86-
Claim existingClaim = Claim.get(chunkPos.x, chunkPos.z, dimension);
86+
Claim existingClaim = Claim.get(chunkPos.x(), chunkPos.z(), dimension);
8787

8888
if (existingClaim != null) {
8989
if (size == 1) {
@@ -113,23 +113,23 @@ private int addForced(CommandContext<CommandSourceStack> context, int size)
113113
}
114114
}
115115

116-
chunks.forEach(chunk -> faction.addClaim(chunk.x, chunk.z, dimension));
116+
chunks.forEach(chunk -> faction.addClaim(chunk.x(), chunk.z(), dimension));
117117
if (size == 1) {
118118
new Message(
119119
Component.translatable(
120120
"factions.command.claim.add.success.single",
121-
chunks.get(0).x,
122-
chunks.get(0).z,
121+
chunks.get(0).x(),
122+
chunks.get(0).z(),
123123
player.getName().getString()))
124124
.send(faction);
125125
} else {
126126
new Message(
127127
Component.translatable(
128128
"factions.command.claim.add.success.multiple",
129-
chunks.get(0).x,
130-
chunks.get(0).z,
131-
chunks.get(0).x + size - 1,
132-
chunks.get(0).z + size - 1,
129+
chunks.get(0).x(),
130+
chunks.get(0).z(),
131+
chunks.get(0).x() + size - 1,
132+
chunks.get(0).z() + size - 1,
133133
player.getName().getString()))
134134
.send(faction);
135135
}
@@ -191,7 +191,7 @@ private int remove(CommandContext<CommandSourceStack> context) throws CommandSyn
191191
ChunkPos chunkPos = world.getChunk(player.blockPosition()).getPos();
192192
String dimension = world.dimension().identifier().toString();
193193

194-
Claim existingClaim = Claim.get(chunkPos.x, chunkPos.z, dimension);
194+
Claim existingClaim = Claim.get(chunkPos.x(), chunkPos.z(), dimension);
195195

196196
if (existingClaim == null) {
197197
new Message(Component.translatable("factions.command.claim.remove.fail.unclaimed"))
@@ -237,7 +237,7 @@ private int removeSize(CommandContext<CommandSourceStack> context)
237237
for (int y = -size + 1; y < size; y++) {
238238
ChunkPos chunkPos =
239239
world.getChunk(player.blockPosition().offset(x * 16, 0, y * 16)).getPos();
240-
Claim existingClaim = Claim.get(chunkPos.x, chunkPos.z, dimension);
240+
Claim existingClaim = Claim.get(chunkPos.x(), chunkPos.z(), dimension);
241241

242242
if (existingClaim != null
243243
&& (user.bypass || existingClaim.getFaction().equals(faction)))
@@ -251,10 +251,10 @@ private int removeSize(CommandContext<CommandSourceStack> context)
251251
new Message(
252252
Component.translatable(
253253
"factions.command.claim.remove.success.multiple",
254-
chunkPos.x,
255-
chunkPos.z,
256-
chunkPos.x + size - 1,
257-
chunkPos.z + size - 1,
254+
chunkPos.x(),
255+
chunkPos.z(),
256+
chunkPos.x() + size - 1,
257+
chunkPos.z() + size - 1,
258258
player.getName().getString()))
259259
.send(faction);
260260

@@ -307,7 +307,7 @@ private int setAccessLevel(CommandContext<CommandSourceStack> context, boolean i
307307
ChunkPos chunkPos = world.getChunk(player.blockPosition()).getPos();
308308
String dimension = world.dimension().identifier().toString();
309309

310-
Claim claim = Claim.get(chunkPos.x, chunkPos.z, dimension);
310+
Claim claim = Claim.get(chunkPos.x(), chunkPos.z(), dimension);
311311

312312
if (claim == null) {
313313
new Message(

‎src/main/java/io/icker/factions/command/HomeCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private static boolean checkLimitToClaim(Faction faction, ServerLevel world, Blo
143143
ChunkPos chunkPos = world.getChunk(pos).getPos();
144144
String dimension = world.dimension().identifier().toString();
145145

146-
Claim possibleClaim = Claim.get(chunkPos.x, chunkPos.z, dimension);
146+
Claim possibleClaim = Claim.get(chunkPos.x(), chunkPos.z(), dimension);
147147
return possibleClaim == null || possibleClaim.getFaction().getID() != faction.getID();
148148
}
149149

‎src/main/java/io/icker/factions/command/MapCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private int run(CommandContext<CommandSourceStack> context) throws CommandSyntax
4242
for (int z = -4; z <= 4; z++) { // Rows (9)
4343
Message row = new Message();
4444
for (int x = -5; x <= 5; x++) { // Columns (11)
45-
Claim claim = Claim.get(chunkPos.x + x, chunkPos.z + z, dimension);
45+
Claim claim = Claim.get(chunkPos.x() + x, chunkPos.z() + z, dimension);
4646
if (x == 0 && z == 0) { // Check if middle (your chunk)
4747
if (claim == null) {
4848
row.add(

‎src/main/java/io/icker/factions/core/FactionsManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void register() {
5656

5757
ChunkPos homeChunkPos = world.getChunk(homePos).getPos();
5858

59-
if (homeChunkPos.x == x && homeChunkPos.z == z) {
59+
if (homeChunkPos.x() == x && homeChunkPos.z() == z) {
6060
faction.setHome(null);
6161
}
6262
});

0 commit comments

Comments
 (0)