Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7-SNAPSHOT'
id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
id 'io.github.juuxel.loom-quiltflower' version '1.8.0'
id 'maven-publish'
}
Expand Down Expand Up @@ -55,7 +55,7 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api")
}

implementation(de.bluecolored:bluemap-api:2.7.3")
implementation("de.bluecolored:bluemap-api:2.7.3")
modRuntimeOnly("maven.modrinth:bluemap:5.2-fabric-1.21")

include(implementation("org.quiltmc.qup:json:0.2.0"))
Expand Down Expand Up @@ -87,17 +87,15 @@ java {
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
archivesBaseName = project.archives_base_name
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
inputs.property "archivesName", project.base.archivesName

from("LICENSE") {
rename { "${it}_${inputs.properties.archivesName}"}
}
}

// configure the maven publication
Expand Down
19 changes: 10 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.1
minecraft_version_range=>=1.21 <1.22
loader_version=0.15.11
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.11
yarn_mappings=1.21.11+build.4
loader_version=0.18.4
loom_version=1.14-SNAPSHOT

# Mod Properties
mod_version = 1.1.0
maven_group = io.github.gaming32
archives_base_name = opac-bluemap-integration
mod_version = 1.0.4
maven_group = io.github.gaming32
archives_base_name = opac-bluemap-integration

# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.102.0+1.21.1
# check this on https://modmuss50.me/fabric.html
fabric_version=0.139.4+1.21.11
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.permissions.LevelBasedPermissionSet;
import net.minecraft.util.Mth;
import net.minecraft.world.level.ChunkPos;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -56,7 +57,7 @@ public void onInitialize() {
ServerLifecycleEvents.SERVER_STARTING.register(server -> minecraftServer = server);
ServerLifecycleEvents.SERVER_STOPPED.register(server -> minecraftServer = null);
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> dispatcher.register(literal("openpac-bluemap")
.requires(s -> s.hasPermission(2))
.requires(s -> s.permissions() instanceof LevelBasedPermissionSet set && set.level().id() >= 2)
.then(literal("refresh-now")
.requires(s -> BlueMapAPI.getInstance().isPresent())
.executes(ctx -> {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"opac-bluemap-integration.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.11",
"fabricloader": ">=0.18.0",
"fabric": "*",
"minecraft": ">=1.21",
"minecraft": ">=1.21.10",
"bluemap": ">=5.2",
"openpartiesandclaims": ">=0.23.1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/opac-bluemap-integration.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "io.github.gaming32.opacbluemapintegration.mixin",
"compatibilityLevel": "JAVA_17",
"compatibilityLevel": "JAVA_21",
"mixins": [
],
"client": [
Expand Down