mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-02-23 07:41:42 +01:00
Add IntelliJ IDEA runnable
This commit is contained in:
parent
6c04ab54c4
commit
255f36d32b
4
.gitignore
vendored
4
.gitignore
vendored
@ -26,4 +26,6 @@ target/site/surefire-report.html
|
||||
!/patches/Rainforest/api.txt
|
||||
!/patches/Origami/server.txt
|
||||
!/patches/Origami/api.txt
|
||||
yatopia-1.16.3-paperclip.jar
|
||||
*.jar
|
||||
|
||||
/testserver/**
|
@ -31,37 +31,37 @@ index 323d489b1e690500986bc0cbb4c2c93cc193bf70..54e54cf4ed710923cc93d4ba77c37854
|
||||
// Purpur start - tps catchup
|
||||
diff --git a/src/main/java/net/yatopia/server/TimeUtils.java b/src/main/java/net/yatopia/server/TimeUtils.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e4a18248cc6f872a9335eb70c12f7aa90b64d7a6
|
||||
index 0000000000000000000000000000000000000000..b506aaeab4ad997b83d3aa6daaab6eea52a08568
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/yatopia/server/TimeUtils.java
|
||||
@@ -0,0 +1,27 @@
|
||||
+package net.yatopia.server;
|
||||
+
|
||||
+import java.util.concurrent.TimeUnit;
|
||||
+
|
||||
+public class TimeUtils {
|
||||
+
|
||||
+ public static String getFriendlyName(TimeUnit unit) {
|
||||
+ switch (unit) {
|
||||
+ case NANOSECONDS:
|
||||
+ return "ns";
|
||||
+ case MILLISECONDS:
|
||||
+ return "ms";
|
||||
+ case MICROSECONDS:
|
||||
+ return "micros";
|
||||
+ case SECONDS:
|
||||
+ return "s";
|
||||
+ case MINUTES:
|
||||
+ return "m";
|
||||
+ case DAYS:
|
||||
+ return "d";
|
||||
+ case HOURS:
|
||||
+ return "h";
|
||||
+ default:
|
||||
+ throw new AssertionError();
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+package net.yatopia.server;
|
||||
+
|
||||
+import java.util.concurrent.TimeUnit;
|
||||
+
|
||||
+public class TimeUtils {
|
||||
+
|
||||
+ public static String getFriendlyName(TimeUnit unit) {
|
||||
+ switch (unit) {
|
||||
+ case NANOSECONDS:
|
||||
+ return "ns";
|
||||
+ case MILLISECONDS:
|
||||
+ return "ms";
|
||||
+ case MICROSECONDS:
|
||||
+ return "micros";
|
||||
+ case SECONDS:
|
||||
+ return "s";
|
||||
+ case MINUTES:
|
||||
+ return "m";
|
||||
+ case DAYS:
|
||||
+ return "d";
|
||||
+ case HOURS:
|
||||
+ return "h";
|
||||
+ default:
|
||||
+ throw new AssertionError();
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 42628d6dbf54977d34442f46c89b771af3af5b11..4bae0e82bc25b576a23b5f05af7c3ad944a54bcf 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
|
36
patches/server/0057-Add-IntelliJ-IDEA-runnable.patch
Normal file
36
patches/server/0057-Add-IntelliJ-IDEA-runnable.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Bud Gidiere <sgidiere@gmail.com>
|
||||
Date: Sun, 27 Sep 2020 17:07:16 -0500
|
||||
Subject: [PATCH] Add IntelliJ IDEA runnable
|
||||
|
||||
|
||||
diff --git a/.run/Yatopia.run.xml b/.run/Yatopia.run.xml
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..b387d63ce699a54d09bf5109e6439b2db8f26805
|
||||
--- /dev/null
|
||||
+++ b/.run/Yatopia.run.xml
|
||||
@@ -0,0 +1,23 @@
|
||||
+<component name="ProjectRunConfigurationManager">
|
||||
+ <configuration default="false" name="Yatopia" type="Application" factoryName="Application">
|
||||
+ <option name="MAIN_CLASS_NAME" value="org.bukkit.craftbukkit.Main" />
|
||||
+ <module name="yatopia" />
|
||||
+ <option name="PROGRAM_PARAMETERS" value="nogui" />
|
||||
+ <selectedOptions>
|
||||
+ <option name="before.launch.openToolWindow" />
|
||||
+ <option name="beforeRunTasks" />
|
||||
+ <option name="commandLineParameters" />
|
||||
+ <option name="doNotBuildBeforeRun" />
|
||||
+ <option name="environmentVariables" />
|
||||
+ <option name="jrePath" />
|
||||
+ <option name="mainClass" />
|
||||
+ <option name="vmParameters" />
|
||||
+ <option name="workingDirectory" />
|
||||
+ </selectedOptions>
|
||||
+ <option name="VM_PARAMETERS" value="-Xms4G -Xmx4G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true" />
|
||||
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../testserver" />
|
||||
+ <method v="2">
|
||||
+ <option name="MakeProject" enabled="true" />
|
||||
+ </method>
|
||||
+ </configuration>
|
||||
+</component>
|
||||
\ No newline at end of file
|
Loading…
Reference in New Issue
Block a user