Skip to content

Commit ec421a2

Browse files
update to minecraft 26.1
1 parent 3e3e639 commit ec421a2

File tree

9 files changed

+33
-32
lines changed

9 files changed

+33
-32
lines changed

build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version "$loom_version"
2+
id "net.fabricmc.fabric-loom" version "$loom_version"
33
id 'maven-publish'
44
}
55

@@ -32,15 +32,14 @@ loom {
3232
dependencies {
3333
// To change the versions see the gradle.properties file
3434
minecraft "com.mojang:minecraft:${project.minecraft_version}"
35-
mappings loom.officialMojangMappings()
36-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
35+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
3736

3837
// Fabric API. This is technically optional, but you probably want it anyway.
39-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
38+
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
4039

4140
compileOnly "de.bluecolored:bluemap-api:${project.bluemap_api_version}"
4241

43-
modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
42+
implementation include("xyz.nucleoid:server-translations-api:${project.server_translations_api_version}")
4443
}
4544

4645
processResources {
@@ -64,7 +63,7 @@ tasks.withType(JavaCompile).configureEach {
6463
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
6564
// If Javadoc is generated, this must be specified in that task too.
6665
it.options.encoding = "UTF-8"
67-
it.options.release = 21
66+
it.options.release = 25
6867
}
6968

7069
java {
@@ -73,13 +72,15 @@ java {
7372
// If you remove this line, sources will not be generated.
7473
withSourcesJar()
7574

76-
sourceCompatibility = JavaVersion.VERSION_21
77-
targetCompatibility = JavaVersion.VERSION_21
75+
sourceCompatibility = JavaVersion.VERSION_25
76+
targetCompatibility = JavaVersion.VERSION_25
7877
}
7978

8079
jar {
80+
inputs.property "archivesName", project.archives_base_name
81+
8182
from("LICENSE") {
82-
rename { "${it}_${project.archives_base_name}"}
83+
rename { "${it}_${inputs.properties.archivesName}"}
8384
}
8485
}
8586

gradle.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# Check these on https://fabricmc.net/develop/
6-
minecraft_version=1.21.11
7-
loader_version=0.18.3
8-
loom_version=1.14-SNAPSHOT
6+
minecraft_version=26.1
7+
loader_version=0.18.5
8+
loom_version=1.15-SNAPSHOT
99

1010
# Fabric API
11-
fabric_version=0.140.0+1.21.11
11+
fabric_api_version=0.144.3+26.1
1212
# Mod Properties
1313
mod_version=2.2.3
1414
maven_group=dev.nincodedo
@@ -17,8 +17,8 @@ archives_base_name=bluemap-banners
1717
# Dependencies
1818

1919
# BlueMap
20-
bluemap_api_version=2.7.6
21-
bluemap_version=5.15
20+
bluemap_api_version=2.7.7
21+
bluemap_version=5.18
2222

2323
# Server Translations API
24-
server_translations_version=2.5.2+1.21.9-pre3
24+
server_translations_api_version=3.0.1+26.1

gradle/wrapper/gradle-wrapper.jar

2.13 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.0-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: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

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

src/main/java/dev/nincodedo/bluemapbanners/BlueMapBanners.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ private InteractionResult useBlock(Player player, Level world, InteractionHand h
116116
if (!markerManager.doesMarkerExist(bannerBlockEntity)) {
117117
markerManager.addMarker(blockState, bannerBlockEntity, player);
118118
if (ConfigManager.getInstance().getBoolConfig(Config.NOTIFY_PLAYER_ON_MARKER_ADD))
119-
player.displayClientMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerAdd", getWebText()), false);
119+
player.sendSystemMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerAdd", getWebText()));
120120
} else {
121121
markerManager.removeMarker(bannerBlockEntity);
122122
if (ConfigManager.getInstance().getBoolConfig(Config.NOTIFY_PLAYER_ON_MARKER_REMOVE))
123-
player.displayClientMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerRemove", getWebText()), false);
123+
player.sendSystemMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerRemove", getWebText()));
124124
}
125125
} catch (NoSuchElementException ignored) {}
126126
}
@@ -152,7 +152,7 @@ private boolean breakBlock(Level world, Player playerEntity, BlockPos blockPos,
152152
if (bannerBlockEntity != null && markerManager.doesMarkerExist(bannerBlockEntity)) {
153153
markerManager.removeMarker(bannerBlockEntity);
154154
if (ConfigManager.getInstance().getBoolConfig(Config.NOTIFY_PLAYER_ON_MARKER_REMOVE))
155-
playerEntity.displayClientMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerRemove", BlueMapBanners.getWebText()), false);
155+
playerEntity.sendSystemMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerRemove", BlueMapBanners.getWebText()));
156156
}
157157
} catch (NoSuchElementException ignored) {}
158158
}

src/main/java/dev/nincodedo/bluemapbanners/mixin/BlockItemMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public void placeInject(BlockPlaceContext context, CallbackInfoReturnable<Intera
3737
if (bannerBlockEntity.getCustomName() != null || configManager.getBoolConfig(Config.MARKER_ADD_WITH_ORIGINAL_NAME)) {
3838
markerManager.addMarker(state, bannerBlockEntity, player);
3939
if (configManager.getBoolConfig(Config.NOTIFY_PLAYER_ON_MARKER_ADD) && player != null)
40-
player.displayClientMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerAdd", BlueMapBanners.getWebText()), false);
40+
player.sendSystemMessage(Component.translatable("bluemapbanners.notifyPlayerOnMarkerAdd", BlueMapBanners.getWebText()));
4141
}
4242
}
4343
} else {
4444
if (configManager.getBoolConfig(Config.NOTIFY_PLAYER_ON_BANNER_PLACE) && player != null)
45-
player.displayClientMessage(Component.translatable("bluemapbanners.notifyPlayerOnBannerPlace", BlueMapBanners.getWebText()), false);
45+
player.sendSystemMessage(Component.translatable("bluemapbanners.notifyPlayerOnBannerPlace", BlueMapBanners.getWebText()));
4646
}
4747
}
4848
}

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"depends": {
2727
"bluemap": ">=${bluemap_version}",
2828
"fabricloader": ">=${loader_version}",
29-
"fabric": "*",
29+
"fabric-api": "*",
3030
"minecraft": "${minecraft_version}"
3131
}
3232
}

0 commit comments

Comments
 (0)