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

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

Conflicts:
	pom.xml
	src/main/java/world/bentobox/warps/config/Settings.java
This commit is contained in:
tastybento 2019-05-10 18:26:49 -07:00
parent 14a992a057 6029ae6b2d
commit ddffcf3f38
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/world/bentobox/warps/config/Settings.java
View File

@ -5,8 +5,8 @@ import java.util.Set;
import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.api.configuration.ConfigEntry;
import world.bentobox.bentobox.api.configuration.ConfigObject;
import world.bentobox.bentobox.api.configuration.StoreAt;
import world.bentobox.bentobox.database.objects.DataObject;
@StoreAt(filename="config.yml", path="addons/WelcomeWarps")
@ -15,7 +15,7 @@ import world.bentobox.bentobox.database.objects.DataObject;
@ConfigComment("You cannot edit it while the server is running because changes will")
@ConfigComment("be lost! Use in-game settings GUI or edit when server is offline.")
@ConfigComment("")
public class Settings implements DataObject
public class Settings implements ConfigObject
{
@ConfigComment("")
@ConfigComment("Warp Restriction - needed levels to be able to create a warp")
@ -44,9 +44,6 @@ public class Settings implements DataObject
@ConfigEntry(path = "disabled-gamemodes")
private Set<String> disabledGameModes = new HashSet<>();
@ConfigComment("")
private String uniqueId = "config";
// ---------------------------------------------------------------------
// Section: Constructor
// ---------------------------------------------------------------------
@ -74,27 +71,6 @@ public class Settings implements DataObject
return warpLevelRestriction;
}
/**
* @return the uniqueId
*/
@Override
public String getUniqueId()
{
return uniqueId;
}
/**
* @param uniqueId - unique ID the uniqueId to set
*/
@Override
public void setUniqueId(String uniqueId)
{
this.uniqueId = uniqueId;
}
/**
* This method sets the warpLevelRestriction object value.
* @param warpLevelRestriction the warpLevelRestriction object new value.

31
src/main/resources/locales/es-ES.yml Normal file
View File

@ -0,0 +1,31 @@
###########################################################################################################
# Este es un archivo YML. Tenga cuidado al editar. Revisa tus ediciones en un verificador de YAML como #
# el de http://yaml-online-parser.appspot.com #
###########################################################################################################
warp:
help:
description: "Teletransportarte hacia el warp del jugador"
parameters: <name>
warps:
deactivate: "&cViejo cartel a sido desactivado!"
error:
does-not-exist: "&cOh snap! Ese warp ya no existe!"
duplicate: "&CCartel duplicado puesto"
no-permission: "&CNo tienes permiso para hacer eso!"
no-remove: "&CNo puedes quitar ese cartel!"
no-warps-yet: "&CNo hay warps disponibles aun"
not-enough-level: "&CTu nivel de isla no es lo suficientemente alto!"
not-on-island: "&CDebes estar en tu isla para hacer eso!"
not-safe: "&cEse warp no es seguro!"
your-level-is: "&cTu nivel de isla es solo [level] y debe ser mayor que [required]"
help:
description: "Abre el panel de warps"
next: "&6Siguiente página"
player-warped: "&2[name] teletransportarte a tu warp!"
previous: "&6Pagina anterior"
sign-removed: "&CCartel removido!"
success: "&AExito!"
title: "Carteles de Warps"
warpTip: "&6Coloca un cartel con este texto [text] arriba"
warpToPlayersSign: "&6Teletransportandote al warp de [player]"