This commit is contained in:
rockyhawk64 2021-11-28 21:21:37 +11:00
parent b51fc7740d
commit e5a79ce937
17 changed files with 96 additions and 24 deletions

1
.idea/.name Normal file
View File

@ -0,0 +1 @@
CommandPanels

View File

@ -0,0 +1,9 @@
<component name="ArtifactManager">
<artifact type="jar" name="CommandPanels">
<output-path>$PROJECT_DIR$/out/artifacts/CommandPanels</output-path>
<root id="archive" name="CommandPanels.jar">
<element id="file-copy" path="$PROJECT_DIR$/resource/plugin.yml" />
<element id="module-output" name="CommandPanels" />
</root>
</artifact>
</component>

View File

@ -1,9 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="Command Panels">
<output-path>$PROJECT_DIR$/out/artifacts/Command_Panels</output-path>
<root id="archive" name="Command Panels.jar">
<element id="file-copy" path="$PROJECT_DIR$/resource/plugin.yml" />
<element id="module-output" name="Command Panels" />
</root>
</artifact>
</component>

16
.idea/compiler.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<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="CommandPanels" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="CommandPanels" target="8" />
</bytecodeTargetLevel>
</component>
</project>

20
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

View File

@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="spigot-1.16.4">
<library name="spigot">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/spigot/v1_16_R3/spigot-1.16.4.jar!/" />
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/spigot/v1_17_R1/spigot.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/spigot/v1_16_R3/spigot-1.16.4.jar!/" />
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/spigot/v1_17_R1/spigot.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="spigot-api-1.18-rc3-R0.1-SNAPSHOT">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../../Intellij Plugin Testers/Plugin Tester 1.18/bundler/libraries/spigot-api-1.18-rc3-R0.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>

View File

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Command Panels.iml" filepath="$PROJECT_DIR$/Command Panels.iml" />
<module fileurl="file://$PROJECT_DIR$/CommandPanels.iml" filepath="$PROJECT_DIR$/CommandPanels.iml" />
</modules>
</component>
</project>

View File

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
@ -12,12 +14,13 @@
<orderEntry type="library" name="TokenManager-3.2.4" level="project" />
<orderEntry type="library" name="Vault" level="project" />
<orderEntry type="library" name="VotingPlugin" level="project" />
<orderEntry type="library" name="spigot-1.16.4" level="project" />
<orderEntry type="library" name="spigot-1.13.2" level="project" />
<orderEntry type="library" name="CustomItemsAPI_PLACEHOLDER" level="project" />
<orderEntry type="library" name="ChestSort" level="project" />
<orderEntry type="library" name="PlaceholderAPI-2.10.9" level="project" />
<orderEntry type="library" name="MMOItems-6.6.1" level="project" />
<orderEntry type="library" name="MythicLib-1.1.3" level="project" />
<orderEntry type="library" name="spigot-api-1.18-rc3-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="spigot-1.13.2" level="project" />
<orderEntry type="library" name="spigot" level="project" />
</component>
</module>

16
pom.xml Normal file
View File

@ -0,0 +1,16 @@
<?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>groupId</groupId>
<artifactId>CommandPanels</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>

View File

@ -1,4 +1,4 @@
version: 3.17.2.0
version: 3.17.2.1
main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels
author: RockyHawk

View File

@ -68,7 +68,6 @@ import java.io.InputStream;
import java.io.Reader;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
public class CommandPanels extends JavaPlugin{
public YamlConfiguration config;
@ -501,7 +500,7 @@ public class CommandPanels extends JavaPlugin{
public Reader getReaderFromStream(InputStream initialStream) throws IOException {
//this reads the encrypted resource files in the jar file
if(legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13)){
if(legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13) || legacy.LOCAL_VERSION.greaterThanOrEqualTo(MinecraftVersions.v1_18)){
return new Sequence_1_13(this).getReaderFromStream(initialStream);
}else{
return new Sequence_1_14(this).getReaderFromStream(initialStream);

View File

@ -12,7 +12,9 @@ import java.io.IOException;
import java.util.List;
public class CommandPanelsAPI {
//set to public to adjust any public settings within the plugin through the API
public CommandPanels plugin;
public CommandPanelsAPI(CommandPanels pl) {
this.plugin = pl;
}

View File

@ -1,6 +1,6 @@
package me.rockyhawk.commandpanels.ioclasses;
//1.13- Imports
//1.13 and below, 1.18+ Imports
import me.rockyhawk.commandpanels.CommandPanels;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.CharSequenceReader;

View File

@ -1,6 +1,6 @@
package me.rockyhawk.commandpanels.ioclasses;
//1.14+ Imports
//1.14-1.17 Imports
import me.rockyhawk.commandpanels.CommandPanels;
import org.bukkit.craftbukkit.libs.org.apache.commons.io.IOUtils;
import org.bukkit.craftbukkit.libs.org.apache.commons.io.input.CharSequenceReader;

View File

@ -3,7 +3,6 @@ package me.rockyhawk.commandpanels.openpanelsmanager;
import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.api.Panel;
import me.rockyhawk.commandpanels.api.PanelClosedEvent;
import me.rockyhawk.commandpanels.ioclasses.nbt.NBT_1_13;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;