mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 10:34:49 +00:00
Well, it works, for a game, now.
This commit is contained in:
1 parent
06b16aaa19
commit
d0ab0e166c
208 files changed
+2328
-5883
No files matched your search
@@ -21,13 +21,12 @@ package net.minecraftforge.fml;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.server.dedicated.DedicatedServer;
|
||||
import net.minecraftforge.api.Side;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.client.SplashProgress;
|
||||
import net.minecraftforge.fml.common.event.FMLClientInitEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLServerInitEvent;
|
||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||
import sun.plugin.security.StripClassFile;
|
||||
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
@@ -38,7 +37,8 @@ public enum SidedProvider
|
||||
SIDEDINIT((Function<Supplier<Minecraft>, Function<ModContainer, Event>>)c-> mc->new FMLClientInitEvent(c.get(), mc),
|
||||
(Function<Supplier<DedicatedServer>, Function<ModContainer, Event>>)s-> mc->new FMLServerInitEvent(s.get(), mc)),
|
||||
STRIPCHARS((Function<Supplier<Minecraft>, Function<String, String>>)c-> SplashProgress::stripSpecialChars,
|
||||
(Function<Supplier<DedicatedServer>, Function<String, String>>)s-> str->str);
|
||||
(Function<Supplier<DedicatedServer>, Function<String, String>>)s-> str->str),
|
||||
STARTUPQUERY(StartupQuery::clientQuery, StartupQuery::dedicatedServerQuery);
|
||||
|
||||
private static Supplier<Minecraft> client;
|
||||
private static Supplier<DedicatedServer> server;
|
||||
@@ -64,10 +64,10 @@ public enum SidedProvider
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> T get() {
|
||||
if (FMLEnvironment.side == Side.CLIENT) {
|
||||
if (FMLEnvironment.dist == Dist.CLIENT) {
|
||||
return (T)this.clientSide.apply(client);
|
||||
}
|
||||
else if (FMLEnvironment.side == Side.SERVER) {
|
||||
else if (FMLEnvironment.dist == Dist.DEDICATED_SERVER) {
|
||||
return (T)this.serverSide.apply(server);
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in new issue
Block a user