Upstream
/
UltimateTimber
mirror of https://github.com/songoda/UltimateTimber.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2020-02-03 17:31:02 -05:00
parent 41d2f5ff29 6922ed36d3
commit 06e741536f
15 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UltimateTimber-Adapter/Current/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Adapter/Legacy/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/CoreProtect/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/Jobs/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/McMMO/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/McMMOClassic12/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/McMMOClassic13/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber-Hook/McMMOClassic8/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

2
UltimateTimber/Core/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>

24
UltimateTimber/Plugin/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.4</version>
<version>2.0.6</version>
<relativePath>../../</relativePath>
</parent>
@ -23,6 +23,28 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${project.build.directory}/classes/plugin.yml</file>
<replacements>
<replacement>
<token>maven-version-number</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>

26
UltimateTimber/Plugin/resources/en_US.lang
View File

@ -1,17 +1,23 @@
# General Messages
general.nametag.prefix: "&8[&6UltimateTimber&8] "
general.nopermission: "&cYou don't have permission for that!"
general:
nametag:
prefix: '&8[&6UltimateTimber&8] '
nopermission: '&cYou don''t have permission for that!'
# Command Messages
command.reload.description: "&8 - &a/ut reload &7 - Reloads the config."
command.reload.reloaded: "&7Configuration and locale files have been reloaded."
command:
reload:
description: '&8 - &a/ut reload &7 - Reloads the config.'
reloaded: '&7Configuration and locale files have been reloaded.'
toggle:
description: '&8 - &a/ut toggle &7 - Toggles your chopping mode'
enabled: '&7Chopping Mode: &aEnabled'
disabled: '&7Chopping Mode: &cDisabled'
command.toggle.description: "&8 - &a/ut toggle &7 - Toggles your chopping mode"
command.toggle.enabled: "&7Chopping Mode: &aEnabled"
command.toggle.disabled: "&7Chopping Mode: &cDisabled"
# Event Messages
# Misc
event.on.cooldown: "&eYou are on cooldown and cannot topple trees right now."
event:
'on':
cooldown: '&eYou are on cooldown and cannot topple trees right now.'

2
UltimateTimber/Plugin/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: UltimateTimber
version: @version@
version: maven-version-number
authors: [Songoda, Esophose]
main: com.songoda.ultimatetimber.UltimateTimber
api-version: 1.13

3
UltimateTimber/Plugin/src/com/songoda/ultimatetimber/UltimateTimber.java
View File

@ -72,9 +72,6 @@ public class UltimateTimber extends SongodaPlugin {
this.treeDetectionManager = this.registerManager(TreeDetectionManager.class);
this.treeFallManager = this.registerManager(TreeFallManager.class);
// Setup Locale
this.setLocale(getConfig().getString("locale"), false);
// Load version adapter and managers
this.setupVersionAdapter();
this.reload();

3
UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/ConfigurationManager.java
View File

@ -4,6 +4,7 @@ import com.songoda.ultimatetimber.UltimateTimber;
import com.songoda.ultimatetimber.adapter.VersionAdapterType;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.File;
import java.util.List;
@ -167,6 +168,8 @@ public class ConfigurationManager extends Manager {
@Override
public void reload() {
this.plugin.getCoreConfig().load();
File configFile = new File(this.plugin.getDataFolder() + "/config.yml");
// If an old config still exists, rename it so it doesn't interfere

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.0.5</version>
<version>2.0.6</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>