|
7 | 7 | import net.minecraft.server.MinecraftServer;
|
8 | 8 | import net.minecraft.server.level.ServerLevel;
|
9 | 9 | import net.minecraft.world.level.storage.LevelResource;
|
| 10 | +import net.neoforged.fml.ModContainer; |
| 11 | +import net.neoforged.fml.loading.FMLPaths; |
10 | 12 | import net.neoforged.neoforge.common.NeoForge;
|
11 | 13 | import net.neoforged.neoforge.event.RegisterCommandsEvent;
|
12 |
| -import net.neoforged.neoforge.event.level.LevelEvent; |
13 | 14 | import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
14 | 15 | import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
15 | 16 | import net.neoforged.bus.api.IEventBus;
|
@@ -40,13 +41,15 @@ class ForgeCommonProvider implements MinecraftProvider, MixinGateway {
|
40 | 41 |
|
41 | 42 | static final String MOD_ID = "fastback";
|
42 | 43 | private MinecraftServer logicalServer;
|
| 44 | + private ModContainer container; |
43 | 45 | private LifecycleListener lifecycleListener = null;
|
44 | 46 | private Runnable autoSaveListener;
|
45 | 47 | private boolean isWorldSaveEnabled = true;
|
46 | 48 |
|
47 |
| - ForgeCommonProvider() { |
48 |
| - final IEventBus modEventBus = ModLoadingContext.get().getActiveContainer().getEventBus(); |
49 |
| - modEventBus.addListener(this::onDedicatedServerStartupEvent); |
| 49 | + ForgeCommonProvider(ModContainer container) { |
| 50 | + this.container = container; |
| 51 | + |
| 52 | + container.getEventBus().addListener(this::onDedicatedServerStartupEvent); |
50 | 53 | NeoForge.EVENT_BUS.addListener(this::onServerStartupEvent);
|
51 | 54 | NeoForge.EVENT_BUS.addListener(this::onServerStoppingEvent);
|
52 | 55 | NeoForge.EVENT_BUS.addListener(this::onRegisterCommandEvent);
|
@@ -89,9 +92,9 @@ void onInitialize() {
|
89 | 92 | this.lifecycleListener = MinecraftProvider.register(this);
|
90 | 93 | syslog().debug("registered backup command");
|
91 | 94 | this.lifecycleListener.onInitialize();
|
92 |
| - syslog().info("Fastback initialized"); |
| 95 | + syslog().info("Fastback " + getModVersion() + " initialized"); |
93 | 96 | syslog().warn("------------------------------------------------------------------------------------");
|
94 |
| - syslog().warn("Thanks for trying the new Forge version of Fastback. For help, go to:"); |
| 97 | + syslog().warn("Thanks for trying the new NeoForge version of Fastback. For help, go to:"); |
95 | 98 | syslog().warn("https://pcal43.github.io/fastback/");
|
96 | 99 | syslog().warn("Please note that this is an alpha release. A list of known issues is available here:");
|
97 | 100 | syslog().warn("https://github.com/pcal43/fastback/issues?q=is%3Aissue+is%3Aopen+label%3Aforge");
|
@@ -125,7 +128,7 @@ void renderOverlayText(GuiGraphics drawContext) {
|
125 | 128 |
|
126 | 129 | @Override
|
127 | 130 | public String getModVersion() {
|
128 |
| - return "0.15.3+1.20.1-alpha"; //FIXME |
| 131 | + return container.getModInfo().getVersion().toString(); |
129 | 132 | }
|
130 | 133 |
|
131 | 134 | @Override
|
@@ -205,14 +208,10 @@ public void addBackupProperties(Map<String, String> props) {
|
205 | 208 | @Override
|
206 | 209 | public Collection<Path> getModsBackupPaths() {
|
207 | 210 | final List<Path> out = new ArrayList<>();
|
208 |
| - /** |
209 |
| - final FabricLoader fl = FabricLoader.getInstance(); |
210 |
| - final Path gameDir = fl.getGameDir(); |
211 |
| - out.add(gameDir.resolve("options.txt´")); |
212 |
| - out.add(gameDir.resolve("mods")); |
213 |
| - out.add(gameDir.resolve("config")); |
214 |
| - out.add(gameDir.resolve("resourcepacks")); |
215 |
| - **/ |
| 211 | + out.add(FMLPaths.GAMEDIR.get().resolve("options.txt")); |
| 212 | + out.add(FMLPaths.MODSDIR.get()); |
| 213 | + out.add(FMLPaths.CONFIGDIR.get()); |
| 214 | + out.add(FMLPaths.GAMEDIR.get().resolve("resourcepacks")); |
216 | 215 | return out;
|
217 | 216 | }
|
218 | 217 | }
|
0 commit comments