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

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	pom.xml
This commit is contained in:
BONNe 2019-05-19 23:39:43 +03:00
parent 8f207fadf0 f39ed36854
commit 34d3857cf5
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -45,7 +45,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!-- More visible way how to change dependency versions --> <!-- More visible way how to change dependency versions -->
<spigot.version>1.14-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.5.0-SNAPSHOT</bentobox.version> <bentobox.version>1.5.0-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version --> <!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision> <revision>${build.version}-SNAPSHOT</revision>

27
src/main/java/world/bentobox/caveblock/Settings.java
View File

@ -31,26 +31,13 @@ import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
*/ */
@StoreAt(filename="config.yml", path="addons/CaveBlock") @StoreAt(filename="config.yml", path="addons/CaveBlock")
@ConfigComment("CaveBlock Configuration [version]") @ConfigComment("CaveBlock Configuration [version]")
@ConfigComment("This config file is dynamic and saved when the server is shutdown.") public class Settings implements WorldSettings
@ConfigComment("If you edit it while the server is running use /cbadmin reload")
@ConfigComment("otherwise your settings will be lost.")
public class Settings implements DataObject, WorldSettings
{ {
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Section: Getters // Section: Getters
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/**
* @return the uniqueId
*/
@Override
public String getUniqueId()
{
return this.uniqueId;
}
/** /**
* This method returns the friendlyName object. * This method returns the friendlyName object.
* @return the friendlyName object. * @return the friendlyName object.
@ -793,16 +780,6 @@ public class Settings implements DataObject, WorldSettings
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/**
* @param uniqueId - unique ID the uniqueId to set
*/
@Override
public void setUniqueId(String uniqueId)
{
this.uniqueId = uniqueId;
}
/** /**
* This method sets the friendlyName object value. * This method sets the friendlyName object value.
* @param friendlyName the friendlyName object new value. * @param friendlyName the friendlyName object new value.
@ -1900,6 +1877,4 @@ public class Settings implements DataObject, WorldSettings
@ConfigEntry(path = "do-not-edit-these-settings.reset-epoch") @ConfigEntry(path = "do-not-edit-these-settings.reset-epoch")
private long resetEpoch = 0; private long resetEpoch = 0;
private boolean debug; private boolean debug;
private String uniqueId = "config";
} }

5
src/main/resources/addon.yml
View File

@ -1,6 +1,9 @@
name: CaveBlock name: CaveBlock
main: world.bentobox.caveblock.CaveBlock main: world.bentobox.caveblock.CaveBlock
version: ${version}${build.number} version: ${version}${build.number}
metrics: true
repository: "BentoBoxWorld/CaveBlock"
icon: "STONE_PICKAXE"
authors: BONNe authors: BONNe
@ -136,4 +139,4 @@ permissions:
default: op default: op
caveblock.skywalker: caveblock.skywalker:
description: Allows player to walk over the heigh limit. description: Allows player to walk over the heigh limit.
default: op default: op

3
src/main/resources/config.yml
View File

@ -1,7 +1,4 @@
# CaveBlock Configuration ${version} # CaveBlock Configuration ${version}
# This config file is dynamic and saved when the server is shutdown.
# If you edit it while the server is running use /cbadmin reload
# otherwise your settings will be lost.
caveblock: caveblock:
command: command:
# Cave Command. What command users will run to access their cave. # Cave Command. What command users will run to access their cave.