moved a bunch of stuff

This commit is contained in:
gnembon committed 2019-05-12 01:48:19 -03:00
1 parent 72c276f976
commit ecced620a4
30 files changed
+4450 -51

No files matched your search

+11 -9
View File
@@ -1,13 +1,13 @@
package carpet;
import carpet.commands.CameraModeCommand;
//import carpet.commands.CarpetCommand;
//import carpet.commands.CounterCommand;
import carpet.commands.CarpetCommand;
import carpet.commands.CounterCommand;
//import carpet.commands.DistanceCommand;
import carpet.commands.DrawCommand;
//import carpet.commands.ScriptCommand;
//import carpet.commands.InfoCommand;
//import carpet.commands.PerimeterInfoCommand;
import carpet.commands.PerimeterInfoCommand;
//import carpet.commands.PlayerCommand;
//import carpet.commands.SpawnCommand;
import carpet.commands.LogCommand;
@@ -20,6 +20,8 @@ import carpet.commands.TestCommand;
import java.util.Random;
//import carpet.helpers.TickSpeed;
import carpet.logging.LoggerRegistry;
import carpet.utils.HUDController;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.MinecraftServer;
@@ -34,32 +36,32 @@ public class CarpetServer // static for now - easier to handle all around the co
}
public static void onServerLoaded(MinecraftServer server)
{
//CarpetSettings.apply_settings_from_conf(server);
CarpetSettings.apply_settings_from_conf(server);
//ExpressionInspector.CarpetExpression_resetExpressionEngine();
}
// Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer
public static void onGameStarted() {
//LoggerRegistry.initLoggers();
LoggerRegistry.initLoggers();
}
public static void tick(MinecraftServer server)
{
//TickSpeed.tick(server);
//HUDController.update_hud(server);
HUDController.update_hud(server);
}
public static void registerCarpetCommands(CommandDispatcher<ServerCommandSource> dispatcher)
{
//CarpetCommand.register(dispatcher);
CarpetCommand.register(dispatcher);
//TickCommand.register(dispatcher);
//CounterCommand.register(dispatcher);
CounterCommand.register(dispatcher);
LogCommand.register(dispatcher);
//SpawnCommand.register(dispatcher);
//PlayerCommand.register(dispatcher);
CameraModeCommand.register(dispatcher);
//InfoCommand.register(dispatcher);
//DistanceCommand.register(dispatcher);
//PerimeterInfoCommand.register(dispatcher);
PerimeterInfoCommand.register(dispatcher);
DrawCommand.register(dispatcher);
//ScriptCommand.register(dispatcher);