rebrand factory to nexus (for the 31st time)
This commit is contained in:
1 parent
2f2fa60101
commit
9856518f92
106 files changed
+234
-234
No files matched your search
+1
-1
@@ -93,4 +93,4 @@ bin/
|
||||
# fabric
|
||||
|
||||
run/
|
||||
.factorypath
|
||||
.nexuspath
|
||||
@@ -4,7 +4,7 @@
|
||||
<br>
|
||||
|
||||
# Nexia
|
||||
using **Factory API**
|
||||
using **Nexus API**
|
||||
|
||||
The mod for the Nexia CTS server.
|
||||
|
||||
|
||||
+2
-2
@@ -56,8 +56,8 @@ dependencies {
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
|
||||
|
||||
modImplementation("com.combatreforged.factory:factory-api:${project.factory_version}-full")
|
||||
modImplementation("com.combatreforged.factory:factory-builder:${project.factory_version}-${project.minecraft_version}-full")
|
||||
modImplementation("com.nexia.nexus:nexus-api:${project.nexus_version}-full")
|
||||
modImplementation("com.nexia.nexus:nexus-builder:${project.nexus_version}-${project.minecraft_version}-full")
|
||||
|
||||
include(implementation("com.google.code.gson:gson:${project.gson_version}"))
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ fabric_version= 0.42.0+1.16
|
||||
plasmid_version=0.4.0
|
||||
jda_version=5.0.0-beta.20
|
||||
mixin_extras_version=0.2.0-beta.9
|
||||
factory_version=0.1.13
|
||||
nexus_version=0.1.13
|
||||
gson_version=2.10.1
|
||||
saveandloadinventories_version=1.16.5-2.4
|
||||
collective_version=1.16.5-5.50
|
||||
|
||||
Binary file not shown.
BIN
Binary file not shown.
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core;
|
||||
|
||||
import com.combatreforged.factory.api.FactoryAPI;
|
||||
import com.combatreforged.factory.api.FactoryServer;
|
||||
import com.combatreforged.factory.api.entrypoint.FactoryPlugin;
|
||||
import com.nexia.nexus.api.NexusAPI;
|
||||
import com.nexia.nexus.api.NexusServer;
|
||||
import com.nexia.nexus.api.entrypoint.NexusPlugin;
|
||||
import com.nexia.core.config.ModConfig;
|
||||
import com.nexia.core.listeners.ListenerHelper;
|
||||
import com.nexia.core.loader.CommandLoader;
|
||||
@@ -16,7 +16,7 @@ import net.fabricmc.loader.api.FabricLoader;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
public class Main implements ModInitializer, FactoryPlugin {
|
||||
public class Main implements ModInitializer, NexusPlugin {
|
||||
public static ModConfig config;
|
||||
|
||||
public static final String MOD_NAME = "Nexia";
|
||||
@@ -55,18 +55,18 @@ public class Main implements ModInitializer, FactoryPlugin {
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("FutureReturnValueIgnored")
|
||||
public void onFactoryLoad(FactoryAPI api, FactoryServer server) {
|
||||
Main.logger.info("Loading Factory API...");
|
||||
public void onNexusLoad(NexusAPI api, NexusServer server) {
|
||||
Main.logger.info("Loading Nexus API...");
|
||||
|
||||
ServerTime.factoryServer = server;
|
||||
ServerTime.factoryAPI = api;
|
||||
ServerTime.nexusServer = server;
|
||||
ServerTime.nexusAPI = api;
|
||||
ServerTime.scheduler = api.getScheduler();
|
||||
|
||||
Main.logger.info("Registering listeners...");
|
||||
ListenerHelper.registerListeners();
|
||||
Main.logger.info("Registered listeners.");
|
||||
Main.logger.info("Registering factory commands...");
|
||||
CommandLoader.registerFactoryCommands();
|
||||
Main.logger.info("Registered factory commands.");
|
||||
Main.logger.info("Registering nexus commands...");
|
||||
CommandLoader.registerNexusCommands();
|
||||
Main.logger.info("Registered nexus commands.");
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.gui.PrefixGUI;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.gui.RanksGUI;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
@@ -98,7 +98,7 @@ public class ReportCommand {
|
||||
.append(Component.text(reason).color(ChatFormat.brandColor2).decoration(ChatFormat.bold, false));
|
||||
|
||||
for (ServerPlayer staffPlayer : ServerTime.minecraftServer.getPlayerList().getPlayers()){
|
||||
if(Permissions.check(staffPlayer, "nexia.staff.report", 1)) ServerTime.factoryServer.getPlayer(staffPlayer.getUUID()).sendMessage(staffReportMessage);
|
||||
if(Permissions.check(staffPlayer, "nexia.staff.report", 1)) ServerTime.nexusServer.getPlayer(staffPlayer.getUUID()).sendMessage(staffReportMessage);
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.Main;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
@@ -62,7 +62,7 @@ public class ShoutCommand {
|
||||
.append(Component.text( " shouts: " + message).color(ChatFormat.normalColor).decoration(ChatFormat.bold, false)
|
||||
);
|
||||
|
||||
for(Player player : ServerTime.factoryServer.getPlayers()) {
|
||||
for(Player player : ServerTime.nexusServer.getPlayers()) {
|
||||
player.sendMessage(cmessage);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels.custom;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.duels.custom;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.player.ffa;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
@@ -48,7 +48,7 @@ public class DetectCommand {
|
||||
});
|
||||
if(nearestPosition.get() != null) {
|
||||
Vec3 nearestPos = nearestPosition.get();
|
||||
ServerTime.factoryServer.runCommand("/player " + botName + " look at " + nearestPos.x + " " + nearestPos.y + " " + nearestPos.z, 4, false);
|
||||
ServerTime.nexusServer.runCommand("/player " + botName + " look at " + nearestPos.x + " " + nearestPos.y + " " + nearestPos.z, 4, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.commands.staff;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.games.util;
|
||||
|
||||
import com.combatreforged.factory.api.world.nbt.NBTObject;
|
||||
import com.combatreforged.factory.api.world.nbt.NBTValue;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.nbt.NBTObject;
|
||||
import com.nexia.nexus.api.world.nbt.NBTValue;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.BanHandler;
|
||||
import com.nexia.core.utilities.player.GamemodeBanHandler;
|
||||
@@ -119,19 +119,19 @@ public class LobbyUtil {
|
||||
unbreakableNBTObject.set("Unbreakable", NBTValue.of(1));
|
||||
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack compass = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.COMPASS);
|
||||
com.nexia.nexus.api.world.item.ItemStack compass = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.COMPASS);
|
||||
compass.setItemNBT(hideAttrubtesNBTObject.copy());
|
||||
compass.setLore(Component.text("Right click to open the gamemode selector menu.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
|
||||
compass.setDisplayName(Component.text("Gamemode Selector", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
|
||||
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack nameTag = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.NAME_TAG);
|
||||
com.nexia.nexus.api.world.item.ItemStack nameTag = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.NAME_TAG);
|
||||
nameTag.setItemNBT(hideAttrubtesNBTObject.copy());
|
||||
nameTag.setLore(Component.text("Right click to open the prefix selector menu.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
|
||||
nameTag.setDisplayName(Component.text("Prefix Selector", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
|
||||
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack queueSword = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.IRON_SWORD);
|
||||
com.nexia.nexus.api.world.item.ItemStack queueSword = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.IRON_SWORD);
|
||||
queueSword.setItemNBT(hideAttrubtesNBTObject.copy());
|
||||
queueSword.setLore(new ArrayList<>(Arrays.asList(
|
||||
Component.text("Right click to open the queue menu.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false),
|
||||
@@ -140,7 +140,7 @@ public class LobbyUtil {
|
||||
queueSword.setDisplayName(Component.text("Duel Sword", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
|
||||
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack teamSword = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.IRON_AXE);
|
||||
com.nexia.nexus.api.world.item.ItemStack teamSword = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.IRON_AXE);
|
||||
teamSword.setItemNBT(hideAttrubtesNBTObject.copy());
|
||||
teamSword.setLore(new ArrayList<>(Arrays.asList(
|
||||
Component.text("Right click to list the team you're in.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false),
|
||||
@@ -149,14 +149,14 @@ public class LobbyUtil {
|
||||
teamSword.setDisplayName(Component.text("Team Axe", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
|
||||
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack customDuelSword = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.DIAMOND_SWORD);
|
||||
com.nexia.nexus.api.world.item.ItemStack customDuelSword = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.DIAMOND_SWORD);
|
||||
customDuelSword.setItemNBT(hideAttrubtesNBTObject.copy());
|
||||
customDuelSword.setLore(Component.text("Hit a player to duel them in your custom kit.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
|
||||
customDuelSword.setDisplayName(Component.text("Custom Duel Sword", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
|
||||
|
||||
if(player.hasPermission("nexia.prefix.supporter")) {
|
||||
|
||||
com.combatreforged.factory.api.world.item.ItemStack elytra = com.combatreforged.factory.api.world.item.ItemStack.create(Minecraft.Item.ELYTRA);
|
||||
com.nexia.nexus.api.world.item.ItemStack elytra = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.ELYTRA);
|
||||
elytra.setItemNBT(unbreakableNBTObject.copy());
|
||||
elytra.setLore(Component.text("Thanks for supporting the server!", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
|
||||
elytra.setDisplayName(Component.text("Supporter Elytra", ChatFormat.brandColor2).decorate(ChatFormat.bold).decoration(ChatFormat.italic, false));
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.gui;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.ItemDisplayUtil;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.gui;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.ItemDisplayUtil;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.gui;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.ItemDisplayUtil;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.gui.duels;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.InventoryUtil;
|
||||
import com.nexia.core.utilities.item.ItemDisplayUtil;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.gui.duels;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.ItemDisplayUtil;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
@@ -84,7 +84,7 @@ public class QueueGUI extends SimpleGui {
|
||||
|
||||
if(itemStack.getItem() != Items.BLACK_STAINED_GLASS_PANE && itemStack.getItem() != Items.AIR){
|
||||
if(name.getString().substring(4).equalsIgnoreCase("Leave ALL Queues")) {
|
||||
//PlayerUtil.getFactoryPlayer(player).runCommand("/queue LEAVE", 0, false);
|
||||
//PlayerUtil.getNexusPlayer(player).runCommand("/queue LEAVE", 0, false);
|
||||
GamemodeHandler.removeQueue(nexiaPlayer, null, false);
|
||||
|
||||
this.close();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.gui.ffa;
|
||||
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.ffa.kits.FfaKit;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.nexia.core.listeners;
|
||||
|
||||
import com.nexia.core.listeners.factory.*;
|
||||
import com.nexia.core.listeners.nexus.*;
|
||||
|
||||
public class ListenerHelper {
|
||||
public static void registerListeners() {
|
||||
// Factory Listeners
|
||||
// Nexus Listeners
|
||||
new PlayerJoinListener().registerListener();
|
||||
new PlayerLeaveListener().registerListener();
|
||||
new UseItemListener().registerListener();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerHotbarDropItemEvent;
|
||||
import com.nexia.nexus.api.event.player.PlayerHotbarDropItemEvent;
|
||||
import com.nexia.core.utilities.misc.EventUtil;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerJoinEvent;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.event.player.PlayerJoinEvent;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
@@ -67,7 +67,7 @@ public class PlayerJoinListener {
|
||||
.append(Component.text("Players online: ").color(ChatFormat.normalColor))
|
||||
.append(Component.text(ServerTime.minecraftServer.getPlayerCount()).color(ChatFormat.brandColor2))
|
||||
.append(Component.text("/").color(ChatFormat.lineColor))
|
||||
.append(Component.text(ServerTime.factoryServer.getMaxPlayerCount()).color(ChatFormat.brandColor2))
|
||||
.append(Component.text(ServerTime.nexusServer.getMaxPlayerCount()).color(ChatFormat.brandColor2))
|
||||
);
|
||||
player.sendMessage(
|
||||
Component.text(" » ").color(ChatFormat.brandColor2)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerDisconnectEvent;
|
||||
import com.nexia.nexus.api.event.player.PlayerDisconnectEvent;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.player.PlayerDataManager;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerRespawnEvent;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.combatreforged.factory.api.world.util.Location;
|
||||
import com.nexia.nexus.api.event.player.PlayerRespawnEvent;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.util.Location;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerSwapHandItemsEvent;
|
||||
import com.nexia.nexus.api.event.player.PlayerSwapHandItemsEvent;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.listeners.factory;
|
||||
package com.nexia.core.listeners.nexus;
|
||||
|
||||
import com.combatreforged.factory.api.event.player.PlayerUseItemEvent;
|
||||
import com.combatreforged.factory.api.world.item.ItemStack;
|
||||
import com.nexia.nexus.api.event.player.PlayerUseItemEvent;
|
||||
import com.nexia.nexus.api.world.item.ItemStack;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.player.PlayerDataManager;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.loader;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.nexia.core.commands.player.*;
|
||||
import com.nexia.core.commands.player.duels.*;
|
||||
@@ -17,8 +17,8 @@ import net.fabricmc.fabric.api.event.Event;
|
||||
|
||||
public class CommandLoader {
|
||||
|
||||
public static void registerFactoryCommands() {
|
||||
CommandDispatcher<CommandSourceInfo> commandDispatcher = ServerTime.factoryServer.getCommandDispatcher();
|
||||
public static void registerNexusCommands() {
|
||||
CommandDispatcher<CommandSourceInfo> commandDispatcher = ServerTime.nexusServer.getCommandDispatcher();
|
||||
|
||||
SprintFixCommand.register(commandDispatcher);
|
||||
HelpCommand.register(commandDispatcher);
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.nexia.core.mixin.misc;
|
||||
|
||||
import com.combatreforged.factory.builder.mixin_interfaces.LevelAccessOwner;
|
||||
import com.nexia.nexus.builder.mixin_interfaces.LevelAccessOwner;
|
||||
import net.minecraft.world.inventory.ContainerLevelAccess;
|
||||
import net.minecraft.world.inventory.ItemCombinerMenu;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
/**
|
||||
* factory bug fix
|
||||
* nexus bug fix
|
||||
*/
|
||||
@Mixin(ItemCombinerMenu.class)
|
||||
public class ItemCombinerMenuMixin implements LevelAccessOwner {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.mixin.player;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.utilities.chat;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.player.PlayerDataManager;
|
||||
import com.nexia.core.utilities.player.SavedPlayerData;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.utilities.commands;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.utilities.item;
|
||||
|
||||
import com.combatreforged.factory.api.world.nbt.NBTList;
|
||||
import com.combatreforged.factory.api.world.nbt.NBTObject;
|
||||
import com.nexia.nexus.api.world.nbt.NBTList;
|
||||
import com.nexia.nexus.api.world.nbt.NBTObject;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
@@ -77,7 +77,7 @@ public class ItemDisplayUtil {
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
|
||||
public static void addGlint(com.combatreforged.factory.api.world.item.ItemStack itemStack) {
|
||||
public static void addGlint(com.nexia.nexus.api.world.item.ItemStack itemStack) {
|
||||
try {
|
||||
System.out.println(itemStack.getEnchantments());
|
||||
if (itemStack.getEnchantments().isEmpty()) {
|
||||
|
||||
@@ -34,7 +34,7 @@ public class EventUtil {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean dropItem(NexiaPlayer player, com.combatreforged.factory.api.world.item.ItemStack itemStack) {
|
||||
public static boolean dropItem(NexiaPlayer player, com.nexia.nexus.api.world.item.ItemStack itemStack) {
|
||||
|
||||
if(FfaUtil.isFfaPlayer(player)) return false;
|
||||
if(LobbyUtil.isLobbyWorld(player.unwrap().level)) return false;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.utilities.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import com.mojang.brigadier.StringReader;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.utilities.player;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
package com.nexia.core.utilities.player;
|
||||
|
||||
import com.combatreforged.factory.api.world.effect.StatusEffectInstance;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.combatreforged.factory.api.world.item.ItemStack;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.combatreforged.factory.builder.implementation.world.entity.player.WrappedPlayer;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.item.ItemStackUtil;
|
||||
@@ -17,6 +12,11 @@ import com.nexia.minigames.games.duels.DuelGameHandler;
|
||||
import com.nexia.minigames.games.football.FootballGame;
|
||||
import com.nexia.minigames.games.oitc.OitcGame;
|
||||
import com.nexia.minigames.games.skywars.SkywarsGame;
|
||||
import com.nexia.nexus.api.world.effect.StatusEffectInstance;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.world.item.ItemStack;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.builder.implementation.world.entity.player.WrappedPlayer;
|
||||
import me.lucko.fabric.api.permissions.v0.Permissions;
|
||||
import net.blumbo.blfscheduler.BlfRunnable;
|
||||
import net.blumbo.blfscheduler.BlfScheduler;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.utilities.pos;
|
||||
|
||||
import com.combatreforged.factory.api.world.World;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.combatreforged.factory.api.world.util.Location;
|
||||
import com.nexia.nexus.api.world.World;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.world.util.Location;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
@@ -33,7 +33,7 @@ public class EntityPos {
|
||||
this(entity.getX(), entity.getY(), entity.getZ(), entity.yRot, entity.xRot);
|
||||
}
|
||||
|
||||
public EntityPos(com.combatreforged.factory.api.world.entity.Entity entity) {
|
||||
public EntityPos(com.nexia.nexus.api.world.entity.Entity entity) {
|
||||
this(entity.getLocation().getX(), entity.getLocation().getY(), entity.getLocation().getZ(), entity.getLocation().getYaw(), entity.getLocation().getPitch());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.utilities.ranks;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.time.ServerTime;
|
||||
@@ -165,7 +165,7 @@ public class NexiaRank {
|
||||
player.removeTag(rank1.id);
|
||||
}
|
||||
|
||||
ServerTime.factoryServer.runCommand(String.format("/lp user %s parent set %s", player.getRawName(), rank.id));
|
||||
ServerTime.nexusServer.runCommand(String.format("/lp user %s parent set %s", player.getRawName(), rank.id));
|
||||
player.addTag(rank.id);
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ public class NexiaRank {
|
||||
setPrefix(NexiaRank.DEFAULT, player);
|
||||
}
|
||||
|
||||
ServerTime.factoryServer.runCommand(String.format("/lp user %s permission unset nexia.prefix.%s",
|
||||
ServerTime.nexusServer.runCommand(String.format("/lp user %s permission unset nexia.prefix.%s",
|
||||
player.getRawName(), rank.id)
|
||||
);
|
||||
}
|
||||
@@ -192,7 +192,7 @@ public class NexiaRank {
|
||||
setPrefix(rank, player);
|
||||
}
|
||||
|
||||
ServerTime.factoryServer.runCommand(String.format("/lp user %s permission set nexia.prefix.%s",
|
||||
ServerTime.nexusServer.runCommand(String.format("/lp user %s permission set nexia.prefix.%s",
|
||||
player.getRawName(), rank.id)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.core.utilities.time;
|
||||
|
||||
import com.combatreforged.factory.api.FactoryAPI;
|
||||
import com.combatreforged.factory.api.FactoryServer;
|
||||
import com.combatreforged.factory.api.scheduler.TaskScheduler;
|
||||
import com.nexia.nexus.api.NexusAPI;
|
||||
import com.nexia.nexus.api.NexusServer;
|
||||
import com.nexia.nexus.api.scheduler.TaskScheduler;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.LegacyChatFormat;
|
||||
import com.nexia.core.utilities.ranks.NexiaRank;
|
||||
@@ -37,9 +37,9 @@ public class ServerTime {
|
||||
|
||||
public static MinecraftServer minecraftServer = null;
|
||||
|
||||
public static FactoryServer factoryServer = null;
|
||||
public static NexusServer nexusServer = null;
|
||||
|
||||
public static FactoryAPI factoryAPI = null;
|
||||
public static NexusAPI nexusAPI = null;
|
||||
|
||||
public static TaskScheduler scheduler = null;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.core.utilities.world;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.core.utilities.time.ServerTime;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
@@ -56,19 +56,19 @@ public class StructureMap {
|
||||
String start = "execute in " + name.getNamespace() + ":" + name.getId();
|
||||
|
||||
|
||||
if(forceLoad) ServerTime.factoryServer.runCommand(start + " run forceload add 0 0", 4, false);
|
||||
if(forceLoad) ServerTime.nexusServer.runCommand(start + " run forceload add 0 0", 4, false);
|
||||
|
||||
if(!stringRotation.trim().isEmpty() && this.rotation != Rotation.NO_ROTATION) {
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s,rotation:\"%s\"}", start, placePos.getX(), placePos.getY(), placePos.getZ(), this.id.getNamespace(), this.id.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ(), stringRotation), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s,rotation:\"%s\"}", start, placePos.getX(), placePos.getY(), placePos.getZ(), this.id.getNamespace(), this.id.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ(), stringRotation), 4, false);
|
||||
} else if(this.rotation == Rotation.NO_ROTATION){
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s}", start, placePos.getX(), placePos.getY(), placePos.getZ(), this.id.getNamespace(), this.id.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s}", start, placePos.getX(), placePos.getY(), placePos.getZ(), this.id.getNamespace(), this.id.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ()), 4, false);
|
||||
}
|
||||
|
||||
if(this.cleanUp) {
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:redstone_block", start, placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:redstone_block", start, placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
|
||||
ServerTime.factoryServer.runCommand(String.format("%s if block %s %s %s minecraft:structure_block run setblock %s %s %s air", start, placePos.getX(), placePos.getY(), placePos.getZ(), placePos.getX(), placePos.getY(), placePos.getZ()), 4,false);
|
||||
ServerTime.factoryServer.runCommand(String.format("%s if block %s %s %s minecraft:redstone_block run setblock %s %s %s air", start, placePos.getX() + 1, placePos.getY(), placePos.getZ(), placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s if block %s %s %s minecraft:structure_block run setblock %s %s %s air", start, placePos.getX(), placePos.getY(), placePos.getZ(), placePos.getX(), placePos.getY(), placePos.getZ()), 4,false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s if block %s %s %s minecraft:redstone_block run setblock %s %s %s air", start, placePos.getX() + 1, placePos.getY(), placePos.getZ(), placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,19 +86,19 @@ public class StructureMap {
|
||||
BlockPos pastePos = this.pastePos;
|
||||
boolean forceLoad = this.forceLoad;
|
||||
|
||||
if(forceLoad)ServerTime.factoryServer.runCommand(start + " run forceload add 0 0", 4, false);
|
||||
if(forceLoad)ServerTime.nexusServer.runCommand(start + " run forceload add 0 0", 4, false);
|
||||
|
||||
if(!stringRotation.trim().isEmpty() && this.rotation != Rotation.NO_ROTATION) {
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s,rotation:\"%s\"}", start, placePos.getX(), placePos.getY(), placePos.getZ(), Identifier.getNamespace(), Identifier.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ(), stringRotation), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s,rotation:\"%s\"}", start, placePos.getX(), placePos.getY(), placePos.getZ(), Identifier.getNamespace(), Identifier.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ(), stringRotation), 4, false);
|
||||
} else if(this.rotation == Rotation.NO_ROTATION){
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s}", start, placePos.getX(), placePos.getY(), placePos.getZ(), Identifier.getNamespace(), Identifier.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:structure_block{mode:'LOAD',name:'%s:%s',posX:%s,posY:%s,posZ:%s}", start, placePos.getX(), placePos.getY(), placePos.getZ(), Identifier.getNamespace(), Identifier.getId(), pastePos.getX(), pastePos.getY(), pastePos.getZ()), 4, false);
|
||||
}
|
||||
|
||||
if(this.cleanUp) {
|
||||
ServerTime.factoryServer.runCommand(String.format("%s run setblock %s %s %s minecraft:redstone_block", start, placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s run setblock %s %s %s minecraft:redstone_block", start, placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
|
||||
ServerTime.factoryServer.runCommand(String.format("%s if block %s %s %s minecraft:structure_block run setblock %s %s %s air", start, placePos.getX(), placePos.getY(), placePos.getZ(), placePos.getX(), placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.factoryServer.runCommand(String.format("%s if block %s %s %s minecraft:redstone_block run setblock %s %s %s air", start, placePos.getX() + 1, placePos.getY(), placePos.getZ(), placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s if block %s %s %s minecraft:structure_block run setblock %s %s %s air", start, placePos.getX(), placePos.getY(), placePos.getZ(), placePos.getX(), placePos.getY(), placePos.getZ()), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("%s if block %s %s %s minecraft:redstone_block run setblock %s %s %s air", start, placePos.getX() + 1, placePos.getY(), placePos.getZ(), placePos.getX() + 1, placePos.getY(), placePos.getZ()), 4, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.core.utilities.world;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.combatreforged.factory.api.world.World;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.nexus.api.world.World;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.utilities.time.ServerTime;
|
||||
import com.nexia.minigames.games.skywars.SkywarsGame;
|
||||
@@ -41,7 +41,7 @@ public class WorldUtil {
|
||||
}
|
||||
|
||||
public static World getWorld(@NotNull Level level) {
|
||||
return ServerTime.factoryServer.getWorld(WorldUtil.getIdentifierWorldName(level));
|
||||
return ServerTime.nexusServer.getWorld(WorldUtil.getIdentifierWorldName(level));
|
||||
}
|
||||
|
||||
public static String getWorldName(@NotNull Level level) {
|
||||
@@ -64,12 +64,12 @@ public class WorldUtil {
|
||||
ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(identifier.getNamespace(), identifier.getId())).location(),
|
||||
new RuntimeWorldConfig());
|
||||
FileUtils.forceDeleteOnExit(new File("/world/dimensions/" + identifier.getNamespace(), identifier.getId()));
|
||||
ServerTime.factoryServer.unloadWorld(identifier.getNamespace() + ":" + identifier.getId(), false);
|
||||
ServerTime.nexusServer.unloadWorld(identifier.getNamespace() + ":" + identifier.getId(), false);
|
||||
} catch (Exception e) {
|
||||
Main.logger.error("Error occurred while deleting world: {}:{}", identifier.getNamespace(), identifier.getId());
|
||||
|
||||
try {
|
||||
ServerTime.factoryServer.unloadWorld(identifier.getNamespace() + ":" + identifier.getId(), false);
|
||||
ServerTime.nexusServer.unloadWorld(identifier.getNamespace() + ":" + identifier.getId(), false);
|
||||
} catch (Exception ignored2) {
|
||||
if(Main.config.debugMode) e.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.discord.commands.minecraft;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.discord.commands.minecraft;
|
||||
|
||||
import com.combatreforged.factory.api.command.CommandSourceInfo;
|
||||
import com.combatreforged.factory.api.command.CommandUtils;
|
||||
import com.nexia.nexus.api.command.CommandSourceInfo;
|
||||
import com.nexia.nexus.api.command.CommandUtils;
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.ffa.classic.utilities;
|
||||
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.google.gson.Gson;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
@@ -197,7 +197,7 @@ public class FfaClassicUtil {
|
||||
}
|
||||
}
|
||||
|
||||
for (Player fPlayer : ServerTime.factoryServer.getPlayers()) {
|
||||
for (Player fPlayer : ServerTime.nexusServer.getPlayers()) {
|
||||
if (fPlayer.hasTag("ffa_classic")) player.sendMessage(msg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.ffa.classic.utilities;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.ranks.NexiaRank;
|
||||
import com.nexia.core.utilities.time.ServerTime;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.ffa.kits.utilities;
|
||||
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.gui.ffa.KitGUI;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
@@ -215,8 +215,8 @@ public class FfaKitsUtil {
|
||||
}
|
||||
}
|
||||
|
||||
for (Player factoryPlayer : ServerTime.factoryServer.getPlayers()) {
|
||||
if (factoryPlayer.hasTag("ffa_kits")) player.sendMessage(msg);
|
||||
for (Player nexusPlayer : ServerTime.nexusServer.getPlayers()) {
|
||||
if (nexusPlayer.hasTag("ffa_kits")) player.sendMessage(msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.ffa.sky.utilities;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.google.gson.Gson;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.nexia.ffa.uhc.utilities;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.combatreforged.factory.api.world.entity.Entity;
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.nexus.api.world.entity.Entity;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.pos.EntityPos;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.ffa.uhc.utilities;
|
||||
|
||||
import com.combatreforged.factory.api.world.entity.player.Player;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.entity.player.Player;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.google.gson.Gson;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
@@ -252,7 +252,7 @@ public class FfaUhcUtil {
|
||||
}
|
||||
}
|
||||
|
||||
for (Player player : ServerTime.factoryServer.getPlayers()) {
|
||||
for (Player player : ServerTime.nexusServer.getPlayers()) {
|
||||
if (player.hasTag("ffa_uhc")) player.sendMessage(msg);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.bedwars.players;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.BlockUtil;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.bedwars.players;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -236,7 +236,7 @@ public class BwTeam {
|
||||
|
||||
public static void reloadPlayerTeamColors() {
|
||||
for (BwTeam team : teamsInOrder) {
|
||||
ServerTime.factoryServer.runCommand(String.format("team modify %s color %s", team.scoreboardTeam.getName(), team.textColorName), 4, false);
|
||||
ServerTime.nexusServer.runCommand(String.format("team modify %s color %s", team.scoreboardTeam.getName(), team.textColorName), 4, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.bedwars.util;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.item.ItemStackUtil;
|
||||
import com.nexia.core.utilities.pos.EntityPos;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.bedwars.util;
|
||||
|
||||
import com.combatreforged.factory.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
import com.nexia.core.utilities.chat.LegacyChatFormat;
|
||||
import com.nexia.core.utilities.item.BlockUtil;
|
||||
|
||||
@@ -191,7 +191,7 @@ public class BwUtil {
|
||||
return !BwUtil.isDefaultSword(itemStack);
|
||||
}
|
||||
|
||||
public static boolean canDropItem(com.combatreforged.factory.api.world.item.ItemStack itemStack) {
|
||||
public static boolean canDropItem(com.nexia.nexus.api.world.item.ItemStack itemStack) {
|
||||
String item = itemStack.getDisplayName().toString().toLowerCase();
|
||||
if (item.contains("pickaxe") || item.contains("axe")|| item.contains("shears")) {
|
||||
return false;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.google.gson.Gson;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.custom;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.custom.kitroom.kitrooms;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.world.StructureMap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.nexia.minigames.games.duels.custom.kitroom.kitrooms;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.time.ServerTime;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.custom.kitroom.kitrooms;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.world.StructureMap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.custom.kitroom.kitrooms;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.core.utilities.player.NexiaPlayer;
|
||||
import com.nexia.core.utilities.world.StructureMap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.custom.team;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.Main;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.gamemodes;
|
||||
|
||||
import com.combatreforged.factory.api.world.types.Minecraft;
|
||||
import com.nexia.nexus.api.world.types.Minecraft;
|
||||
import com.nexia.core.games.util.LobbyUtil;
|
||||
import com.nexia.core.games.util.PlayerGameMode;
|
||||
import com.nexia.core.utilities.chat.ChatFormat;
|
||||
@@ -130,7 +130,7 @@ public class GamemodeHandler {
|
||||
|
||||
/*
|
||||
if(playerData.teamDuelsGame != null) {
|
||||
factoryExecutor.sendMessage(Component.text("Spectating Team Duels is currently not available. We are sorry for the inconvenience.").color(ChatFormat.failColor));
|
||||
nexusExecutor.sendMessage(Component.text("Spectating Team Duels is currently not available. We are sorry for the inconvenience.").color(ChatFormat.failColor));
|
||||
return;
|
||||
}
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.nexia.minigames.games.duels.map;
|
||||
|
||||
import com.combatreforged.factory.api.util.Identifier;
|
||||
import com.nexia.nexus.api.util.Identifier;
|
||||
import com.nexia.core.utilities.world.StructureMap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
Loaded 100 of 106 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user