TotalFreedomMC/Minecraft-JDA
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/Minecraft-JDA.git synced 2024-05-18 02:21:24 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: TotalFreedomMC:1.0
Branches Tags
TotalFreedomMC:master
TotalFreedomMC:4.3.0_277
TotalFreedomMC:4.2.0_168
TotalFreedomMC:4.0.0
TotalFreedomMC:1.0
...
compare: TotalFreedomMC:master
Branches Tags
TotalFreedomMC:master
TotalFreedomMC:4.3.0_277
TotalFreedomMC:4.2.0_168
TotalFreedomMC:4.0.0
TotalFreedomMC:1.0

15 commits
1.0 ... master

Author SHA1 Message Date
Telesphoreo 2acb45e4e4 Update dependencies 2022-03-25 16:00:41 -05:00
Telesphoreo 58403d86c3 Update dependencies 2021-12-07 19:37:47 -06:00
Telesphoreo 240448275c Update for 1.17.1 2021-09-29 16:53:21 -05:00
Ryan 54194a7f7e
Merge pull request #3 from AtlasMediaGroup/JDA-Update 
JDA Update
 2021-04-10 12:41:09 +01:00
Nathan Curran 6ba5165697
Update JDA version and location 2021-04-09 20:54:03 +10:00
Nathan Curran def3534d0d
Another JDA update 2021-03-08 19:18:48 +11:00
Nathan Curran b2805f1df9
Bumped JDA to latest version 2021-03-07 12:00:01 +11:00
Paldiu b59ce8d5c1
Merge pull request #2 from AtlasMediaGroup/1.16.5-updates 
Updates for 1.16.5
 2021-03-03 11:44:09 -06:00
Ryan c8ffe69a2c
Update pom.xml 2021-02-23 22:27:31 +00:00
Ryan Wild fad57f3857
Updates for 1.16.5 2021-02-12 23:25:01 +00:00
Paldiu fd5166cc22
Merge pull request #1 from courteousIy/master 
Update pom.xml & readme
 2020-12-28 07:26:20 -05:00
courteously 4486befb1d Update pom.xml & readme 
- Updated JDA to version 4.2.0_222.

- Bumped dependencies.

- Removed an extra section where one dependency was added twice.

- Rewrote the readme file to be more informative.
 2020-12-27 18:33:50 -08:00
Seth c720938e9c
Update to 4.2.0_168 2020-08-03 22:40:35 -07:00
ZeroEpoch1969 99f39fa12a
4.0.0_39 2019-11-27 20:12:38 -07:00
Seth 5234a48094
you saw NOTHING 2018-06-02 03:28:55 -06:00
12 changed files with 103 additions and 389 deletions
Show stats Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,2 +1,5 @@
target/
lib/
.idea
*.iml
dependency-reduced-pom.xml
.DS_Store

9
.idea/artifacts/JDA.xml
View file

@ -1,9 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="JDA">
<output-path>$PROJECT_DIR$/target</output-path>
<root id="archive" name="JDA.jar">
<element id="extracted-dir" path="$PROJECT_DIR$/lib/JDA-3.6.0_354-withDependencies.jar" path-in-jar="/" />
<element id="module-output" name="JDA" />
</root>
</artifact>
</component>

9
.idea/libraries/JDA_3_6_0_354_withDependencies.xml
View file

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="JDA-3.6.0_354-withDependencies">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/JDA-3.6.0_354-withDependencies.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

11
.idea/libraries/spigot_1_12_2.xml
View file

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="spigot-1.12.2">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/spigot-1.12.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/spigot-1.12.2.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/misc.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/target" />
</component>
</project>

8
.idea/modules.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/JDA.iml" filepath="$PROJECT_DIR$/JDA.iml" />
</modules>
</component>
</project>

326
.idea/workspace.xml
View file

@ -1,326 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9c2145e8-1b46-4aa6-a126-9a9a53d776c0" name="Default" comment="" />
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/me/zeroepoch1969/jda/JDA.java" />
<option value="$PROJECT_DIR$/src/main/resources/plugin.yml" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="475" />
<option name="y" value="83" />
<option name="width" value="1398" />
<option name="height" value="1100" />
</component>
<component name="ProjectView">
<navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope">
<subPane subId="Project Files">
<expand>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
</path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
<item name=".idea" type="cbb8eebc:String" user=".idea" />
</path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
<item name="src/main" type="cbb8eebc:String" user="src/main" />
</path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
<item name="src/main" type="cbb8eebc:String" user="src/main" />
<item name="java" type="cbb8eebc:String" user="java" />
</path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
<item name="src/main" type="cbb8eebc:String" user="src/main" />
<item name="java" type="cbb8eebc:String" user="java" />
<item name="me/zeroepoch1969/jda" type="cbb8eebc:String" user="me/zeroepoch1969/jda" />
</path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="JDA" type="cbb8eebc:String" user="JDA" />
<item name="src/main" type="cbb8eebc:String" user="src/main" />
<item name="resources" type="cbb8eebc:String" user="resources" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="JDA" type="b2602c69:ProjectViewProjectNode" />
<item name="JDA" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/JDA-3.6.0_354-withDependencies.jar!/" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2909931" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties />
<listeners />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="9c2145e8-1b46-4aa6-a126-9a9a53d776c0" name="Default" comment="" />
<created>1527929624697</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1527929624697</updated>
<workItem from="1527929628429" duration="1064000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1064000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout>
<window_info anchor="right" id="Palette" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" />
<window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Terminal" />
<window_info id="Capture Tool" />
<window_info id="Designer" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="right" id="Database" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" />
<window_info anchor="right" id="Theme Preview" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/resources/plugin.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="2" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/me/zeroepoch1969/jda/JDA.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<last-edited>JDA</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2909931" />
<option value="0.5" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>No facets are configured</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2909931" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>JDA</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2909931" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>JDA-3.6.0_354-withDependencies</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2909931" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

14
JDA.iml
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="spigot-1.12.2" level="project" />
<orderEntry type="library" name="JDA-3.6.0_354-withDependencies" level="project" />
</component>
</module>

2
README.md
View file

@ -1,2 +1,2 @@
# Minecraft-JDA
Minecraft plugin version of JDA (It's just a dependancy plugin)
This is a Minecraft plugin version of JDA. On the TotalFreedom Minecraft server, it serves as a dependency for the Discord bot.

93
pom.xml Normal file
View file

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.totalfreedom</groupId>
<artifactId>Minecraft-JDA</artifactId>
<version>1.0</version>
<name>Minecraft-JDA</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jar.finalName>${project.name}</jar.finalName>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>dv8tion</id>
<name>m2-dv8tion</name>
<url>https://m2.dv8tion.net/releases/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.4.0_351</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Required for both JDA and Pterodactyl integration -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20211205</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
</dependencies>
<organization>
<name>TotalFreedom</name>
<url>https://totalfreedom.me</url>
</organization>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

2
src/main/java/me/zeroepoch1969/jda/JDA.java → src/main/java/me/totalfreedom/jda/JDA.java
View file

@ -1,4 +1,4 @@
package me.zeroepoch1969.jda;
package me.totalfreedom.jda;
import org.bukkit.plugin.java.JavaPlugin;

7
src/main/resources/plugin.yml
View file

@ -1,4 +1,5 @@
name: JDA
version: 1.0
author: ZeroEpoch1969
main: me.zeroepoch1969.jda.JDA
version: 4.4.0_351
author: scripthead
main: me.totalfreedom.jda.JDA
api-version: "1.17"