diff --git a/.gitignore b/.gitignore index a1c2a23..ca22821 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,84 @@ -# Compiled class file +############################## +## Java +############################## +.mtj.tmp/ *.class +*.jar +*.war +*.ear +*.nar +hs_err_pid* -# Log file -*.log +############################## +## Maven +############################## +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +pom.xml.bak +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar -# BlueJ files -*.ctxt +############################## +## Gradle +############################## +bin/ +build/ +.gradle +.gradletasknamecache +gradle-app.setting +!gradle-wrapper.jar -# Mobile Tools for Java (J2ME) -.mtj.tmp/ +############################## +## IntelliJ +############################## +out/ +.idea/ +.idea_modules/ +*.iml +*.ipr +*.iws -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar +############################## +## Eclipse +############################## +.settings/ +bin/ +tmp/ +.metadata +.classpath +.project +*.tmp +*.bak +*.swp +*~.nib +local.properties +.loadpath +.factorypath -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +############################## +## NetBeans +############################## +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +############################## +## Visual Studio Code +############################## +.vscode/ +.code-workspace + +############################## +## OS X +############################## +.DS_Store diff --git a/LockettePro/.classpath b/LockettePro/.classpath deleted file mode 100644 index 66e9dda..0000000 --- a/LockettePro/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/LockettePro/.gitignore b/LockettePro/.gitignore deleted file mode 100644 index ae3c172..0000000 --- a/LockettePro/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/LockettePro/.project b/LockettePro/.project deleted file mode 100644 index c209ca5..0000000 --- a/LockettePro/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - LockettePro - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/LockettePro/.settings/org.eclipse.jdt.core.prefs b/LockettePro/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bb35fa0..0000000 --- a/LockettePro/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1232147 --- /dev/null +++ b/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + groupId + LockettePro + 1.0-SNAPSHOT + jar + + 1.8 + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + false + + + net.sf.cglib + me.crafter.mc.shaded.net.sf.cglib + + + net.bytebuddy + me.crafter.mc.shaded.net.bytebuddy + + + + + + + + + + src/main/resources + true + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + dmulloy2-repo + https://repo.dmulloy2.net/nexus/repository/public/ + + + coreprotect-repo + http://maven.playpro.com + + + sk89q-repo + https://maven.enginehub.org/repo/ + + + jitpack.io + https://jitpack.io + + + + + org.spigotmc + spigot-api + 1.16.5-R0.1-SNAPSHOT + provided + + + com.comphenix.protocol + ProtocolLib + 4.6.0 + + + net.coreprotect + coreprotect + 19.5 + provided + + + com.sk89q.worldguard + worldguard-bukkit + 7.0.4-SNAPSHOT + provided + + + com.github.MilkBowl + VaultAPI + 1.7 + provided + + + \ No newline at end of file diff --git a/LockettePro/src/me/crafter/mc/lockettepro/BlockDebugListener.java b/src/main/java/me/crafter/mc/lockettepro/BlockDebugListener.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/BlockDebugListener.java rename to src/main/java/me/crafter/mc/lockettepro/BlockDebugListener.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/BlockEnvironmentListener.java b/src/main/java/me/crafter/mc/lockettepro/BlockEnvironmentListener.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/BlockEnvironmentListener.java rename to src/main/java/me/crafter/mc/lockettepro/BlockEnvironmentListener.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java b/src/main/java/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java similarity index 98% rename from LockettePro/src/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java rename to src/main/java/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java index 3a2f183..01e0f95 100644 --- a/LockettePro/src/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java +++ b/src/main/java/me/crafter/mc/lockettepro/BlockInventoryMoveListener.java @@ -42,7 +42,7 @@ public void onInventoryMove(InventoryMoveItemEvent event){ String sourceOwner = LocketteProAPI.getOwner(sourceInventoryBlock); String destOwner = LocketteProAPI.getOwner(destinationInventoryBlock); if (destOwner != null && sourceOwner != null) { - if (sourceOwner.matches(destOwner)) { + if (sourceOwner.equalsIgnoreCase(destOwner)) { event.setCancelled(false); } } diff --git a/LockettePro/src/me/crafter/mc/lockettepro/BlockPlayerListener.java b/src/main/java/me/crafter/mc/lockettepro/BlockPlayerListener.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/BlockPlayerListener.java rename to src/main/java/me/crafter/mc/lockettepro/BlockPlayerListener.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/Config.java b/src/main/java/me/crafter/mc/lockettepro/Config.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/Config.java rename to src/main/java/me/crafter/mc/lockettepro/Config.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/Dependency.java b/src/main/java/me/crafter/mc/lockettepro/Dependency.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/Dependency.java rename to src/main/java/me/crafter/mc/lockettepro/Dependency.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/DependencyProtocolLib.java b/src/main/java/me/crafter/mc/lockettepro/DependencyProtocolLib.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/DependencyProtocolLib.java rename to src/main/java/me/crafter/mc/lockettepro/DependencyProtocolLib.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/DoorToggleTask.java b/src/main/java/me/crafter/mc/lockettepro/DoorToggleTask.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/DoorToggleTask.java rename to src/main/java/me/crafter/mc/lockettepro/DoorToggleTask.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/LockettePro.java b/src/main/java/me/crafter/mc/lockettepro/LockettePro.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/LockettePro.java rename to src/main/java/me/crafter/mc/lockettepro/LockettePro.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/LocketteProAPI.java b/src/main/java/me/crafter/mc/lockettepro/LocketteProAPI.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/LocketteProAPI.java rename to src/main/java/me/crafter/mc/lockettepro/LocketteProAPI.java diff --git a/LockettePro/src/me/crafter/mc/lockettepro/Utils.java b/src/main/java/me/crafter/mc/lockettepro/Utils.java similarity index 100% rename from LockettePro/src/me/crafter/mc/lockettepro/Utils.java rename to src/main/java/me/crafter/mc/lockettepro/Utils.java diff --git a/LockettePro/src/config.yml b/src/main/resources/config.yml similarity index 100% rename from LockettePro/src/config.yml rename to src/main/resources/config.yml diff --git a/LockettePro/src/lang.yml b/src/main/resources/lang.yml similarity index 100% rename from LockettePro/src/lang.yml rename to src/main/resources/lang.yml diff --git a/LockettePro/src/lang_de.yml b/src/main/resources/lang_de.yml similarity index 100% rename from LockettePro/src/lang_de.yml rename to src/main/resources/lang_de.yml diff --git a/LockettePro/src/lang_es.yml b/src/main/resources/lang_es.yml similarity index 100% rename from LockettePro/src/lang_es.yml rename to src/main/resources/lang_es.yml diff --git a/LockettePro/src/lang_fr.yml b/src/main/resources/lang_fr.yml similarity index 100% rename from LockettePro/src/lang_fr.yml rename to src/main/resources/lang_fr.yml diff --git a/LockettePro/src/lang_hu.yml b/src/main/resources/lang_hu.yml similarity index 100% rename from LockettePro/src/lang_hu.yml rename to src/main/resources/lang_hu.yml diff --git a/LockettePro/src/lang_it.yml b/src/main/resources/lang_it.yml similarity index 100% rename from LockettePro/src/lang_it.yml rename to src/main/resources/lang_it.yml diff --git a/LockettePro/src/lang_pl.yml b/src/main/resources/lang_pl.yml similarity index 100% rename from LockettePro/src/lang_pl.yml rename to src/main/resources/lang_pl.yml diff --git a/LockettePro/src/lang_zh-cn.yml b/src/main/resources/lang_zh-cn.yml similarity index 100% rename from LockettePro/src/lang_zh-cn.yml rename to src/main/resources/lang_zh-cn.yml diff --git a/LockettePro/src/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from LockettePro/src/plugin.yml rename to src/main/resources/plugin.yml