Skip to content

Commit

Permalink
Update Config
Browse files Browse the repository at this point in the history
  • Loading branch information
@VocanicZ
VocanicZ committed Nov 16, 2023
1 parent bc0e3b5 commit 3d55edf
Show file tree
Hide file tree
Showing 6 changed files with 231 additions and 71 deletions.
20 changes: 17 additions & 3 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

version = '1.12.2-1-server'
version = '1.12.2-2-server'
group = 'net.rainbowcreation' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'RBCextension'

Expand Down
124 changes: 70 additions & 54 deletions src/main/java/net/rainbowcreation/serverExtension/main.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.rainbowcreation.serverExtension;

import ibxm.Player;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
Expand All @@ -20,18 +19,13 @@
import net.rainbowcreation.serverExtension.utils.Reference;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Spliterator;
import java.util.*;

import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextFormatting;
import net.rainbowcreation.serverExtension.utils.Teleport;
import net.rainbowcreation.serverExtension.utils.Time;
import org.lwjgl.Sys;

import static net.rainbowcreation.serverExtension.utils.Confighandler.settings;

Expand All @@ -41,13 +35,21 @@ public class main {
@Mod.Instance
public static main instance;
public static File config;
public static final int staticTimeInTicks = settings.TIME * 20;
public static List<Integer> WARNING_TIME_LIST = new ArrayList<>();
private static final int staticTime = settings.TIME;

private static int timeRemaining = staticTime;
private static int[] timePrevious = new int[3];
private static List<String> whitelist = Arrays.asList(Confighandler.whitelist.ITEM_WHITELIST);
private static int Tick = 20;
private static int tick = Tick;
private static int[] M_TIME_TO_1;
private static SPacketTitle PACKET_MAINTENANCE;
private static TextComponentString MAINTENANCE_TEXT = new TextComponentString(TextFormatting.RED + "Daily Maintenance " + TextFormatting.RESET);

public static int timeInTicks = staticTimeInTicks;

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
instance = this;
List<String> header = Arrays.asList("######################################################################################",
"# _____ _ ____ _____ _ _ #",
"# | __ \\ (_) | _ \\ / ____| | | (_) #",
Expand All @@ -57,91 +59,105 @@ public void preInit(FMLPreInitializationEvent event) {
"# |_| \\_\\__,_|_|_| |_|____/ \\___/ \\_/\\_/ \\_____|_| \\___|\\__,_|\\__|_|\\___/|_| |_| #",
"# #",
"################################################################sever-extension#######");
System.out.println("Mode:" +Reference.MODE);
for (String txt : header) {
System.out.println("Mode:" +settings.MODE);
for (String txt : header)
System.out.println(txt);
}
int i = settings.WARNING_TIME;
while (i > 10) {
WARNING_TIME_LIST.add(i);
Time.WARNING_TIME_LIST.add(i);
i/=2;
}
for (int j = 1; j <= 10; j++)
WARNING_TIME_LIST.add(j);
Time.WARNING_TIME_LIST.add(j);
Time.prefix = settings.TIME_ZONE_PREFIX;
Time.offset = settings.TIME_ZONE_OFFSET;
timePrevious = Time.getCurrentTime();
String[] TIME_FROM = Time.timeToString(settings.M_TIME_FROM);
String[] TIME_TO = Time.timeToString(settings.M_TIME_TO);
M_TIME_TO_1 = Time.getSubstract(settings.M_TIME_TO, new int[]{0,0,1});
MAINTENANCE_TEXT.appendSibling(new TextComponentString(TIME_FROM[0] + ":" + TIME_FROM[1] + TextFormatting.RED + "-" + TextFormatting.RESET + TIME_TO[0] + ":" + TIME_TO[1] + TextFormatting.RED));
PACKET_MAINTENANCE = new SPacketTitle(SPacketTitle.Type.TITLE, MAINTENANCE_TEXT, 0, 100,0);
}

@SubscribeEvent
public static void worldTick(TickEvent.WorldTickEvent event) {
if (tick > 0) {
tick--;
return;
}
else
tick = Tick;
int[] time = Time.getCurrentTime();
if (time[2] == timePrevious[2])
return;
World world = event.world;
PlayerList playerList = world.getMinecraftServer().getPlayerList();
List<EntityPlayerMP> plist = playerList.getPlayers();
if (timeInTicks == 0) {
int amount = 0;
for (Entity entity : world.loadedEntityList) {
if (entity instanceof EntityItem) {
EntityItem item = (EntityItem) entity;
List<String> whitelist = Arrays.asList(Confighandler.whitelist.ITEM_WHITELIST);
if (!whitelist.contains(((ResourceLocation) Item.REGISTRY.getNameForObject(item.getItem().getItem())).toString())) {
item.setDead();
amount++;
if (timeRemaining == 0) {
if (settings.clearItems) {
int amount = 0;
for (Entity entity : world.loadedEntityList) {
if (entity instanceof EntityItem) {
EntityItem item = (EntityItem) entity;
if (!whitelist.contains(((ResourceLocation) Item.REGISTRY.getNameForObject(item.getItem().getItem())).toString())) {
item.setDead();
amount++;
}
}
}
if (settings.MODE.equals("server"))
playerList.sendMessage((ITextComponent) new TextComponentString(TextFormatting.BOLD + "[Clear Lag] " + TextFormatting.RESET + "Cleared " + TextFormatting.RED + amount + TextFormatting.RESET + " items!"));
}
if (Reference.MODE.equals("server")) {
playerList.sendMessage((ITextComponent) new TextComponentString(TextFormatting.BOLD + "[Clear Lag] " + TextFormatting.RESET + "Cleared " + TextFormatting.RED + amount + TextFormatting.RESET + " items!"));
}
timeInTicks = staticTimeInTicks;
timeRemaining = staticTime;
return;
}
switch (Reference.MODE) {
switch (settings.MODE) {
case ("server"): {
for (int i: WARNING_TIME_LIST) {
if (i * 20 == timeInTicks) {
long[] lst = Time.secondToMinute(i);
TextComponentString text = new TextComponentString(TextFormatting.BOLD + "[Clear Lag] " + TextFormatting.RESET + "Items will be cleared :");
if (lst[0] > 0)
text.appendSibling(new TextComponentString(" " + TextFormatting.RED + String.valueOf(lst[0]) + TextFormatting.RESET + " minutes"));
if (lst[1] > 0)
text.appendSibling(new TextComponentString(" " + TextFormatting.RED + String.valueOf(lst[1]) + TextFormatting.RESET + " seconds"));
text.appendText("!!.");
playerList.sendMessage(text);
}
if (time[0] != timePrevious[0]) {
playerList.sendMessage(new TextComponentString(TextFormatting.BOLD + "[Maintenance Scheduler] " + TextFormatting.RESET).appendSibling(MAINTENANCE_TEXT));
}
if (!Time.alert(settings.M_TIME_FROM, "Maintenance Scheduler", "Server close in", playerList, true))
Time.alert(timeRemaining, "Clear Lag", "Items will be cleared in", playerList);
if (Time.getSubstractInSecond(settings.M_TIME_FROM, Time.getCurrentTime()) == 0) {
world.getMinecraftServer().initiateShutdown();
return;
}
break;
}
case ("lobby"): {
if (timeInTicks%20 != 0)
break;
int[] time = Time.getCurrentTime();
if (time[0] >= 3 && time[0] < 6) {
if (time[0] >= settings.M_TIME_FROM[0] && time[0] < settings.M_TIME_TO[0]) {
TextComponentString text = new TextComponentString("Time remaining ");
if (time[0] < 5)
text.appendSibling(new TextComponentString(TextFormatting.RED + String.valueOf(5 - time[0]) + TextFormatting.RESET + ":"));
String minute = String.valueOf(59 - time[1]);
String second = String.valueOf(59 - time[2]);
if (time[0] < M_TIME_TO_1[0])
text.appendSibling(new TextComponentString(TextFormatting.RED + String.valueOf(M_TIME_TO_1[0] - time[0]) + TextFormatting.RESET + ":"));
String minute = String.valueOf(M_TIME_TO_1[1] - time[1]);
String second = String.valueOf(M_TIME_TO_1[2] - time[2]);
if (minute.length() == 1)
minute = "0" + minute;
if (second.length() == 1)
second = "0" + second;
SPacketTitle timeTitle = new SPacketTitle(SPacketTitle.Type.SUBTITLE, text.appendSibling(new TextComponentString(TextFormatting.RED + minute + TextFormatting.RESET + ":" + TextFormatting.RED + second)), 0, 20, 0);
SPacketTitle timeTitle = new SPacketTitle(SPacketTitle.Type.SUBTITLE, text.appendSibling(new TextComponentString(TextFormatting.RED + minute + TextFormatting.RESET + ":" + TextFormatting.RED + second)), 0, 100, 0);
for (EntityPlayerMP playerMP : plist) {
playerMP.connection.sendPacket(Reference.PACKET_MAINTENANCE);
playerMP.connection.sendPacket(PACKET_MAINTENANCE);
playerMP.connection.sendPacket(timeTitle);
}
}
else if (time[0] == 6 && time[1] == 0 && time[2] == 0)
else if (time[0] == settings.M_TIME_TO[0] && time[1] == settings.M_TIME_TO[1] && time[2] == settings.M_TIME_TO[2]) {
for (EntityPlayerMP playerMP : plist)
playerMP.connection.sendPacket(Reference.PACKET_MAINTENANCE_COMPLETE);
playerList.sendMessage(new TextComponentString(TextFormatting.BOLD + "[Maintenance Completed] " + TextFormatting.RESET + "please reconnect the server to enter the portal!"));
}
break;
}
}
if (timeInTicks > 0)
timeInTicks--;
timeRemaining-= Time.getSubstractInSecond(time, timePrevious);
timePrevious = time;
}

@SubscribeEvent
public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
//V only in looby
EntityPlayer player = event.player;
switch (Reference.MODE) {
switch (settings.MODE) {
case ("lobby"): {
double x, y, z;
x = -23.5;
Expand Down
19 changes: 17 additions & 2 deletions src/main/java/net/rainbowcreation/serverExtension/utils/Confighandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,35 @@ public class Confighandler {
public static Settings settings = new Settings();
public static class Settings {
@Config.Comment({"Time in seconds between each clear"})
public int TIME = 3600;
public int TIME = 1800;

@Comment({"Time in seconds clear is announced to chat before-hand, set to zero to disable warning"})
public int WARNING_TIME = 900;

@Comment({"Set to false to disable item clearing"})
public boolean clearItems = true;

@Comment({"Set Time Zone Prefix [GMT, UTC]"})
public String TIME_ZONE_PREFIX = "UTC";

@Comment({"Set Time Zone Offset -> '+07:00', '-09:00'"})
public String TIME_ZONE_OFFSET = "+07:00";

@Comment({"Set maintance time from [H, M, S] in 24 clock"})
public int[] M_TIME_FROM = Time.secondToTime(3600*3);

@Comment({"Set maintenance time to [H, M, S] in 24 clock"})
public int[] M_TIME_TO = Time.secondToTime(3600*6);

@Comment({"Mode of the instance [server, lobby]"})
public String MODE = "server";
}

public static Whitelist whitelist = new Whitelist();

public static class Whitelist {
@Comment({"Item IDs of items to be ignored when clearing, these items will not be cleared. Format: modid:itemid, ex: minecraft:diamond"})
public String[] ITEM_WHITELIST = new String[] { "minecraft:diamond", "minecraft:diamond_block", "xpbook:xp_book" };
public String[] ITEM_WHITELIST = new String[] { "minecraft:diamond", "minecraft:diamond_block" };
}

@SubscribeEvent
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/rainbowcreation/serverExtension/utils/Reference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
public class Reference {
public static final String MODID = "server_extension";
public static final String NAME = "server_extension";
public static final String VERSION = "1.12.2-1";
public static final String MODE = "lobby"; //[server, lobby]
public static final String VERSION = "1.12.2-2";
public static final SPacketTitle PACKET_TITLE = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString("Welcome to") , 20, 120, 20);
public static final SPacketTitle PACKET_SUB_TITLE = new SPacketTitle(SPacketTitle.Type.SUBTITLE, new TextComponentString("play." + TextFormatting.GREEN + "R" + TextFormatting.AQUA + "a" + TextFormatting.LIGHT_PURPLE + "i" + TextFormatting.RED + "n" + TextFormatting.YELLOW + "B" + TextFormatting.GREEN + "o" + TextFormatting.AQUA + "w" + TextFormatting.RESET + "Creation.net"), 20, 120, 20);
public static final SPacketTitle PACKET_MAINTENANCE = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString(TextFormatting.RED + "Daily Maintenance " + TextFormatting.RESET + "3:00-6:00" + TextFormatting.RED + "AM") , 0, 20, 0);
public static final SPacketTitle PACKET_MAINTENANCE_COMPLETE = new SPacketTitle(SPacketTitle.Type.TITLE, new TextComponentString(TextFormatting.RED + "Daily Maintenance " + TextFormatting.GREEN + "Completed!!") , 10, 200, 10);
}
Loading

0 comments on commit 3d55edf

Please sign in to comment.