mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-11-27 20:58:40 +01:00
Merge remote-tracking branch 'origin/v3.0' into v3.0
This commit is contained in:
commit
d4b097ea50
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
#Wed Mar 02 23:09:05 CST 2022
|
#Tue Mar 29 22:17:34 CDT 2022
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||||
|
@ -21,6 +21,7 @@ import net.minecraftforge.fml.common.SidedProxy;
|
|||||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
|
import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStartedEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStartedEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
|
||||||
@ -108,7 +109,7 @@ public class DynmapMod
|
|||||||
|
|
||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void serverStarting(FMLServerStartingEvent event) {
|
public void serverStarting(FMLServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|||||||
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
||||||
|
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
||||||
@ -111,13 +112,17 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
public void onServerAboutToStartStarting(FMLServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onServerStarting(FMLServerStartingEvent event) {
|
||||||
plugin.onStarting(event.getCommandDispatcher());
|
plugin.onStarting(event.getCommandDispatcher());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarted(FMLServerStartedEvent event) {
|
public void onServerStarted(FMLServerStartedEvent event) {
|
||||||
DynmapCommonAPIListener.register(new APICallback());
|
DynmapCommonAPIListener.register(new APICallback());
|
||||||
|
@ -21,6 +21,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|||||||
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
||||||
|
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
||||||
@ -112,13 +113,17 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onServerStarting(FMLServerStartingEvent event) {
|
||||||
plugin.onStarting(event.getCommandDispatcher());
|
plugin.onStarting(event.getCommandDispatcher());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarted(FMLServerStartedEvent event) {
|
public void onServerStarted(FMLServerStartedEvent event) {
|
||||||
DynmapCommonAPIListener.register(new APICallback());
|
DynmapCommonAPIListener.register(new APICallback());
|
||||||
|
@ -20,6 +20,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|||||||
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
|
||||||
|
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
|
||||||
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
||||||
@ -111,7 +112,7 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
public void onServerStarting(FMLServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
@ -21,6 +21,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
|||||||
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
|
import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
|
||||||
|
import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
|
||||||
import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
|
import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
|
||||||
import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
|
import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
|
||||||
import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent;
|
import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent;
|
||||||
@ -113,7 +114,7 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(FMLServerStartingEvent event) {
|
public void onServerStarting(FMLServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
@ -11,6 +11,7 @@ import org.dynmap.forge_1_18_2.DynmapPlugin.OurLog;
|
|||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
import net.minecraftforge.event.server.ServerAboutToStartEvent;
|
||||||
import net.minecraftforge.event.server.ServerStartedEvent;
|
import net.minecraftforge.event.server.ServerStartedEvent;
|
||||||
import net.minecraftforge.event.server.ServerStartingEvent;
|
import net.minecraftforge.event.server.ServerStartingEvent;
|
||||||
import net.minecraftforge.event.server.ServerStoppingEvent;
|
import net.minecraftforge.event.server.ServerStoppingEvent;
|
||||||
@ -113,7 +114,7 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(ServerStartingEvent event) {
|
public void onServerStarting(ServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
@ -11,6 +11,7 @@ import org.dynmap.forge_1_18.DynmapPlugin.OurLog;
|
|||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
import net.minecraftforge.event.server.ServerAboutToStartEvent;
|
||||||
import net.minecraftforge.event.server.ServerStartedEvent;
|
import net.minecraftforge.event.server.ServerStartedEvent;
|
||||||
import net.minecraftforge.event.server.ServerStartingEvent;
|
import net.minecraftforge.event.server.ServerStartingEvent;
|
||||||
import net.minecraftforge.event.server.ServerStoppingEvent;
|
import net.minecraftforge.event.server.ServerStoppingEvent;
|
||||||
@ -113,7 +114,7 @@ public class DynmapMod
|
|||||||
private MinecraftServer server;
|
private MinecraftServer server;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onServerStarting(ServerStartingEvent event) {
|
public void onServerStarting(ServerAboutToStartEvent event) {
|
||||||
server = event.getServer();
|
server = event.getServer();
|
||||||
if(plugin == null)
|
if(plugin == null)
|
||||||
plugin = proxy.startServer(server);
|
plugin = proxy.startServer(server);
|
||||||
|
Loading…
Reference in New Issue
Block a user