Skip to content

Commit

Permalink
Added localization
Browse files Browse the repository at this point in the history 
Added cache of heads.
  • Loading branch information
@tastybento
tastybento committed Feb 26, 2017
1 parent 2f871b3 commit 1bb9bfe
Show file tree
Hide file tree
Showing 7 changed files with 414 additions and 807 deletions.
436 changes: 5 additions & 431 deletions WelcomeWarps/locale/locale.yml
View file

Large diffs are not rendered by default.

65 changes: 65 additions & 0 deletions WelcomeWarps/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.wasteofplastic</groupId>
<artifactId>WelcomeWarpSigns</artifactId>
<version>1.3</version>
<packaging>jar</packaging>

<name>com.wasteofplastic</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<defaultGoal>clean package install</defaultGoal>
<finalName>wwarps</finalName>
<sourceDirectory>${basedir}/src/</sourceDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
<resource>
<targetPath>locale</targetPath>
<filtering>false</filtering>
<directory>${basedir}/locale</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>

</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
58 changes: 11 additions & 47 deletions WelcomeWarps/src/com/wasteofplastic/wwarps/Locale.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ public class Locale {
private File localeFile = null;
private WWarps plugin;

// Errors
public String errorUnknownPlayer;
public String errorNoPermission;
public String errorCommandNotReady;
public String errorOfflinePlayer;
public String errorUnknownCommand;
// WarpSigns
public String warpswelcomeLine;
public String warpswarpTip;
public String warpssuccess;
Expand All @@ -57,49 +55,21 @@ public class Locale {
public String warpserrorDoesNotExist;
public String warpserrorNotReadyYet;
public String warpserrorNotSafe;
// island warp help
public String warpswarpToPlayersSign;
public String warpserrorNoWarpsYet;
public String warpswarpsAvailable;
public String warpsPlayerWarped;

public String islanderrorYouDoNotHavePermission;

// /island warps;
public String islandhelpWarps;
// /island warp <player>
public String islandhelpWarp;
public String islanderrorInvalidPlayer;




// ////////////////////////////////////
// /island commands //
// ////////////////////////////////////





// //////////////////////////////////////////////////////////////
// Admin commands that use /acid //
// //////////////////////////////////////////////////////////////

// acid reload
public String errorerrorYouDoNotHavePermission;
public String warphelpWarps;
public String warphelpWarp;
public String errorerrorInvalidPlayer;
public String reloadconfigReloaded;
public String errorWrongWorld;
public String prefix;
public String helpColor;
public String warpsPrevious;
public String warpsNext;
public String warpsTitle;
public String errorUseInGame;
public String adminHelpResetSign;
public String adminResetSignNoSign;
public String adminResetSignFound;
public String adminResetSignRescued;
public String adminResetSignErrorExists;
public String newsHeadline;
public String adminHelpreload;
public String adminHelpHelp;
Expand Down Expand Up @@ -172,7 +142,6 @@ public void reloadLocale(String localeName) {
public void loadLocale() {
// Localization Locale Setting
// Command prefix - can be added to the beginning of any message
prefix = ChatColor.translateAlternateColorCodes('&', ChatColor.translateAlternateColorCodes('&', locale.getString("prefix", "")));
errorUnknownPlayer = ChatColor.translateAlternateColorCodes('&', locale.getString("error.unknownPlayer", "That player is unknown."));
errorNoPermission = ChatColor.translateAlternateColorCodes('&',
locale.getString("error.noPermission", "You don't have permission to use that command!"));
Expand Down Expand Up @@ -212,22 +181,17 @@ public void loadLocale() {
warpsPrevious = ChatColor.translateAlternateColorCodes('&', locale.getString("warps.previous", "Previous"));
warpsNext = ChatColor.translateAlternateColorCodes('&', locale.getString("warps.next", "Next"));
warpsTitle = ChatColor.translateAlternateColorCodes('&', locale.getString("warps.title", "Island warps"));
islanderrorYouDoNotHavePermission = ChatColor.translateAlternateColorCodes('&',
locale.getString("island.errorYouDoNotHavePermission", "You do not have permission to use that command!"));
islandhelpWarps = ChatColor.translateAlternateColorCodes('&', locale.getString("island.helpWarps", "Lists all available welcome-sign warps."));
islandhelpWarp = ChatColor.translateAlternateColorCodes('&', locale.getString("island.helpWarp", "Warp to <player>'s welcome sign."));
islanderrorInvalidPlayer = ChatColor.translateAlternateColorCodes('&',
errorerrorYouDoNotHavePermission = ChatColor.translateAlternateColorCodes('&',
locale.getString("error.errorYouDoNotHavePermission", "You do not have permission to use that command!"));
warphelpWarps = ChatColor.translateAlternateColorCodes('&', locale.getString("warp.helpWarps", "Lists all available welcome-sign warps."));
warphelpWarp = ChatColor.translateAlternateColorCodes('&', locale.getString("warp.helpWarp", "Warp to <player>'s welcome sign."));
errorerrorInvalidPlayer = ChatColor.translateAlternateColorCodes('&',
locale.getString("island.errorInvalidPlayer", "That player is invalid or does not have an island!"));
reloadconfigReloaded = ChatColor.translateAlternateColorCodes('&',
locale.getString("reload.configReloaded", "Configuration reloaded from file."));
helpColor = ChatColor.translateAlternateColorCodes('&', locale.getString("island.helpColor", "&e"));
helpColor = ChatColor.translateAlternateColorCodes('&', locale.getString("warp.helpColor", "&e"));
errorUseInGame = ChatColor.translateAlternateColorCodes('&', locale.getString("error.useInGame", "This command must be used in-game."));
adminHelpResetSign = ChatColor.translateAlternateColorCodes('&', locale.getString("adminHelp.resetSign", "Resets the sign you are looking at to the island owner"));
adminHelpHelp = ChatColor.translateAlternateColorCodes('&', locale.getString("adminHelp.help", "Admin Help"));
adminHelpHelp = ChatColor.translateAlternateColorCodes('&', locale.getString("adminHelp.help", "Warp Sign Admin"));
adminHelpreload = ChatColor.translateAlternateColorCodes('&', locale.getString("adminHelp.reload", "reload plugin settings"));
adminResetSignNoSign = ChatColor.translateAlternateColorCodes('&', locale.getString("adminResetSign.noSign", "You must be looking at a sign post to run this command."));
adminResetSignFound = ChatColor.translateAlternateColorCodes('&', locale.getString("adminResetSign.found", "Warp Sign found!"));
adminResetSignRescued = ChatColor.translateAlternateColorCodes('&', locale.getString("adminResetSign.rescued", "Warp sign rescued and assigned to [name]"));
adminResetSignErrorExists = ChatColor.translateAlternateColorCodes('&', locale.getString("adminResetSign.errorExists", "That warp sign is already active and owned by [name]"));
}
}
8 changes: 4 additions & 4 deletions WelcomeWarps/src/com/wasteofplastic/wwarps/WarpSigns.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void onSignWarpCreate(SignChangeEvent e) {
player.sendMessage(ChatColor.RED + plugin.myLocale().warpserrorNoPerm);
return;
}
plugin.getLogger().info("DEBUG: has permission");
//plugin.getLogger().info("DEBUG: has permission");
// Check if the player already has a sign
final Location oldSignLoc = getWarp(player.getUniqueId());
if (oldSignLoc == null) {
Expand Down Expand Up @@ -222,10 +222,10 @@ public void loadWarpList() {
for (String s : temp.keySet()) {
try {
UUID playerUUID = UUID.fromString(s);
plugin.getLogger().info("DEBUG: Player UUID = " + playerUUID);
plugin.getLogger().info("DEBUG: text loc = " + (String) temp.get(s));
//plugin.getLogger().info("DEBUG: Player UUID = " + playerUUID);
//plugin.getLogger().info("DEBUG: text loc = " + (String) temp.get(s));
Location l = Util.getLocationString((String) temp.get(s));
plugin.getLogger().info("DEBUG: Loading warp at " + l);
//plugin.getLogger().info("DEBUG: Loading warp at " + l);
Block b = l.getBlock();
// Check that a warp sign is still there
if (b.getType().equals(Material.SIGN_POST) || b.getType().equals(Material.WALL_SIGN)) {
Expand Down
Loading

0 comments on commit 1bb9bfe

Please sign in to comment.