Skip to content

Commit

Permalink
Add a 'Server Welcome Message'
Browse files Browse the repository at this point in the history
Reduces confusion for those setting up Dedicated Servers
  • Loading branch information
IntegerLimit committed Feb 17, 2025
1 parent 6e14c06 commit b156e19
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/main/java/com/nomiceu/nomilabs/config/LabsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,12 @@ public static class Advanced {
@Config.LangKey("config.nomilabs.advanced.server_motd_substitutions")
public boolean serverMotdSubstitutions = false;

@Config.Comment({ "Name of server when displaying welcome messages. Only applies to Dedicated Servers.",
"[default: Minecraft]" })
@Config.RequiresMcRestart
@Config.LangKey("config.nomilabs.advanced.server_welcome_name")
public String serverWelcomeName = "Minecraft";

public static class WindowOverrides {

@Config.Comment({ "Override for the Minecraft Window Title.",
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/nomiceu/nomilabs/event/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.common.config.Config;
import net.minecraftforge.common.config.ConfigManager;
Expand All @@ -11,18 +12,22 @@
import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.common.registry.EntityEntry;
import net.minecraftforge.registries.IForgeRegistry;

import com.cleanroommc.groovyscript.event.GsHandEvent;
import com.cleanroommc.groovyscript.event.ScriptRunEvent;
import com.nomiceu.nomilabs.LabsSounds;
import com.nomiceu.nomilabs.LabsValues;
import com.nomiceu.nomilabs.NomiLabs;
import com.nomiceu.nomilabs.block.registry.LabsBlocks;
import com.nomiceu.nomilabs.config.LabsConfig;
import com.nomiceu.nomilabs.config.LabsVersionConfig;
import com.nomiceu.nomilabs.creativetab.registry.LabsCreativeTabs;
import com.nomiceu.nomilabs.dimension.LabsDimensions;
import com.nomiceu.nomilabs.fluid.FluidRegistryMixinHelper;
Expand Down Expand Up @@ -56,6 +61,7 @@
import com.nomiceu.nomilabs.util.LabsDifficultyHelper;
import com.nomiceu.nomilabs.util.LabsModeHelper;
import com.nomiceu.nomilabs.util.LabsNames;
import com.nomiceu.nomilabs.util.LabsSide;

import gregtech.api.GregTechAPI;
import gregtech.api.unification.material.event.MaterialEvent;
Expand All @@ -64,6 +70,8 @@

public class CommonProxy {

public static boolean serverStartedMsg = false;

public static void onConstruction() {
LabsNetworkHandler.onConstruction();
}
Expand Down Expand Up @@ -174,6 +182,22 @@ public static void onWorldLoad(WorldEvent.Load event) {
event.getWorld().getWorldInfo().setDifficultyLocked(true);
}

@SubscribeEvent
public static void onTickEnd(TickEvent.ServerTickEvent event) {
if (serverStartedMsg || !LabsSide.isDedicatedServer() || event.phase != TickEvent.Phase.END)
return;

serverStartedMsg = true;
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
NomiLabs.LOGGER.info("=========================================================");
NomiLabs.LOGGER.info("{} Server Successfully Started!", LabsConfig.advanced.serverWelcomeName);
NomiLabs.LOGGER.info(" - Pack Version: {}", LabsVersionConfig.formattedVersion);
NomiLabs.LOGGER.info(" - Mode: {}", LabsModeHelper.getFormattedMode());
NomiLabs.LOGGER.info(" - Port: {}", server.getServerPort());
NomiLabs.LOGGER.info("Players Can Now Join!");
NomiLabs.LOGGER.info("=========================================================");
}

@SubscribeEvent
public static void onEquipmentChangeEvent(LivingEquipmentChangeEvent event) {
ItemExcitationCoil.onEquipmentChange(event);
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/nomilabs/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ config.nomilabs.advanced.client_side_fields=Client Side ONLY Fields
config.nomilabs.advanced.client_side_methods=Client Side ONLY Methods
config.nomilabs.advanced.server_side_fields=Server Side ONLY Fields
config.nomilabs.advanced.server_side_methods=Server Side ONLY Methods
config.nomilabs.advanced.server_welcome_name=Server Welcome Name

config.nomilabs.advanced.tiers=Quest Tier Detector Settings
config.nomilabs.advanced.tiers.normal_qb_ids=Normal Mode Quest IDs
Expand Down

0 comments on commit b156e19

Please sign in to comment.