mirror of
https://github.com/LuckPerms/LuckPerms.git
synced 2024-09-29 05:47:27 +02:00
Update Forge and Fabric to 1.19.3 (#3550)
This commit is contained in:
parent
ed9dd031cb
commit
4d726f4e8b
@ -9,7 +9,7 @@ jar {
|
||||
|
||||
dependencies {
|
||||
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.
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
@ -101,7 +101,7 @@ public class TranslationManager {
|
||||
public void reload() {
|
||||
// remove any previous registry
|
||||
if (this.registry != null) {
|
||||
GlobalTranslator.get().removeSource(this.registry);
|
||||
GlobalTranslator.translator().removeSource(this.registry);
|
||||
this.installed.clear();
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ public class TranslationManager {
|
||||
loadFromResourceBundle();
|
||||
|
||||
// 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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,8 +1,8 @@
|
||||
import net.fabricmc.loom.task.RemapJarTask
|
||||
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'fabric-loom' version '0.12.+'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
id 'fabric-loom' version '1.0-SNAPSHOT'
|
||||
}
|
||||
|
||||
archivesBaseName = 'luckperms'
|
||||
@ -14,9 +14,9 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
// https://modmuss50.me/fabric.html
|
||||
minecraft 'com.mojang:minecraft:1.19.2'
|
||||
mappings 'net.fabricmc:yarn:1.19.2+build.9:v2'
|
||||
modImplementation 'net.fabricmc:fabric-loader:0.14.9'
|
||||
minecraft 'com.mojang:minecraft:1.19.3'
|
||||
mappings 'net.fabricmc:yarn:1.19.3+build.5:v2'
|
||||
modImplementation 'net.fabricmc:fabric-loader:0.14.12'
|
||||
|
||||
Set<String> apiModules = [
|
||||
'fabric-api-base',
|
||||
@ -26,7 +26,7 @@ dependencies {
|
||||
]
|
||||
|
||||
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'))
|
||||
|
@ -46,7 +46,6 @@ import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.network.ServerLoginNetworkHandler;
|
||||
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.util.dynamic.DynamicSerializableUuid;
|
||||
|
||||
import java.util.UUID;
|
||||
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.
|
||||
GameProfile profile = ((ServerLoginNetworkHandlerAccessor) netHandler).getGameProfile();
|
||||
UUID uniqueId = DynamicSerializableUuid.getUuidFromProfile(profile);
|
||||
UUID uniqueId = profile.getId();
|
||||
String username = profile.getName();
|
||||
|
||||
if (this.plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
|
||||
|
@ -1,2 +1,2 @@
|
||||
minecraftVersion=1.19.2
|
||||
forgeVersion=43.0.3
|
||||
minecraftVersion=1.19.3
|
||||
forgeVersion=44.0.48
|
@ -35,7 +35,7 @@ import net.luckperms.api.context.ContextConsumer;
|
||||
import net.luckperms.api.context.ContextSet;
|
||||
import net.luckperms.api.context.DefaultContextKeys;
|
||||
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.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@ -102,7 +102,7 @@ public class ForgePlayerCalculator implements ContextCalculator<ServerPlayer> {
|
||||
|
||||
MinecraftServer server = this.plugin.getBootstrap().getServer().orElse(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()) {
|
||||
builder.add(DefaultContextKeys.DIMENSION_TYPE_KEY, getContextKey(resourceLocation));
|
||||
}
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||
id 'com.github.johnrengelman.shadow' version '7.1.2'
|
||||
}
|
||||
|
||||
sourceCompatibility = 17
|
||||
|
@ -1,17 +1,17 @@
|
||||
plugins {
|
||||
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 {
|
||||
maven { url 'https://repo.velocitypowered.com/releases/' }
|
||||
maven { url 'https://repo.papermc.io/repository/maven-public/' }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':common')
|
||||
|
||||
compileOnly 'com.velocitypowered:velocity-api:3.0.0'
|
||||
annotationProcessor 'com.velocitypowered:velocity-api:3.0.0'
|
||||
compileOnly 'com.velocitypowered:velocity-api:3.1.1'
|
||||
annotationProcessor 'com.velocitypowered:velocity-api:3.1.1'
|
||||
}
|
||||
|
||||
blossom {
|
||||
|
Loading…
Reference in New Issue
Block a user