From 5688102fdb00e24a861cd4a6f21efdf4b81a7f18 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 18 Nov 2023 02:04:40 +0100 Subject: [PATCH] Version bump more buildscript shenanigans --- buildSrc/build.gradle.kts | 7 ++++--- gradle/libs.versions.toml | 12 +++++------ .../ModPluginMessageRegistration.java | 1 - .../floodgate/mod/util/ModCommandUtil.java | 5 ----- .../floodgate/fabric/FabricPlatform.java | 3 ++- .../fabric/listener/FabricEventListener.java | 9 --------- .../src/main/resources/floodgate.mixins.json | 6 +++--- mod/fabric/isolated/build.gradle.kts | 20 +++++++++---------- 8 files changed, 25 insertions(+), 38 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fab66b16..7c282367 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,8 +16,9 @@ dependencies { implementation(libs.indra.git) implementation(libs.shadow) implementation(libs.gradle.idea.ext) + implementation(libs.architectury.plugin) + implementation(libs.architectury.loom) - implementation("architectury-plugin", "architectury-plugin.gradle.plugin", "3.4-SNAPSHOT") - implementation("dev.architectury.loom", "dev.architectury.loom.gradle.plugin", "1.1-SNAPSHOT") - implementation("com.modrinth.minotaur:Minotaur:2.7.5") + // TODO: Add modrinth + //implementation("com.modrinth.minotaur:Minotaur:2.7.5") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3643c31..5dadb460 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,9 +30,9 @@ authlib = "5.0.47" velocity = "3.2.0-SNAPSHOT" # fabric -fabric_minecraft = "1.19" -fabric_loader = "0.14.6" -fabric_api = "0.55.3+1.19" +fabric_minecraft = "1.20.2" +fabric_loader = "0.14.20" +fabric_api = "0.90.7+1.20.2" fabric_adventure = "5.4.0-SNAPSHOT" fabric_permissions_api = "0.2-SNAPSHOT" @@ -43,7 +43,7 @@ mixin = "0.8.5" # architectury architectury_plugin = "3.4-SNAPSHOT" -architectury_loom = "1.1-SNAPSHOT" +architectury_loom = "1.4-SNAPSHOT" # buildSrc indra = "3.1.3" @@ -130,12 +130,12 @@ indra-common = { module = "net.kyori:indra-common", version.ref = "indra" } indra-git = { module = "net.kyori:indra-git", version.ref = "indra" } shadow = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" } gradle-idea-ext = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "gradle-idea-ext" } +architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury_loom" } +architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury_plugin" } [plugins] micronaut = { id = "io.micronaut.library", version.ref = "micronaut-gradle" } lombok = { id = "io.freefair.lombok", version.ref = "lombok" } -architectury-plugin = { id = "architectury-plugin.gradle.plugin", version.ref = "architectury_plugin" } -architecury-loom = { id = "dev.architectury.loom.gradle.plugin", version.ref = "architectury_loom" } [bundles] fastutil = ["fastutil-short-object-maps", "fastutil-int-object-maps"] \ No newline at end of file diff --git a/mod/common/base/src/main/java/org/geysermc/floodgate/mod/pluginmessage/ModPluginMessageRegistration.java b/mod/common/base/src/main/java/org/geysermc/floodgate/mod/pluginmessage/ModPluginMessageRegistration.java index 37a468e9..6f8a491d 100644 --- a/mod/common/base/src/main/java/org/geysermc/floodgate/mod/pluginmessage/ModPluginMessageRegistration.java +++ b/mod/common/base/src/main/java/org/geysermc/floodgate/mod/pluginmessage/ModPluginMessageRegistration.java @@ -1,6 +1,5 @@ package org.geysermc.floodgate.mod.pluginmessage; -import net.minecraft.resources.ResourceLocation; import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel; import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration; diff --git a/mod/common/base/src/main/java/org/geysermc/floodgate/mod/util/ModCommandUtil.java b/mod/common/base/src/main/java/org/geysermc/floodgate/mod/util/ModCommandUtil.java index d0c80019..1f83c4c0 100644 --- a/mod/common/base/src/main/java/org/geysermc/floodgate/mod/util/ModCommandUtil.java +++ b/mod/common/base/src/main/java/org/geysermc/floodgate/mod/util/ModCommandUtil.java @@ -3,15 +3,11 @@ import com.mojang.authlib.GameProfile; import jakarta.inject.Inject; import jakarta.inject.Singleton; -import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.UserWhiteListEntry; -import net.minecraft.world.entity.player.Player; import org.checkerframework.checker.nullness.qual.NonNull; import org.geysermc.api.GeyserApiBase; import org.geysermc.floodgate.core.connection.audience.UserAudience; @@ -19,7 +15,6 @@ import org.geysermc.floodgate.core.util.LanguageManager; import java.util.Collection; -import java.util.Objects; import java.util.UUID; @Singleton diff --git a/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/FabricPlatform.java b/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/FabricPlatform.java index 1a1b270d..9b42fcc4 100644 --- a/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/FabricPlatform.java +++ b/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/FabricPlatform.java @@ -27,6 +27,7 @@ import io.micronaut.context.ApplicationContext; import io.micronaut.inject.qualifiers.Qualifiers; +import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; import net.minecraft.server.MinecraftServer; import org.geysermc.floodgate.isolation.library.LibraryManager; @@ -48,7 +49,7 @@ protected void onContextCreated(ApplicationContext context) { context.registerSingleton(modContainer) .registerSingleton( Path.class, - modContainer.getRoot(), + FabricLoader.getInstance().getConfigDir().resolve("Floodgate-Fabric"), Qualifiers.byName("dataDirectory") ) .registerSingleton( diff --git a/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/listener/FabricEventListener.java b/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/listener/FabricEventListener.java index 43dfc1e7..173cd672 100644 --- a/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/listener/FabricEventListener.java +++ b/mod/fabric/base/src/main/java/org/geysermc/floodgate/fabric/listener/FabricEventListener.java @@ -30,24 +30,15 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerGamePacketListenerImpl; -import org.geysermc.event.Listener; -import org.geysermc.floodgate.api.FloodgateApi; -import org.geysermc.floodgate.api.logger.FloodgateLogger; -import org.geysermc.floodgate.api.player.FloodgatePlayer; -import org.geysermc.floodgate.core.api.SimpleFloodgateApi; import org.geysermc.floodgate.core.connection.ConnectionManager; import org.geysermc.floodgate.core.listener.McListener; import org.geysermc.floodgate.core.util.LanguageManager; -import java.lang.annotation.Annotation; - @Singleton public final class FabricEventListener implements McListener { @Inject ConnectionManager connectionManager; - @Inject private SimpleFloodgateApi api; @Inject private LanguageManager languageManager; - @Inject private FloodgateLogger logger; public void onPlayerJoin(ServerGamePacketListenerImpl networkHandler, PacketSender packetSender, MinecraftServer server) { var connection = connectionManager.findPendingConnection(networkHandler.player.getUUID()); diff --git a/mod/fabric/base/src/main/resources/floodgate.mixins.json b/mod/fabric/base/src/main/resources/floodgate.mixins.json index 9b980fbf..3f2899d2 100644 --- a/mod/fabric/base/src/main/resources/floodgate.mixins.json +++ b/mod/fabric/base/src/main/resources/floodgate.mixins.json @@ -1,14 +1,14 @@ { "required": true, "minVersion": "0.8", - "package": "org.geysermc.floodgate.fabric.mixin", + "package": "org.geysermc.floodgate.mod.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ "ChunkMapMixin", "ClientIntentionPacketMixin", + "ClientIntentionPacketMixinInterface", "ConnectionMixin", - "ServerConnectionListenerMixin", - "ServerLoginPacketListenerImplMixin" + "ServerConnectionListenerMixin" ], "refmap": "floodgate-fabric-refmap.json", "injectors": { diff --git a/mod/fabric/isolated/build.gradle.kts b/mod/fabric/isolated/build.gradle.kts index 14dcbc2c..1cc64a75 100644 --- a/mod/fabric/isolated/build.gradle.kts +++ b/mod/fabric/isolated/build.gradle.kts @@ -23,16 +23,16 @@ tasks { archiveVersion = "" archiveClassifier = "" - //val fabricBaseJar = project.projects - // .fabricBase.dependencyProject - // .buildDir - // .resolve("libs") - // .resolve("floodgate-fabric-base.jar") + val fabricBaseJar = project.projects.mod + .fabricBase.dependencyProject + .buildDir + .resolve("libs") + .resolve("floodgate-fabric-base.jar") - //from(fabricBaseJar.parentFile) { - // include(fabricBaseJar.name) - // rename("floodgate-fabric-base.jar", "platform-base.jar") - // into("bundled/") - //} + from(fabricBaseJar.parentFile) { + include(fabricBaseJar.name) + rename("floodgate-fabric-base.jar", "platform-base.jar") + into("bundled/") + } } } \ No newline at end of file