diff --git a/.gitignore b/.gitignore
index d50aa4f..b9c4362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,10 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.settings
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-/.gradle/
-/.settings/
-.idea/
-build/
-target/
+## JetBrains IDEs
+/.idea/
*.iml
-/bin/
+
+## Maven
+/**/target/
+/dependency-reduced-pom.xml
+
+## Misc.
+.DS_Store
diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml
deleted file mode 100644
index e106598..0000000
--- a/UltimateTimber/Core/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
- 4.0.0
-
-
- com.songoda
- UltimateTimber
- 2.3.7
- ../../pom.xml
-
-
- Core
- jar
-
-
-
- org.spigotmc
- spigot-api
- 1.18-R0.1-SNAPSHOT
- provided
-
-
-
- com.songoda
- SongodaCore
- 2.6.19
- compile
-
-
-
diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml
deleted file mode 100644
index 9a707fd..0000000
--- a/UltimateTimber/Plugin/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-
- 4.0.0
-
-
- com.songoda
- UltimateTimber
- 2.3.7
- ../../pom.xml
-
-
- Plugin
- jar
-
-
- ${project.parent.artifactId}-${project.parent.version}
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
- false
-
-
-
-
- com.google.code.maven-replacer-plugin
- replacer
- 1.5.3
-
-
-
- prepare-package
-
- replace
-
-
-
-
-
- ${project.build.directory}/classes/plugin.yml
-
-
-
- maven-version-number
- ${project.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.3.0
-
-
- shaded
- package
-
- shade
-
-
-
- false
- false
- true
-
-
-
- com.songoda:SongodaCore
- com.songoda:Core
-
-
-
-
-
- *:*
-
- META-INF/*.SF
- META-INF/*.DSA
- META-INF/*.RSA
-
-
-
-
- com.songoda:Lootables
-
- com/songoda/core/**
-
-
-
-
-
-
- com.songoda.core
- ${project.groupId}.ultimatetimber.core
-
-
-
-
-
-
-
-
-
-
-
- org.spigotmc
- spigot-api
- 1.18-R0.1-SNAPSHOT
- provided
-
-
-
- ${project.groupId}
- Core
- ${project.version}
- compile
-
-
-
diff --git a/pom.xml b/pom.xml
index 988741e..0abba74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,87 @@
-
+
+
4.0.0
com.songoda
UltimateTimber
2.3.7
- pom
-
+ UltimateTimber
+ Give your players a new and exciting way to chop down trees
+ https://craftaro.com/marketplace/product/18
-
- UltimateTimber/Core
- UltimateTimber/Plugin
-
+
+ 8
+ 1.8
+ 1.8
+
+ UTF-8
+
+
+
+ https://discord.gg/craftaro
+ Discord server
+
+
+
+ https://github.com/craftaro/UltimateTimber
+ scm:git:git://github.com/craftaro/UltimateTimber.git
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.4.1
+
+
+
+ package
+
+ shade
+
+
+
+ ${project.name}-${project.version}
+
+ false
+ true
+ true
+
+
+
+ com.songoda.core
+ com.songoda.ultimatetimber.core
+
+
+
+
+
+ *:*
+
+
+ META-INF/**
+ LICENSE
+ LICENSE.**
+
+
+
+
+
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
@@ -20,96 +90,25 @@
- spigot-repo
+ SpigotMC
https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-
-
- jitpack.io
- https://jitpack.io
-
-
-
- apache.snapshots
- https://repository.apache.org/snapshots/
-
-
+
+
+ com.songoda
+ SongodaCore
+ 2.6.19
+ compile
+
-
-
- clean install
- src
- test
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
-
-
- 1.8
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.7
-
-
-
- validate
-
- run
-
-
-
-
- false
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.8
-
-
- jars
- true
-
-
-
- ${project.groupId}
- McMMO
- ${project.version}
-
-
-
- ${project.groupId}
- Plugin
- ${project.version}
-
-
-
- ${project.groupId}
- Core
- ${project.version}
-
-
-
-
- false
-
-
-
-
-
- resources
- true
-
-
-
+
+
+ org.spigotmc
+ spigot-api
+ 1.18-R0.1-SNAPSHOT
+ provided
+
+
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/UltimateTimber.java b/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/UltimateTimber.java
rename to src/main/java/com/songoda/ultimatetimber/UltimateTimber.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimation.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimation.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimation.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimation.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationCrumble.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationCrumble.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationCrumble.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationCrumble.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationNone.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationType.java b/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationType.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/animation/TreeAnimationType.java
rename to src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationType.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandGiveAxe.java b/src/main/java/com/songoda/ultimatetimber/commands/CommandGiveAxe.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandGiveAxe.java
rename to src/main/java/com/songoda/ultimatetimber/commands/CommandGiveAxe.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandReload.java b/src/main/java/com/songoda/ultimatetimber/commands/CommandReload.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandReload.java
rename to src/main/java/com/songoda/ultimatetimber/commands/CommandReload.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandToggle.java b/src/main/java/com/songoda/ultimatetimber/commands/CommandToggle.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/commands/CommandToggle.java
rename to src/main/java/com/songoda/ultimatetimber/commands/CommandToggle.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeEvent.java b/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeEvent.java
rename to src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeFallEvent.java b/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeFallEvent.java
rename to src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeFellEvent.java b/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/events/TreeFellEvent.java
rename to src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java b/src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ChoppingManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ConfigurationManager.java b/src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ConfigurationManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/Manager.java b/src/main/java/com/songoda/ultimatetimber/manager/Manager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/Manager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/Manager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/PlacedBlockManager.java b/src/main/java/com/songoda/ultimatetimber/manager/PlacedBlockManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/PlacedBlockManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/PlacedBlockManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/SaplingManager.java b/src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/SaplingManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeAnimationManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDetectionManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java b/src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
rename to src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/misc/OnlyToppleWhile.java b/src/main/java/com/songoda/ultimatetimber/misc/OnlyToppleWhile.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/misc/OnlyToppleWhile.java
rename to src/main/java/com/songoda/ultimatetimber/misc/OnlyToppleWhile.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/DetectedTree.java b/src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/DetectedTree.java
rename to src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/FallingTreeBlock.java b/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
rename to src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/ITreeBlock.java b/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/ITreeBlock.java
rename to src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlock.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlock.java
rename to src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlockSet.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlockSet.java
rename to src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlockType.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeBlockType.java
rename to src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeDefinition.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeDefinition.java
rename to src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java
diff --git a/UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeLoot.java b/src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java
similarity index 100%
rename from UltimateTimber/Core/src/com/songoda/ultimatetimber/tree/TreeLoot.java
rename to src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/BlockUtils.java b/src/main/java/com/songoda/ultimatetimber/utils/BlockUtils.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/BlockUtils.java
rename to src/main/java/com/songoda/ultimatetimber/utils/BlockUtils.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/ParticleUtils.java b/src/main/java/com/songoda/ultimatetimber/utils/ParticleUtils.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/ParticleUtils.java
rename to src/main/java/com/songoda/ultimatetimber/utils/ParticleUtils.java
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/SoundUtils.java b/src/main/java/com/songoda/ultimatetimber/utils/SoundUtils.java
similarity index 100%
rename from UltimateTimber/Plugin/src/com/songoda/ultimatetimber/utils/SoundUtils.java
rename to src/main/java/com/songoda/ultimatetimber/utils/SoundUtils.java
diff --git a/UltimateTimber/Plugin/resources/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from UltimateTimber/Plugin/resources/config.yml
rename to src/main/resources/config.yml
diff --git a/UltimateTimber/Plugin/resources/en_US.lang b/src/main/resources/en_US.lang
similarity index 100%
rename from UltimateTimber/Plugin/resources/en_US.lang
rename to src/main/resources/en_US.lang
diff --git a/UltimateTimber/Plugin/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 75%
rename from UltimateTimber/Plugin/resources/plugin.yml
rename to src/main/resources/plugin.yml
index 295c6a9..7fd76c9 100644
--- a/UltimateTimber/Plugin/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,14 +1,24 @@
-name: UltimateTimber
-version: maven-version-number
-authors: [Songoda]
-main: com.songoda.ultimatetimber.UltimateTimber
+name: ${project.name}
+description: ${project.description}
+version: ${project.version}
api-version: 1.13
-softdepend: [mcMMO, Jobs, CoreProtect]
+
+main: com.songoda.ultimatetimber.UltimateTimber
+softdepend:
+ - mcMMO
+ - Jobs
+ - CoreProtect
+
+author: Craftaro
+website: ${project.url}
+
+# TODO: cleanup commands and permissions sections
commands:
ut:
description: Reloads the configuration file
usage: /ultimatetimber reload
- aliases: [ultimatetimber]
+ aliases: [ ultimatetimber ]
+
permissions:
ultimatetimber.*:
description: Inherits all plugin permissions
@@ -17,15 +27,19 @@ permissions:
ultimatetimber.bonusloot: true
ultimatetimber.reload: true
ultimatetimber.bypasscooldown: true
+
ultimatetimber.chop:
description: Allows players to trigger the trees toppling down effect
default: op
+
ultimatetimber.bonusloot:
description: Doubles the loot obtained from trees
default: op
+
ultimatetimber.reload:
description: Reloads the configuration file
default: op
+
ultimatetimber.bypasscooldown:
description: Allows a player to bypass the tree topple cooldown
default: op