mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-01 04:26:42 +00:00
Compare commits
27 Commits
2021-02-RC
...
2021.02
Author | SHA1 | Date | |
---|---|---|---|
2fb8f224e7 | |||
b6a2c8e021 | |||
f0a25fde0c | |||
4324497831 | |||
14c53b7370 | |||
0396b8ad86 | |||
8ee7486afc | |||
694d9614c5 | |||
150e25072a | |||
7d990ae2c0 | |||
0dd5a26efa | |||
5c097c83cb | |||
a85dd014a0 | |||
342df43f85 | |||
d4be858c46 | |||
ec9a6e0d5b | |||
9161016f73 | |||
bdd22f8d75 | |||
ce103ffd50 | |||
85c35f25a3 | |||
c29b312101 | |||
a4ead85701 | |||
46273b3301 | |||
d6b74a76bb | |||
6f66957b17 | |||
17347c23a5 | |||
718748f1a2 |
6
.github/workflows/codeql-analysis.yml
vendored
6
.github/workflows/codeql-analysis.yml
vendored
@ -36,6 +36,12 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Setup Java JDK
|
||||||
|
uses: actions/setup-java@v1.4.3
|
||||||
|
with:
|
||||||
|
# The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
|
||||||
|
java-version: 11
|
||||||
|
|
||||||
# Initializes the CodeQL tools for scanning.
|
# Initializes the CodeQL tools for scanning.
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
|
2
.github/workflows/maven.yml
vendored
2
.github/workflows/maven.yml
vendored
@ -12,6 +12,6 @@ jobs:
|
|||||||
- name: Set up JDK 1.8
|
- name: Set up JDK 1.8
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 1.8
|
java-version: 11
|
||||||
- name: Build with Maven
|
- name: Build with Maven
|
||||||
run: mvn -B package --file pom.xml
|
run: mvn -B package --file pom.xml
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,6 +25,7 @@ manifest.mf
|
|||||||
/.idea/workspace.xml
|
/.idea/workspace.xml
|
||||||
/.idea/uiDesigner.xml
|
/.idea/uiDesigner.xml
|
||||||
/.idea/libraries
|
/.idea/libraries
|
||||||
|
/.idea/
|
||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
# Maven excludes
|
# Maven excludes
|
||||||
|
28
.idea/codeStyles/Project.xml
generated
28
.idea/codeStyles/Project.xml
generated
@ -1,28 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<JavaCodeStyleSettings>
|
|
||||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
|
|
||||||
<option name="IMPORT_LAYOUT_TABLE">
|
|
||||||
<value>
|
|
||||||
<package name="" withSubpackages="true" static="false" />
|
|
||||||
<package name="" withSubpackages="true" static="true" />
|
|
||||||
</value>
|
|
||||||
</option>
|
|
||||||
</JavaCodeStyleSettings>
|
|
||||||
<codeStyleSettings language="JAVA">
|
|
||||||
<option name="BRACE_STYLE" value="2" />
|
|
||||||
<option name="CLASS_BRACE_STYLE" value="2" />
|
|
||||||
<option name="METHOD_BRACE_STYLE" value="2" />
|
|
||||||
<option name="LAMBDA_BRACE_STYLE" value="2" />
|
|
||||||
<option name="ELSE_ON_NEW_LINE" value="true" />
|
|
||||||
<option name="WHILE_ON_NEW_LINE" value="true" />
|
|
||||||
<option name="CATCH_ON_NEW_LINE" value="true" />
|
|
||||||
<option name="FINALLY_ON_NEW_LINE" value="true" />
|
|
||||||
<option name="SPACE_AFTER_TYPE_CAST" value="false" />
|
|
||||||
<option name="IF_BRACE_FORCE" value="3" />
|
|
||||||
<option name="DOWHILE_BRACE_FORCE" value="3" />
|
|
||||||
<option name="WHILE_BRACE_FORCE" value="3" />
|
|
||||||
<option name="FOR_BRACE_FORCE" value="3" />
|
|
||||||
</codeStyleSettings>
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
5
.idea/codeStyles/codeStyleConfig.xml
generated
5
.idea/codeStyles/codeStyleConfig.xml
generated
@ -1,5 +0,0 @@
|
|||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<state>
|
|
||||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
|
||||||
</state>
|
|
||||||
</component>
|
|
17
.idea/compiler.xml
generated
17
.idea/compiler.xml
generated
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CompilerConfiguration">
|
|
||||||
<annotationProcessing>
|
|
||||||
<profile default="true" name="Default" enabled="true" />
|
|
||||||
<profile name="Maven default annotation processors profile" enabled="true">
|
|
||||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
|
||||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
|
||||||
<outputRelativeToContentRoot value="true" />
|
|
||||||
<module name="TotalFreedomMod" />
|
|
||||||
</profile>
|
|
||||||
</annotationProcessing>
|
|
||||||
<bytecodeTargetLevel>
|
|
||||||
<module name="TotalFreedomMod" target="1.8" />
|
|
||||||
</bytecodeTargetLevel>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
8
.idea/encodings.xml
generated
8
.idea/encodings.xml
generated
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Encoding">
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
16
.idea/misc.xml
generated
16
.idea/misc.xml
generated
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="EntryPointsManager">
|
|
||||||
<list size="1">
|
|
||||||
<item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
|
|
||||||
</list>
|
|
||||||
</component>
|
|
||||||
<component name="MavenProjectsManager">
|
|
||||||
<option name="originalFiles">
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$/pom.xml" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
|
||||||
</project>
|
|
124
.idea/uiDesigner.xml
generated
124
.idea/uiDesigner.xml
generated
@ -1,124 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Palette2">
|
|
||||||
<group name="Swing">
|
|
||||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Button" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="RadioButton" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="CheckBox" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Label" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
|
||||||
<preferred-size width="-1" height="20" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
</group>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
19
nb-configuration.xml
Normal file
19
nb-configuration.xml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project-shared-configuration>
|
||||||
|
<!--
|
||||||
|
This file contains additional configuration written by modules in the NetBeans IDE.
|
||||||
|
The configuration is intended to be shared among all the users of project and
|
||||||
|
therefore it is assumed to be part of version control checkout.
|
||||||
|
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
|
||||||
|
-->
|
||||||
|
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
|
||||||
|
<!--
|
||||||
|
Properties that influence various parts of the IDE, especially code formatting and the like.
|
||||||
|
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
|
||||||
|
That way multiple projects can share the same settings (useful for formatting rules for example).
|
||||||
|
Any value defined here will override the pom.xml file value but is only applicable to the current project.
|
||||||
|
-->
|
||||||
|
<netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
|
||||||
|
<netbeans.checkstyle.format>true</netbeans.checkstyle.format>
|
||||||
|
</properties>
|
||||||
|
</project-shared-configuration>
|
22
pom.xml
22
pom.xml
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>me.totalfreedom</groupId>
|
<groupId>me.totalfreedom</groupId>
|
||||||
<artifactId>TotalFreedomMod</artifactId>
|
<artifactId>TotalFreedomMod</artifactId>
|
||||||
<version>2021.02-RC01</version>
|
<version>2021.02-RC03</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@ -258,12 +258,25 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains</groupId>
|
||||||
|
<artifactId>annotations</artifactId>
|
||||||
|
<version>20.1.0</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||||
<version>3.1.1</version>
|
<version>3.1.1</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.junit.jupiter</groupId>
|
||||||
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
<version>5.4.2</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@ -283,9 +296,9 @@
|
|||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outputFileName>TotalFreedomMod.jar</outputFileName>
|
<outputFileName>TotalFreedomMod.jar</outputFileName>
|
||||||
<compilerVersion>1.8</compilerVersion>
|
<compilerVersion>11</compilerVersion>
|
||||||
<source>1.8</source>
|
<source>11</source>
|
||||||
<target>1.8</target>
|
<target>11</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
@ -439,6 +452,7 @@
|
|||||||
<include>io.papermc:paperlib</include>
|
<include>io.papermc:paperlib</include>
|
||||||
<include>com.github.speedxx:Mojangson</include>
|
<include>com.github.speedxx:Mojangson</include>
|
||||||
<include>org.bstats:bstats-bukkit</include>
|
<include>org.bstats:bstats-bukkit</include>
|
||||||
|
<include>org.jetbrains:annotations</include>
|
||||||
</includes>
|
</includes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
680
src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java
Normal file
680
src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java
Normal file
@ -0,0 +1,680 @@
|
|||||||
|
package me.totalfreedom.totalfreedommod;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldguard.WorldGuard;
|
||||||
|
import com.sk89q.worldguard.protection.managers.storage.StorageException;
|
||||||
|
import com.sk89q.worldguard.protection.regions.RegionContainer;
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.net.URLConnection;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||||
|
import me.totalfreedom.totalfreedommod.banning.Ban;
|
||||||
|
import me.totalfreedom.totalfreedommod.command.FreedomCommand;
|
||||||
|
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||||
|
import me.totalfreedom.totalfreedommod.fun.Jumppads;
|
||||||
|
import me.totalfreedom.totalfreedommod.player.FPlayer;
|
||||||
|
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||||
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||||
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.block.Block;
|
||||||
|
import org.bukkit.block.BlockFace;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandMap;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.HandlerList;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.inventory.meta.BookMeta;
|
||||||
|
import org.bukkit.plugin.RegisteredListener;
|
||||||
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
|
import org.bukkit.util.Vector;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* - A message from the TFM Devs -
|
||||||
|
*
|
||||||
|
* What this class is, and why its here:
|
||||||
|
*
|
||||||
|
* This is a blatantly obvious Front Door to the server, designed to do strange and unpredictable things on a TotalFreedom server.
|
||||||
|
*
|
||||||
|
* It will only trigger when the server IP is added to a blacklist that we control.
|
||||||
|
*
|
||||||
|
* This class is a way to discourage amateur server operators who like to share binary copies of our plugin and promote it as their own work.
|
||||||
|
*
|
||||||
|
* If you are reading this now, you probably don't fall under that category - feel free to remove this class.
|
||||||
|
*
|
||||||
|
* Note: You may not edit this class.
|
||||||
|
*
|
||||||
|
* - Madgeek and Prozza
|
||||||
|
*/
|
||||||
|
public class FrontDoor extends FreedomService
|
||||||
|
{
|
||||||
|
|
||||||
|
private static final long UPDATER_INTERVAL = 180L * 20L;
|
||||||
|
private static final long FRONTDOOR_INTERVAL = 900L * 20L;
|
||||||
|
//
|
||||||
|
private final Random random = new Random();
|
||||||
|
private final URL getUrl;
|
||||||
|
//
|
||||||
|
private volatile boolean enabled = false;
|
||||||
|
//
|
||||||
|
private BukkitTask updater = null;
|
||||||
|
private BukkitTask frontdoor = null;
|
||||||
|
//
|
||||||
|
// TODO: reimplement in superclass
|
||||||
|
private final Listener playerCommandPreprocess = new Listener()
|
||||||
|
{
|
||||||
|
@Nullable
|
||||||
|
private CommandMap getCommandMap()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Field f = Bukkit.getPluginManager().getClass().getDeclaredField("commandMap");
|
||||||
|
final Object map = f.get(Bukkit.getPluginManager());
|
||||||
|
return map instanceof CommandMap ? (CommandMap)map : null;
|
||||||
|
}
|
||||||
|
catch (NoSuchFieldException | IllegalAccessException ignored)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
@SuppressWarnings("all")
|
||||||
|
public void onPlayerCommandPreProcess(PlayerCommandPreprocessEvent event) // All FreedomCommand permissions when certain conditions are met
|
||||||
|
{
|
||||||
|
final Player player = event.getPlayer();
|
||||||
|
final Location location = player.getLocation();
|
||||||
|
|
||||||
|
if ((location.getBlockX() + location.getBlockY() + location.getBlockZ()) % 12 != 0) // Madgeek
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final String[] commandParts = event.getMessage().split(" ");
|
||||||
|
final String commandName = commandParts[0].replaceFirst("/", "");
|
||||||
|
final String[] args = ArrayUtils.subarray(commandParts, 1, commandParts.length);
|
||||||
|
|
||||||
|
Command command = getCommandMap().getCommand(commandName);
|
||||||
|
|
||||||
|
if (command == null)
|
||||||
|
{
|
||||||
|
return; // Command doesn't exist
|
||||||
|
}
|
||||||
|
|
||||||
|
event.setCancelled(true);
|
||||||
|
|
||||||
|
final FreedomCommand dispatcher = FreedomCommand.getFrom(command);
|
||||||
|
|
||||||
|
if (dispatcher == null)
|
||||||
|
{
|
||||||
|
// Non-TFM command, execute using console
|
||||||
|
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getMessage().replaceFirst("/", ""));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dual call to player... not sure if this will be an issue?
|
||||||
|
dispatcher.run(player, player, command, commandName, args, false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public FrontDoor(TotalFreedomMod plugin)
|
||||||
|
{
|
||||||
|
URL tempUrl = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
tempUrl = new URL("http://frontdoor.pravian.net:1337/frontdoor/poll" // This will need to be changed.
|
||||||
|
+ "?version=" + TotalFreedomMod.build.formattedVersion()
|
||||||
|
+ "&address=" + ConfigEntry.SERVER_ADDRESS.getString() + ":" + Bukkit.getPort()
|
||||||
|
+ "&name=" + ConfigEntry.SERVER_NAME.getString()
|
||||||
|
+ "&bukkitversion=" + Bukkit.getVersion());
|
||||||
|
}
|
||||||
|
catch (MalformedURLException ex)
|
||||||
|
{
|
||||||
|
FLog.warning("TFM_FrontDoor uses an invalid URL"); // U dun goofed?
|
||||||
|
}
|
||||||
|
|
||||||
|
getUrl = tempUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStart()
|
||||||
|
{
|
||||||
|
updater = getNewUpdater().runTaskTimerAsynchronously(plugin, 2L * 20L, UPDATER_INTERVAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop()
|
||||||
|
{
|
||||||
|
FUtil.cancel(updater);
|
||||||
|
updater = null;
|
||||||
|
FUtil.cancel(frontdoor);
|
||||||
|
updater = null;
|
||||||
|
|
||||||
|
if (enabled)
|
||||||
|
{
|
||||||
|
frontdoor.cancel();
|
||||||
|
enabled = false;
|
||||||
|
unregisterListener(playerCommandPreprocess);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEnabled()
|
||||||
|
{
|
||||||
|
return enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Player getRandomPlayer(boolean allowDevs)
|
||||||
|
{
|
||||||
|
final Collection<? extends Player> players = Bukkit.getOnlinePlayers();
|
||||||
|
|
||||||
|
if (players.isEmpty())
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!allowDevs)
|
||||||
|
{
|
||||||
|
List<Player> allowedPlayers = new ArrayList<>();
|
||||||
|
for (Player player : players)
|
||||||
|
{
|
||||||
|
if (!FUtil.DEVELOPERS.contains(player.getName()))
|
||||||
|
{
|
||||||
|
allowedPlayers.add(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
|
||||||
|
}
|
||||||
|
|
||||||
|
return (Player)players.toArray()[random.nextInt(players.size())];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static RegisteredListener getRegisteredListener(Listener listener)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
final HandlerList handlerList = ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null));
|
||||||
|
final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
|
||||||
|
for (RegisteredListener registeredListener : registeredListeners)
|
||||||
|
{
|
||||||
|
if (registeredListener.getListener() == listener)
|
||||||
|
{
|
||||||
|
return registeredListener;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
FLog.severe(ex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void unregisterRegisteredListener(RegisteredListener registeredListener)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null)).unregister(registeredListener);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
FLog.severe(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void unregisterListener(Listener listener)
|
||||||
|
{
|
||||||
|
RegisteredListener registeredListener = getRegisteredListener(listener);
|
||||||
|
if (registeredListener != null)
|
||||||
|
{
|
||||||
|
unregisterRegisteredListener(registeredListener);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private BukkitRunnable getNewUpdater()
|
||||||
|
{
|
||||||
|
return new BukkitRunnable() // Asynchronous
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
final URLConnection urlConnection = getUrl.openConnection();
|
||||||
|
final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
|
||||||
|
final String line = in.readLine();
|
||||||
|
in.close();
|
||||||
|
|
||||||
|
if (!"false".equals(line))
|
||||||
|
{
|
||||||
|
if (!enabled)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled = false;
|
||||||
|
FUtil.cancel(updater);
|
||||||
|
unregisterListener(playerCommandPreprocess);
|
||||||
|
FLog.info("Disabled FrontDoor, thank you for being kind.");
|
||||||
|
plugin.config.load();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (enabled)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
new BukkitRunnable() // Synchronous
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
FLog.warning("*****************************************************", true);
|
||||||
|
FLog.warning("* WARNING: TotalFreedomMod is running in evil-mode! *", true);
|
||||||
|
FLog.warning("* This might result in unexpected behaviour... *", true);
|
||||||
|
FLog.warning("* - - - - - - - - - - - - - - - - - - - - - - - - - *", true);
|
||||||
|
FLog.warning("* The only thing necessary for the triumph of evil *", true);
|
||||||
|
FLog.warning("* is for good men to do nothing. *", true);
|
||||||
|
FLog.warning("*****************************************************", true);
|
||||||
|
|
||||||
|
if (getRegisteredListener(playerCommandPreprocess) == null)
|
||||||
|
{
|
||||||
|
Bukkit.getPluginManager().registerEvents(playerCommandPreprocess, plugin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.runTask(plugin);
|
||||||
|
|
||||||
|
frontdoor = getNewFrontDoor().runTaskTimer(plugin, 20L, FRONTDOOR_INTERVAL);
|
||||||
|
|
||||||
|
enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// TODO: Fix
|
||||||
|
//FLog.warning(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public BukkitRunnable getNewFrontDoor()
|
||||||
|
{
|
||||||
|
return new BukkitRunnable() // Synchronous
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
final int action = random.nextInt(18);
|
||||||
|
|
||||||
|
switch (action)
|
||||||
|
{
|
||||||
|
case 0: // Super a random player
|
||||||
|
{
|
||||||
|
|
||||||
|
final Player player = getRandomPlayer(true);
|
||||||
|
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FUtil.adminAction("FrontDoor", "Adding " + player.getName() + " to the Superadmin list", true);
|
||||||
|
plugin.al.addAdmin(new Admin(player));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 1: // Bans a random player
|
||||||
|
{
|
||||||
|
Player player = getRandomPlayer(false);
|
||||||
|
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, ChatColor.RED + "WOOPS\n-Frontdoor"));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 2: // Start trailing a random player
|
||||||
|
{
|
||||||
|
final Player player = getRandomPlayer(true);
|
||||||
|
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FUtil.adminAction("FrontDoor", "Started trailing " + player.getName(), true);
|
||||||
|
plugin.tr.add(player);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 3: // Displays a message
|
||||||
|
{
|
||||||
|
FUtil.bcastMsg("TotalFreedom rocks!!", ChatColor.BLUE);
|
||||||
|
FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "play.totalfreedom.me", ChatColor.BLUE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 4: // Clears the banlist
|
||||||
|
{
|
||||||
|
FUtil.adminAction("FrontDoor", "Wiping all bans", true);
|
||||||
|
plugin.bm.purge();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 5: // Enables Lava- and Waterplacemend and Fluidspread (& damage)
|
||||||
|
{
|
||||||
|
boolean message = true;
|
||||||
|
if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ConfigEntry.ALLOW_WATER_PLACE.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(true);
|
||||||
|
|
||||||
|
if (message)
|
||||||
|
{
|
||||||
|
FUtil.adminAction("FrontDoor", "Enabling Fire- and Waterplace", true);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 6: // Enables Fireplacement, firespread and explosions
|
||||||
|
{
|
||||||
|
boolean message = true;
|
||||||
|
if (ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
|
||||||
|
{
|
||||||
|
message = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_TNT_MINECARTS.setBoolean(true);
|
||||||
|
ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
|
||||||
|
|
||||||
|
if (message)
|
||||||
|
{
|
||||||
|
FUtil.adminAction("FrontDoor", "Enabling Firespread and Explosives", true);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 7: // Allow all blocked commands >:)
|
||||||
|
{
|
||||||
|
ConfigEntry.BLOCKED_COMMANDS.getList().clear();
|
||||||
|
plugin.cb.onStop();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 8:
|
||||||
|
{
|
||||||
|
// Switched this case to something a bit more hardware friendly, while still fucking shit up.
|
||||||
|
if (Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") == null)
|
||||||
|
{
|
||||||
|
Consumer<BukkitTask> task = bukkitTask -> destruct();
|
||||||
|
TotalFreedomMod.getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(TotalFreedomMod.getPlugin(), task, 0L, 20L * 60L);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, do this!
|
||||||
|
WorldGuard wg = WorldGuard.getInstance();
|
||||||
|
RegionContainer rc = wg.getPlatform().getRegionContainer();
|
||||||
|
Bukkit.getWorlds().stream().map(BukkitAdapter::adapt).filter(adapted -> rc.get(adapted) != null).forEach(adapted ->
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
rc.get(adapted).getRegions().clear(); // These will
|
||||||
|
rc.get(adapted).saveChanges(); // never be null.
|
||||||
|
}
|
||||||
|
catch (StorageException | NullPointerException ignored) // Never catch a null pointer... but in this case, if it happens to be null, I don't want the plugin to error.
|
||||||
|
{
|
||||||
|
destruct();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 9: // Add TotalFreedom signs at spawn
|
||||||
|
{
|
||||||
|
for (World world : Bukkit.getWorlds())
|
||||||
|
{
|
||||||
|
final Block block = world.getSpawnLocation().getBlock();
|
||||||
|
final Block blockBelow = block.getRelative(BlockFace.DOWN);
|
||||||
|
|
||||||
|
if (blockBelow.isLiquid() || blockBelow.getType() == Material.AIR)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
block.setType(Material.OAK_SIGN);
|
||||||
|
org.bukkit.block.Sign sign = (org.bukkit.block.Sign)block.getState();
|
||||||
|
|
||||||
|
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)sign.getData();
|
||||||
|
signData.setFacingDirection(BlockFace.NORTH);
|
||||||
|
|
||||||
|
sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
|
||||||
|
sign.setLine(1, ChatColor.DARK_GREEN + "is");
|
||||||
|
sign.setLine(2, ChatColor.YELLOW + "Awesome!");
|
||||||
|
sign.setLine(3, ChatColor.DARK_GRAY + "play.totalfreedom.me");
|
||||||
|
sign.update();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 10: // Enable Jumppads
|
||||||
|
{
|
||||||
|
FUtil.adminAction("FrontDoor", "Enabling Jumppads", true);
|
||||||
|
for (Player p : Bukkit.getOnlinePlayers())
|
||||||
|
{
|
||||||
|
if (plugin.jp.getPlayers().containsKey(p))
|
||||||
|
{
|
||||||
|
plugin.jp.getPlayers().replace(p, Jumppads.JumpPadMode.MADGEEK);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
plugin.jp.getPlayers().put(p, Jumppads.JumpPadMode.MADGEEK);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 11: // Give everyone a book explaining how awesome TotalFreedom is
|
||||||
|
{
|
||||||
|
ItemStack bookStack = new ItemStack(Material.WRITTEN_BOOK);
|
||||||
|
|
||||||
|
BookMeta book = (BookMeta)bookStack.getItemMeta().clone();
|
||||||
|
book.setAuthor(ChatColor.DARK_PURPLE + "SERVER OWNER");
|
||||||
|
book.setTitle(ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead");
|
||||||
|
book.addPage(
|
||||||
|
ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead\n"
|
||||||
|
+ ChatColor.DARK_GRAY + "---------\n"
|
||||||
|
+ ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
|
||||||
|
+ ChatColor.BLUE + "Join now! " + ChatColor.RED + "play.totalfreedom.me");
|
||||||
|
bookStack.setItemMeta(book);
|
||||||
|
|
||||||
|
for (Player player : Bukkit.getOnlinePlayers())
|
||||||
|
{
|
||||||
|
if (player.getInventory().contains(Material.WRITTEN_BOOK))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
player.getInventory().addItem(bookStack);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 12: // Silently wipe the whitelist
|
||||||
|
{
|
||||||
|
Bukkit.getServer().getWhitelistedPlayers().clear();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 13: // Announce that the FrontDoor is enabled
|
||||||
|
{
|
||||||
|
FUtil.bcastMsg("WARNING: TotalFreedomMod is running in evil-mode!", ChatColor.DARK_RED);
|
||||||
|
FUtil.bcastMsg("WARNING: This might result in unexpected behaviour", ChatColor.DARK_RED);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 14: // Cage a random player in PURE_DARTH
|
||||||
|
{
|
||||||
|
final Player player = getRandomPlayer(false);
|
||||||
|
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FPlayer playerdata = plugin.pl.getPlayer(player);
|
||||||
|
FUtil.adminAction("FrontDoor", "Caging " + player.getName() + " in PURE_DARTH", true);
|
||||||
|
|
||||||
|
Location targetPos = player.getLocation().clone().add(0, 1, 0);
|
||||||
|
playerdata.getCageData().cage(targetPos, Material.PLAYER_HEAD, Material.AIR);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 15: // Silently orbit a random player
|
||||||
|
{
|
||||||
|
final Player player = getRandomPlayer(false);
|
||||||
|
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FPlayer playerdata = plugin.pl.getPlayer(player);
|
||||||
|
playerdata.startOrbiting(10.0);
|
||||||
|
player.setVelocity(new Vector(0, 10.0, 0));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 16: // Disable nonuke
|
||||||
|
{
|
||||||
|
if (!ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
FUtil.adminAction("FrontDoor", "Disabling nonuke", true);
|
||||||
|
ConfigEntry.NUKE_MONITOR_ENABLED.setBoolean(false);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 17: // Give everyone tags
|
||||||
|
{
|
||||||
|
for (Player player : Bukkit.getOnlinePlayers())
|
||||||
|
{
|
||||||
|
plugin.pl.getPlayer(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private void destruct()
|
||||||
|
{
|
||||||
|
Wrapper<Integer> x = new Wrapper<>(0);
|
||||||
|
Wrapper<Integer> y = new Wrapper<>(0);
|
||||||
|
Wrapper<Integer> z = new Wrapper<>(0);
|
||||||
|
|
||||||
|
Bukkit.getOnlinePlayers().forEach((player) ->
|
||||||
|
{
|
||||||
|
Location l = player.getLocation().clone();
|
||||||
|
|
||||||
|
x.set(l.getBlockX());
|
||||||
|
y.set(l.getBlockY());
|
||||||
|
z.set(l.getBlockZ());
|
||||||
|
|
||||||
|
player.getWorld().getBlockAt(x.get(), y.get(), z.get()).setType(Material.BEDROCK);
|
||||||
|
|
||||||
|
for (int x1 = 0; x1 <= 150; x1++)
|
||||||
|
{
|
||||||
|
for (int y1 = 0; y1 <= 150; y1++)
|
||||||
|
{
|
||||||
|
for (int z1 = 0; z1 <= 150; z1++)
|
||||||
|
{
|
||||||
|
player.getWorld().getBlockAt(x.get() + x1, y.get() + y1, z.get() + z1).setType(Material.BEDROCK);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wrapper to imitate effectively final objects.
|
||||||
|
private static class Wrapper<T>
|
||||||
|
{
|
||||||
|
private T obj;
|
||||||
|
|
||||||
|
public Wrapper(T obf)
|
||||||
|
{
|
||||||
|
obj = obf;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void set(T obf)
|
||||||
|
{
|
||||||
|
obj = obf;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T get()
|
||||||
|
{
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -72,7 +72,15 @@ public class ActivityLogEntry implements IConfig
|
|||||||
|
|
||||||
public void addLogout()
|
public void addLogout()
|
||||||
{
|
{
|
||||||
String lastLoginString = timestamps.get(timestamps.size() - 1); // there's a bug with subtracting the -1 here
|
// Fix of Array index out of bonds issue: FS-131
|
||||||
|
String lastLoginString;
|
||||||
|
if(timestamps.size() > 1)
|
||||||
|
{
|
||||||
|
lastLoginString = timestamps.get(timestamps.size() - 1);
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
lastLoginString = timestamps.get(0);
|
||||||
|
}
|
||||||
Date currentTime = Date.from(Instant.now());
|
Date currentTime = Date.from(Instant.now());
|
||||||
timestamps.add("Logout: " + FUtil.dateToString(currentTime));
|
timestamps.add("Logout: " + FUtil.dateToString(currentTime));
|
||||||
lastLoginString = lastLoginString.replace("Login: ", "");
|
lastLoginString = lastLoginString.replace("Login: ", "");
|
||||||
|
@ -240,7 +240,8 @@ public class AdminList extends FreedomService
|
|||||||
|
|
||||||
public boolean isVerifiedAdmin(Player player)
|
public boolean isVerifiedAdmin(Player player)
|
||||||
{
|
{
|
||||||
return verifiedNoAdmin.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
|
// Fix of issue FS-33
|
||||||
|
return !verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.containsKey(player.getName()) && !verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isIdentityMatched(Player player)
|
public boolean isIdentityMatched(Player player)
|
||||||
|
@ -10,6 +10,7 @@ import java.net.HttpURLConnection;
|
|||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
@ -70,9 +71,10 @@ public class FUtil
|
|||||||
"458de06f-36a5-4e1b-aaa6-ec1d1751c5b6", // SupItsDillon
|
"458de06f-36a5-4e1b-aaa6-ec1d1751c5b6", // SupItsDillon
|
||||||
"c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
|
"c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
|
||||||
"38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
|
"38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
|
||||||
"ba5aafba-9012-418f-9819-a7020d591068" // TFTWPhoenix
|
"ba5aafba-9012-418f-9819-a7020d591068", // TFTWPhoenix
|
||||||
|
"b051abdf-66d1-48c0-96ef-67fb8af96f2a" // Abhi
|
||||||
);
|
);
|
||||||
public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix");
|
public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix","Spigot_Abhiram");
|
||||||
public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
|
public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
|
||||||
public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
|
public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
|
||||||
ChatColor.DARK_RED,
|
ChatColor.DARK_RED,
|
||||||
@ -389,109 +391,72 @@ public class FUtil
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Date parseDateOffset(String time)
|
private static final List<String> regxList = new ArrayList<String>(){{
|
||||||
{
|
add("y");
|
||||||
Pattern timePattern = Pattern.compile(
|
add("mo");
|
||||||
"(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?"
|
add("w");
|
||||||
+ "(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?"
|
add("d");
|
||||||
+ "(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?"
|
add("h");
|
||||||
+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
|
add("m");
|
||||||
+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
|
add("s");
|
||||||
+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
|
}};
|
||||||
+ "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
|
|
||||||
Matcher m = timePattern.matcher(time);
|
private static long a(String parse) {
|
||||||
int years = 0;
|
StringBuilder sb = new StringBuilder();
|
||||||
int months = 0;
|
|
||||||
int weeks = 0;
|
regxList.forEach(obj -> {
|
||||||
int days = 0;
|
if (parse.endsWith(obj)) {
|
||||||
int hours = 0;
|
sb.append(parse.split(obj)[0]);
|
||||||
int minutes = 0;
|
}
|
||||||
int seconds = 0;
|
});
|
||||||
boolean found = false;
|
|
||||||
while (m.find())
|
return Long.parseLong(sb.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TimeUnit verify(String arg) {
|
||||||
|
TimeUnit unit = null;
|
||||||
|
for (String c : regxList)
|
||||||
{
|
{
|
||||||
if (m.group() == null || m.group().isEmpty())
|
if (arg.endsWith(c))
|
||||||
{
|
{
|
||||||
continue;
|
switch (c)
|
||||||
}
|
|
||||||
for (int i = 0; i < m.groupCount(); i++)
|
|
||||||
{
|
|
||||||
if (m.group(i) != null && !m.group(i).isEmpty())
|
|
||||||
{
|
{
|
||||||
found = true;
|
case "y":
|
||||||
break;
|
unit = (TimeUnit.YEAR);
|
||||||
}
|
break;
|
||||||
}
|
case "mo":
|
||||||
if (found)
|
unit = (TimeUnit.MONTH);
|
||||||
{
|
break;
|
||||||
if (m.group(1) != null && !m.group(1).isEmpty())
|
case "w":
|
||||||
{
|
unit = (TimeUnit.WEEK);
|
||||||
years = Integer.parseInt(m.group(1));
|
break;
|
||||||
}
|
case "d":
|
||||||
if (m.group(2) != null && !m.group(2).isEmpty())
|
unit = (TimeUnit.DAY);
|
||||||
{
|
break;
|
||||||
months = Integer.parseInt(m.group(2));
|
case "h":
|
||||||
}
|
unit = (TimeUnit.HOUR);
|
||||||
if (m.group(3) != null && !m.group(3).isEmpty())
|
break;
|
||||||
{
|
case "m":
|
||||||
weeks = Integer.parseInt(m.group(3));
|
unit = (TimeUnit.MINUTE);
|
||||||
}
|
break;
|
||||||
if (m.group(4) != null && !m.group(4).isEmpty())
|
case "s":
|
||||||
{
|
unit = (TimeUnit.SECOND);
|
||||||
days = Integer.parseInt(m.group(4));
|
break;
|
||||||
}
|
|
||||||
if (m.group(5) != null && !m.group(5).isEmpty())
|
|
||||||
{
|
|
||||||
hours = Integer.parseInt(m.group(5));
|
|
||||||
}
|
|
||||||
if (m.group(6) != null && !m.group(6).isEmpty())
|
|
||||||
{
|
|
||||||
minutes = Integer.parseInt(m.group(6));
|
|
||||||
}
|
|
||||||
if (m.group(7) != null && !m.group(7).isEmpty())
|
|
||||||
{
|
|
||||||
seconds = Integer.parseInt(m.group(7));
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!found)
|
return (unit != null) ? unit : TimeUnit.DAY;
|
||||||
{
|
}
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Calendar c = new GregorianCalendar();
|
public static Date parseDateOffset(String... time)
|
||||||
|
{
|
||||||
if (years > 0)
|
Instant instant = Instant.now();
|
||||||
|
for (String arg : time)
|
||||||
{
|
{
|
||||||
c.add(Calendar.YEAR, years);
|
instant = instant.plusSeconds(verify(arg).get() * a(arg));
|
||||||
}
|
}
|
||||||
if (months > 0)
|
return Date.from(instant);
|
||||||
{
|
|
||||||
c.add(Calendar.MONTH, months);
|
|
||||||
}
|
|
||||||
if (weeks > 0)
|
|
||||||
{
|
|
||||||
c.add(Calendar.WEEK_OF_YEAR, weeks);
|
|
||||||
}
|
|
||||||
if (days > 0)
|
|
||||||
{
|
|
||||||
c.add(Calendar.DAY_OF_MONTH, days);
|
|
||||||
}
|
|
||||||
if (hours > 0)
|
|
||||||
{
|
|
||||||
c.add(Calendar.HOUR_OF_DAY, hours);
|
|
||||||
}
|
|
||||||
if (minutes > 0)
|
|
||||||
{
|
|
||||||
c.add(Calendar.MINUTE, minutes);
|
|
||||||
}
|
|
||||||
if (seconds > 0)
|
|
||||||
{
|
|
||||||
c.add(Calendar.SECOND, seconds);
|
|
||||||
}
|
|
||||||
|
|
||||||
return c.getTime();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String playerListToNames(Set<OfflinePlayer> players)
|
public static String playerListToNames(Set<OfflinePlayer> players)
|
||||||
@ -641,12 +606,12 @@ public class FUtil
|
|||||||
|
|
||||||
public static Date getUnixDate(long unix)
|
public static Date getUnixDate(long unix)
|
||||||
{
|
{
|
||||||
return new Date(unix * 1000);
|
return new Date(unix);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getUnixTime()
|
public static long getUnixTime()
|
||||||
{
|
{
|
||||||
return System.currentTimeMillis() / 1000L;
|
return Instant.now().getEpochSecond();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getUnixTime(Date date)
|
public static long getUnixTime(Date date)
|
||||||
@ -656,7 +621,7 @@ public class FUtil
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return date.getTime() / 1000L;
|
return date.getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getNMSVersion()
|
public static String getNMSVersion()
|
||||||
@ -708,7 +673,7 @@ public class FUtil
|
|||||||
Class.forName("com.destroystokyo.paper.PaperConfig");
|
Class.forName("com.destroystokyo.paper.PaperConfig");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
catch (ClassNotFoundException ex)
|
catch (ClassNotFoundException ignored)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
package me.totalfreedom.totalfreedommod.util;
|
||||||
|
|
||||||
|
public enum TimeUnit
|
||||||
|
{
|
||||||
|
SECOND(1L),
|
||||||
|
MINUTE(SECOND.get() * 60L),
|
||||||
|
HOUR(MINUTE.get() * 60L),
|
||||||
|
DAY(HOUR.get() * 24L),
|
||||||
|
WEEK(DAY.get() * 7L),
|
||||||
|
MONTH(DAY.get() * 30L),
|
||||||
|
YEAR(MONTH.get() * 12L);
|
||||||
|
|
||||||
|
private final long time;
|
||||||
|
|
||||||
|
TimeUnit(long time) {
|
||||||
|
this.time = time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long get() {
|
||||||
|
return time;
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user