minecraft/LuckPerms
1
0
Fork 0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-08-21 13:51:22 +02:00
Code Issues Releases Wiki Activity

Update Forge and Fabric to 1.19.3 (#3550)

Browse Source
This commit is contained in:
J.T. McQuigg
2023-01-01 17:14:07 -05:00
committed by GitHub
parent ed9dd031cb
commit 4d726f4e8b
14 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/build.gradle
View File

@@ -9,7 +9,7 @@ jar {
dependencies { dependencies {
compileOnly 'org.checkerframework:checker-qual:3.21.2' compileOnly 'org.checkerframework:checker-qual:3.21.2'
compileOnly 'org.jetbrains:annotations:23.0.0' compileOnly 'org.jetbrains:annotations:23.1.0'
} }
// Only used occasionally for deployment - not needed for normal builds. // Only used occasionally for deployment - not needed for normal builds.

2
bukkit-legacy/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
dependencies { dependencies {

2
bukkit/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
repositories { repositories {

2
bungee/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
dependencies { dependencies {

4
common/src/main/java/me/lucko/luckperms/common/locale/TranslationManager.java
View File

@@ -101,7 +101,7 @@ public class TranslationManager {
public void reload() { public void reload() {
// remove any previous registry // remove any previous registry
if (this.registry != null) { if (this.registry != null) {
GlobalTranslator.get().removeSource(this.registry); GlobalTranslator.translator().removeSource(this.registry);
this.installed.clear(); this.installed.clear();
} }
@@ -115,7 +115,7 @@ public class TranslationManager {
loadFromResourceBundle(); loadFromResourceBundle();
// register it to the global source, so our translations can be picked up by adventure-platform // register it to the global source, so our translations can be picked up by adventure-platform
GlobalTranslator.get().addSource(this.registry); GlobalTranslator.translator().addSource(this.registry);
} }
/** /**

12
fabric/build.gradle
View File

@@ -1,8 +1,8 @@
import net.fabricmc.loom.task.RemapJarTask import net.fabricmc.loom.task.RemapJarTask
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'fabric-loom' version '0.12.+' id 'fabric-loom' version '1.0-SNAPSHOT'
} }
archivesBaseName = 'luckperms' archivesBaseName = 'luckperms'
@@ -14,9 +14,9 @@ repositories {
dependencies { dependencies {
// https://modmuss50.me/fabric.html // https://modmuss50.me/fabric.html
minecraft 'com.mojang:minecraft:1.19.2' minecraft 'com.mojang:minecraft:1.19.3'
mappings 'net.fabricmc:yarn:1.19.2+build.9:v2' mappings 'net.fabricmc:yarn:1.19.3+build.5:v2'
modImplementation 'net.fabricmc:fabric-loader:0.14.9' modImplementation 'net.fabricmc:fabric-loader:0.14.12'
Set<String> apiModules = [ Set<String> apiModules = [
'fabric-api-base', 'fabric-api-base',
@@ -26,7 +26,7 @@ dependencies {
] ]
apiModules.forEach { apiModules.forEach {
modImplementation(fabricApi.module(it, '0.60.0+1.19.2')) modImplementation(fabricApi.module(it, '0.70.0+1.19.3'))
} }
include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT'))

3
fabric/src/main/java/me/lucko/luckperms/fabric/listeners/FabricConnectionListener.java
View File

@@ -46,7 +46,6 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerLoginNetworkHandler; import net.minecraft.server.network.ServerLoginNetworkHandler;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.dynamic.DynamicSerializableUuid;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@@ -70,7 +69,7 @@ public class FabricConnectionListener extends AbstractConnectionListener {
// Get their profile from the net handler - it should have been initialised by now. // Get their profile from the net handler - it should have been initialised by now.
GameProfile profile = ((ServerLoginNetworkHandlerAccessor) netHandler).getGameProfile(); GameProfile profile = ((ServerLoginNetworkHandlerAccessor) netHandler).getGameProfile();
UUID uniqueId = DynamicSerializableUuid.getUuidFromProfile(profile); UUID uniqueId = profile.getId();
String username = profile.getName(); String username = profile.getName();
if (this.plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) { if (this.plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {

4
forge/gradle.properties
View File

@@ -1,2 +1,2 @@
minecraftVersion=1.19.2 minecraftVersion=1.19.3
forgeVersion=43.0.3 forgeVersion=44.0.48

4
forge/src/main/java/me/lucko/luckperms/forge/context/ForgePlayerCalculator.java
View File

@@ -35,7 +35,7 @@ import net.luckperms.api.context.ContextConsumer;
import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ContextSet;
import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.DefaultContextKeys;
import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.ImmutableContextSet;
import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
@@ -102,7 +102,7 @@ public class ForgePlayerCalculator implements ContextCalculator<ServerPlayer> {
MinecraftServer server = this.plugin.getBootstrap().getServer().orElse(null); MinecraftServer server = this.plugin.getBootstrap().getServer().orElse(null);
if (this.dimensionType && server != null) { if (this.dimensionType && server != null) {
server.registryAccess().registry(Registry.DIMENSION_TYPE_REGISTRY).ifPresent(registry -> { server.registryAccess().registry(Registries.DIMENSION_TYPE).ifPresent(registry -> {
for (ResourceLocation resourceLocation : registry.keySet()) { for (ResourceLocation resourceLocation : registry.keySet()) {
builder.add(DefaultContextKeys.DIMENSION_TYPE_KEY, getContextKey(resourceLocation)); builder.add(DefaultContextKeys.DIMENSION_TYPE_KEY, getContextKey(resourceLocation));
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
nukkit/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
repositories { repositories {

2
sponge/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
repositories { repositories {

2
standalone/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
sourceCompatibility = 17 sourceCompatibility = 17

8
velocity/build.gradle
View File

@@ -1,17 +1,17 @@
plugins { plugins {
id 'net.kyori.blossom' version '1.3.0' id 'net.kyori.blossom' version '1.3.0'
id 'com.github.johnrengelman.shadow' version '7.0.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
repositories { repositories {
maven { url 'https://repo.velocitypowered.com/releases/' } maven { url 'https://repo.papermc.io/repository/maven-public/' }
} }
dependencies { dependencies {
implementation project(':common') implementation project(':common')
compileOnly 'com.velocitypowered:velocity-api:3.0.0' compileOnly 'com.velocitypowered:velocity-api:3.1.1'
annotationProcessor 'com.velocitypowered:velocity-api:3.0.0' annotationProcessor 'com.velocitypowered:velocity-api:3.1.1'
} }
blossom { blossom {