From 92fe5d97301e028a130289d914d3f02c07dcd69e Mon Sep 17 00:00:00 2001 From: kyrptonaught Date: Tue, 7 May 2024 22:54:54 -0400 Subject: [PATCH] Fix scoreboardsuffix crash on initial launch Bump dependencies Cleanup --- build.gradle | 11 ++++------- gradle.properties | 8 ++++---- .../java/net/kyrptonaught/serverutils/FileHelper.java | 10 ---------- .../kyrptonaught/serverutils/VelocityProxyHelper.java | 1 - .../customMapLoader/CustomMapLoaderMod.java | 1 - .../dimensionLoader/DimensionLoaderMod.java | 2 +- .../brandblocker/ServerConfigNetworkHandlerMixin.java | 6 ++++-- .../mixin/healthSpoofer/ServerPlayerEntityMixin.java | 2 -- .../scoreboardsuffix/ServerPlayerEntityMixin.java | 8 ++++++-- .../serverutils/playerlockdown/PlayerLockdownMod.java | 8 ++++---- .../scoreboardPlayerInfo/ScoreboardPlayerInfo.java | 2 +- .../SwitchableResourcepacksMod.java | 3 +-- src/main/resources/fabric.mod.json | 2 +- 13 files changed, 26 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index fed16db..5533bb6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import net.fabricmc.loom.task.RemapJarTask plugins { id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' - id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'io.github.goooler.shadow' version "8.1.7" } version = project.mod_version @@ -36,7 +36,7 @@ dependencies { //Luck Perms modImplementation('maven.modrinth:luckperms:v5.4.113-fabric') { exclude group: "net.fabricmc.fabric-api" } - modImplementation('me.lucko:fabric-permissions-api:0.3-SNAPSHOT') { exclude group: "net.fabricmc.fabric-api" } + modImplementation('me.lucko:fabric-permissions-api:0.3.1') { exclude group: "net.fabricmc.fabric-api" } compileOnly 'net.luckperms:api:5.4' modImplementation "com.moandjiezana.toml:toml4j:0.7.2" @@ -62,12 +62,9 @@ dependencies { modImplementation include("ru.pinkgoosik:nota:0.2.0-lem-v2-1.20.4") //Discord Bridge - shadow implementation("net.dv8tion:JDA:5.0.0-beta.20") { exclude module: 'opus-java' } + shadow implementation("net.dv8tion:JDA:5.0.0-beta.23") { exclude module: 'opus-java' } - shadow implementation("io.javalin:javalin:6.0.1") - - //Apache Compress - shadow implementation("org.apache.commons:commons-compress:1.25.0") + shadow implementation("io.javalin:javalin:6.1.4") } loom { diff --git a/gradle.properties b/gradle.properties index 4df5fc9..457a51b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties minecraft_version=1.20.4 yarn_mappings=1.20.4+build.3 -loader_version=0.15.6 +loader_version=0.15.11 -#Fabric api -fabric_version=0.95.4+1.20.4 +# Fabric API +fabric_version=0.97.0+1.20.4 # Mod Properties -mod_version=1.0.8b11-1.20.4 +mod_version=1.0.8b12-1.20.4 maven_group=net.kyrptonaught archives_base_name=ServerUtils diff --git a/src/main/java/net/kyrptonaught/serverutils/FileHelper.java b/src/main/java/net/kyrptonaught/serverutils/FileHelper.java index 5da01b1..b26a6f6 100644 --- a/src/main/java/net/kyrptonaught/serverutils/FileHelper.java +++ b/src/main/java/net/kyrptonaught/serverutils/FileHelper.java @@ -1,7 +1,5 @@ package net.kyrptonaught.serverutils; -import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; -import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.FileUtils; import java.io.IOException; @@ -59,14 +57,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) } public static String readFileFromZip(Path zipFile, String fileName) { - try (ZipFile zip = new ZipFile(zipFile)) { - ZipArchiveEntry entry = zip.getEntry(fileName); - - return new String(zip.getInputStream(entry).readAllBytes()); - } catch (Exception e) { - e.printStackTrace(); - } - return null; } diff --git a/src/main/java/net/kyrptonaught/serverutils/VelocityProxyHelper.java b/src/main/java/net/kyrptonaught/serverutils/VelocityProxyHelper.java index 5014b6c..2a1a24c 100644 --- a/src/main/java/net/kyrptonaught/serverutils/VelocityProxyHelper.java +++ b/src/main/java/net/kyrptonaught/serverutils/VelocityProxyHelper.java @@ -7,7 +7,6 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket; import net.minecraft.server.network.ServerCommonNetworkHandler; -import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Identifier; diff --git a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java index 323851c..cdbe00a 100644 --- a/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java +++ b/src/main/java/net/kyrptonaught/serverutils/customMapLoader/CustomMapLoaderMod.java @@ -1,7 +1,6 @@ package net.kyrptonaught.serverutils.customMapLoader; import com.mojang.brigadier.CommandDispatcher; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.kyrptonaught.serverutils.Module; import net.kyrptonaught.serverutils.ServerUtilsMod; import net.kyrptonaught.serverutils.chestTracker.ChestTrackerMod; diff --git a/src/main/java/net/kyrptonaught/serverutils/dimensionLoader/DimensionLoaderMod.java b/src/main/java/net/kyrptonaught/serverutils/dimensionLoader/DimensionLoaderMod.java index 521a789..060de62 100644 --- a/src/main/java/net/kyrptonaught/serverutils/dimensionLoader/DimensionLoaderMod.java +++ b/src/main/java/net/kyrptonaught/serverutils/dimensionLoader/DimensionLoaderMod.java @@ -46,7 +46,7 @@ public void registerCommands(CommandDispatcher dispatcher) DimensionLoaderCommand.registerCommands(dispatcher); } - public static void loadDimension(Identifier id, Identifier dimID, Consumer onComplete ) { + public static void loadDimension(Identifier id, Identifier dimID, Consumer onComplete) { loadedWorlds.put(id, new CustomDimHolder(id, dimID, onComplete)); } diff --git a/src/main/java/net/kyrptonaught/serverutils/mixin/brandblocker/ServerConfigNetworkHandlerMixin.java b/src/main/java/net/kyrptonaught/serverutils/mixin/brandblocker/ServerConfigNetworkHandlerMixin.java index fad6001..581f9e6 100644 --- a/src/main/java/net/kyrptonaught/serverutils/mixin/brandblocker/ServerConfigNetworkHandlerMixin.java +++ b/src/main/java/net/kyrptonaught/serverutils/mixin/brandblocker/ServerConfigNetworkHandlerMixin.java @@ -8,7 +8,9 @@ import net.minecraft.network.packet.BrandCustomPayload; import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.*; +import net.minecraft.server.network.ConnectedClientData; +import net.minecraft.server.network.ServerCommonNetworkHandler; +import net.minecraft.server.network.ServerConfigurationNetworkHandler; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -16,7 +18,7 @@ @Mixin(ServerConfigurationNetworkHandler.class) -public abstract class ServerConfigNetworkHandlerMixin extends ServerCommonNetworkHandler { +public abstract class ServerConfigNetworkHandlerMixin extends ServerCommonNetworkHandler { @Shadow diff --git a/src/main/java/net/kyrptonaught/serverutils/mixin/healthSpoofer/ServerPlayerEntityMixin.java b/src/main/java/net/kyrptonaught/serverutils/mixin/healthSpoofer/ServerPlayerEntityMixin.java index acf4e28..0fe7edb 100644 --- a/src/main/java/net/kyrptonaught/serverutils/mixin/healthSpoofer/ServerPlayerEntityMixin.java +++ b/src/main/java/net/kyrptonaught/serverutils/mixin/healthSpoofer/ServerPlayerEntityMixin.java @@ -1,7 +1,6 @@ package net.kyrptonaught.serverutils.mixin.healthSpoofer; import com.mojang.authlib.GameProfile; -import net.minecraft.block.BlockState; import net.minecraft.entity.attribute.EntityAttributeInstance; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; @@ -10,7 +9,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import java.util.Collections; diff --git a/src/main/java/net/kyrptonaught/serverutils/mixin/scoreboardsuffix/ServerPlayerEntityMixin.java b/src/main/java/net/kyrptonaught/serverutils/mixin/scoreboardsuffix/ServerPlayerEntityMixin.java index 9240779..e877cbd 100644 --- a/src/main/java/net/kyrptonaught/serverutils/mixin/scoreboardsuffix/ServerPlayerEntityMixin.java +++ b/src/main/java/net/kyrptonaught/serverutils/mixin/scoreboardsuffix/ServerPlayerEntityMixin.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.scoreboard.ScoreHolder; import net.minecraft.scoreboard.Scoreboard; +import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.scoreboard.Team; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; @@ -45,8 +46,11 @@ private void updatePlayerNameWithScore(CallbackInfoReturnable cir) { ScoreboardSuffixMod.playerSuffixStorage.suffixFormat.scoreboardSuffixes.forEach(newSuffix -> { if (newSuffix instanceof SuffixFormat.ScoreboardSuffix) { String scoreboardName = newSuffix.suffix; - int score = scoreboard.getOrCreateScore(ScoreHolder.fromName(player), scoreboard.getNullableObjective(scoreboardName)).getScore(); - ((SuffixFormat.ScoreboardSuffix) newSuffix).updateText(score); + ScoreboardObjective obj = scoreboard.getNullableObjective(scoreboardName); + if (obj != null) { + int score = scoreboard.getOrCreateScore(ScoreHolder.fromName(player), obj).getScore(); + ((SuffixFormat.ScoreboardSuffix) newSuffix).updateText(score); + } } Style style = newSuffix.displayText.getStyle(); diff --git a/src/main/java/net/kyrptonaught/serverutils/playerlockdown/PlayerLockdownMod.java b/src/main/java/net/kyrptonaught/serverutils/playerlockdown/PlayerLockdownMod.java index 4b6df4a..2e28a94 100644 --- a/src/main/java/net/kyrptonaught/serverutils/playerlockdown/PlayerLockdownMod.java +++ b/src/main/java/net/kyrptonaught/serverutils/playerlockdown/PlayerLockdownMod.java @@ -5,9 +5,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.kyrptonaught.serverutils.Module; -import net.minecraft.command.argument.BlockPosArgumentType; import net.minecraft.command.argument.EntityArgumentType; -import net.minecraft.command.argument.PosArgument; import net.minecraft.command.argument.Vec3ArgumentType; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.effect.StatusEffectInstance; @@ -19,10 +17,12 @@ import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; public class PlayerLockdownMod extends Module { public static boolean GLOBAL_LOCKDOWN = false; diff --git a/src/main/java/net/kyrptonaught/serverutils/scoreboardPlayerInfo/ScoreboardPlayerInfo.java b/src/main/java/net/kyrptonaught/serverutils/scoreboardPlayerInfo/ScoreboardPlayerInfo.java index 2d16b62..5f6dac9 100644 --- a/src/main/java/net/kyrptonaught/serverutils/scoreboardPlayerInfo/ScoreboardPlayerInfo.java +++ b/src/main/java/net/kyrptonaught/serverutils/scoreboardPlayerInfo/ScoreboardPlayerInfo.java @@ -107,7 +107,7 @@ public static void onPlayerConnect(ServerPlayNetworkHandler handler, PacketSende } public static void checkBrand(ServerPlayerEntity player, String brand) { - if(brand == null) return; + if (brand == null) return; if (brand.contains("forge")) setForgeClient(player, true); diff --git a/src/main/java/net/kyrptonaught/serverutils/switchableresourcepacks/SwitchableResourcepacksMod.java b/src/main/java/net/kyrptonaught/serverutils/switchableresourcepacks/SwitchableResourcepacksMod.java index e767e63..5c5125d 100644 --- a/src/main/java/net/kyrptonaught/serverutils/switchableresourcepacks/SwitchableResourcepacksMod.java +++ b/src/main/java/net/kyrptonaught/serverutils/switchableresourcepacks/SwitchableResourcepacksMod.java @@ -9,7 +9,6 @@ import net.kyrptonaught.serverutils.ServerUtilsMod; import net.minecraft.advancement.criterion.Criteria; import net.minecraft.command.argument.EntityArgumentType; -import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.network.packet.s2c.common.ResourcePackRemoveS2CPacket; import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket; import net.minecraft.server.command.CommandManager; @@ -26,7 +25,7 @@ public class SwitchableResourcepacksMod extends ModuleWConfig rpOptionHashMap = new HashMap<>(); public static CustomCriterion STARTED, FINISHED, FAILED; - public static final HashMap playerLoaded = new HashMap<>(); + public static final HashMap playerLoaded = new HashMap<>(); public void onConfigLoad(ResourcePackConfig config) { rpOptionHashMap.clear(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f10c4d4..fbe0642 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "serverutils", - "version": "1.0.8b11-1.20.4", + "version": "1.0.8b12-1.20.4", "name": "Server Utils", "description": "A group of utilities for servers", "authors": [