diff --git a/build.gradle b/build.gradle index 2218b0b..311d1a2 100644 --- a/build.gradle +++ b/build.gradle @@ -30,13 +30,18 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" shadow('com.maxmind.geoip2:geoip2:4.2.0') - shadow('com.google.inject:guice:7.0.0') + shadow('com.google.inject:guice:7.0.0') { + exclude group: 'com.google.guava', module: 'guava' + exclude group: 'com.google.guava', module: 'listenablefuture' + exclude group: 'com.google.guava', module: 'failureaccess' + } } configurations.implementation.extendsFrom(configurations.shadow) shadowJar { configurations = [project.configurations.shadow] exclude("META-INF") + //relocate 'com.google', 'sfcraft.relocation.google' } remapJar { diff --git a/src/main/java/io/ib67/sfcraft/config/ConfigResources.java b/src/main/java/io/ib67/sfcraft/config/ConfigResources.java index f021212..e141aa1 100644 --- a/src/main/java/io/ib67/sfcraft/config/ConfigResources.java +++ b/src/main/java/io/ib67/sfcraft/config/ConfigResources.java @@ -1,6 +1,5 @@ package io.ib67.sfcraft.config; public class ConfigResources { - public static final String UPDATE_LOG="update.log"; public static final String MOTD="motd.txt"; } diff --git a/src/main/java/io/ib67/sfcraft/init/GuiceModInitializer.java b/src/main/java/io/ib67/sfcraft/init/GuiceModInitializer.java index b1c0337..b1730bc 100644 --- a/src/main/java/io/ib67/sfcraft/init/GuiceModInitializer.java +++ b/src/main/java/io/ib67/sfcraft/init/GuiceModInitializer.java @@ -50,6 +50,7 @@ public abstract class GuiceModInitializer extends AbstractModule implements ModI moduleManager = new SimpleModuleManager(Map.copyOf(map)); } + private void onServerStopping(MinecraftServer minecraftServer) { onStopping(minecraftServer); } diff --git a/src/main/java/io/ib67/sfcraft/module/WelcomeModule.java b/src/main/java/io/ib67/sfcraft/module/WelcomeModule.java index 7007249..4fec9b5 100644 --- a/src/main/java/io/ib67/sfcraft/module/WelcomeModule.java +++ b/src/main/java/io/ib67/sfcraft/module/WelcomeModule.java @@ -35,25 +35,13 @@ public class WelcomeModule extends ServerModule { private static final DateTimeFormatter FMT = DateTimeFormatter.ofPattern("yyyy/MM/dd"); @Inject private SFConfig config; - @Inject - @ConfigRoot - private Path root; - @Inject - private GeoIPService geoIPService; - private String updateLog; + @Override public void onInitialize() { - updateLog = getConfigResource(root, ConfigResources.UPDATE_LOG).orElse("他没写呢"); ServerPlayConnectionEvents.JOIN.register(this::onPlayerJoin); } - @Provides - @ConfigResource(ConfigResources.UPDATE_LOG) - private String getUpdateLog() { - return updateLog; - } - public void onPlayerJoin(ServerPlayNetworkHandler serverPlayNetworkHandler, PacketSender packetSender, MinecraftServer minecraftServer) { var player = serverPlayNetworkHandler.getPlayer();