Skip to content
Merged
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
29 changes: 14 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id 'fabric-loom' version '1.11-SNAPSHOT'
id 'maven-publish'
id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
}

java {
Expand Down Expand Up @@ -45,33 +44,33 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

// Permissions API
include(modImplementation("me.lucko:fabric-permissions-api:0.4.0"))
include(modImplementation("me.lucko:fabric-permissions-api:0.5.0"))

// Placeholders API
modImplementation include("eu.pb4:placeholder-api:2.8.0+1.21.9")

// LevelDB
include(implementation("org.iq80.leveldb:leveldb:0.12"))
include(implementation("org.iq80.leveldb:leveldb-api:0.12"))

// MySQL
include(implementation("mysql:mysql-connector-java:8.0.33"))
include(implementation("com.mysql:mysql-connector-j:9.4.0"))

// Redis
include(implementation("redis.clients:jedis:5.1.2"))
include(implementation("org.apache.commons:commons-pool2:2.12.0"))
include(implementation("redis.clients:jedis:6.2.0"))
//include(implementation("org.apache.commons:commons-pool2:2.12.1"))

// Parsing Libraries
include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.1"))
include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1"))
include(implementation("org.yaml:snakeyaml:2.2"))
include(implementation("com.fasterxml.jackson.core:jackson-core:2.17.1"))
include(implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1"))
include(implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.1"))
include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.20.0"))
include(implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0"))
//include(implementation("org.yaml:snakeyaml:2.5"))
include(implementation("com.fasterxml.jackson.core:jackson-core:2.20.0"))
include(implementation("com.fasterxml.jackson.core:jackson-databind:2.20.0"))
include(implementation("com.fasterxml.jackson.core:jackson-annotations:3.0-rc5"))

// Math Evaluator
include(implementation("com.fathzer:javaluator:3.0.6"))

// Placeholders API
modImplementation include("eu.pb4:placeholder-api:2.7.2+1.21.8")

//modRuntimeOnly "maven.modrinth:lazydfu:0.1.3"
//modRuntimeOnly "maven.modrinth:sodium:mc1.19-0.4.2"
//modRuntimeOnly "maven.modrinth:lithium:mc1.19-0.8.0"
Expand Down Expand Up @@ -143,4 +142,4 @@ static def getVersionMetadata() {

// No tracking information could be found about the build
return "unknown"
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.21.8
yarn_mappings=1.21.8+build.1
minecraft_version=1.21.9
yarn_mappings=1.21.9+build.1
loader_version=0.17.2

# Mod Properties
mod_version = 1.0.2
mod_version = 1.0.3
maven_group = me.flashyreese.mods
archives_base_name = commandaliases

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.133.4+1.21.8
fabric_version=0.134.0+1.21.9
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ public void registerFunctions() {
Optional<ServerPlayerEntity> optionalPlayer = serverCommandSource.getWorld().getPlayers().stream()
.filter(serverPlayerEntity -> serverPlayerEntity.getNameForScoreboard().equals(input)).findFirst();
if (optionalPlayer.isPresent()) {
return optionalPlayer.get().getWorld().getRegistryKey().getValue().toString();
return optionalPlayer.get().getEntityWorld().getRegistryKey().getValue().toString();
}
} else if (commandSource instanceof FabricClientCommandSource clientCommandSource) {
Optional<AbstractClientPlayerEntity> optionalPlayer = clientCommandSource.getWorld().getPlayers().stream()
.filter(clientPlayerEntity -> clientPlayerEntity.getNameForScoreboard().equals(input)).findFirst();
if (optionalPlayer.isPresent()) {
return optionalPlayer.get().getWorld().getRegistryKey().getValue().toString();
return optionalPlayer.get().getEntityWorld().getRegistryKey().getValue().toString();
}
}
return null;
Expand All @@ -110,13 +110,13 @@ public void registerFunctions() {
Optional<ServerPlayerEntity> optionalPlayer = serverCommandSource.getWorld().getPlayers().stream()
.filter(serverPlayerEntity -> serverPlayerEntity.getNameForScoreboard().equals(input)).findFirst();
if (optionalPlayer.isPresent()) {
return optionalPlayer.get().getWorld().getDimension().effects().toString();
return optionalPlayer.get().getEntityWorld().getDimension().effects().toString();
}
} else if (commandSource instanceof FabricClientCommandSource clientCommandSource) {
Optional<AbstractClientPlayerEntity> optionalPlayer = clientCommandSource.getWorld().getPlayers().stream()
.filter(clientPlayerEntity -> clientPlayerEntity.getNameForScoreboard().equals(input)).findFirst();
if (optionalPlayer.isPresent()) {
return optionalPlayer.get().getWorld().getDimension().effects().toString();
return clientCommandSource.getWorld().getDimension().effects().toString();
}
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
"depends": {
"fabricloader": ">=0.17.2",
"fabric": "*",
"minecraft": ">=1.21.8"
"minecraft": ">=1.21.9"
}
}