summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2012-12-19 22:36:37 +1100
committerChris Ward <chris@chrisgward.com>2012-12-19 22:36:37 +1100
commit7df0802e88e87f7a875950cad99fdc87e2bab985 (patch)
treeb140c70402d056f61a24ed38259c7db6b12a0a2a
parent9b69334eea2884c6f42524a0631ba23d7c86aeff (diff)
downloadEssentials-7df0802e88e87f7a875950cad99fdc87e2bab985.tar
Essentials-7df0802e88e87f7a875950cad99fdc87e2bab985.tar.gz
Essentials-7df0802e88e87f7a875950cad99fdc87e2bab985.tar.lz
Essentials-7df0802e88e87f7a875950cad99fdc87e2bab985.tar.xz
Essentials-7df0802e88e87f7a875950cad99fdc87e2bab985.zip
Fix indents, file perms (sorry! XD)
-rw-r--r--[-rwxr-xr-x]Essentials/src/net/ess3/commands/Commandrecipe.java264
-rw-r--r--[-rwxr-xr-x]Essentials/src/net/ess3/listener/EssentialsPlayerListener.java36
-rw-r--r--[-rwxr-xr-x]Essentials/src/net/ess3/user/User.java6
3 files changed, 153 insertions, 153 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandrecipe.java b/Essentials/src/net/ess3/commands/Commandrecipe.java
index d367da5e7..667cf23c4 100755..100644
--- a/Essentials/src/net/ess3/commands/Commandrecipe.java
+++ b/Essentials/src/net/ess3/commands/Commandrecipe.java
@@ -18,142 +18,142 @@ import java.util.Map;
public class Commandrecipe extends EssentialsCommand
{
- @Override
- public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
- {
- if (args.length < 1)
- {
- throw new NotEnoughArgumentsException();
- }
- final ItemStack item = ess.getItemDb().get(args[0]);
- final List<Recipe> recipes = ess.getServer().getRecipesFor(item);
- if (recipes.size() < 1)
- {
- throw new Exception(_("recipeNone", getMaterialName(item)));
- }
- int recipeNo = 0;
- if (args.length > 1)
- {
- if (Util.isInt(args[1]))
- {
- recipeNo = Integer.parseInt(args[1]) - 1;
- }
- else
- {
- throw new Exception(_("invalidNumber"));
- }
- }
- if (recipeNo < 0 || recipeNo >= recipes.size())
- {
- throw new Exception(_("recipeBadIndex"));
- }
- final Recipe recipe = recipes.get(recipeNo);
- sender.sendMessage(_("recipe", getMaterialName(item), recipeNo + 1, recipes.size()));
- if (recipe instanceof FurnaceRecipe)
- {
- furnaceRecipe(sender, (FurnaceRecipe)recipe);
- }
- else if (recipe instanceof ShapedRecipe)
- {
- shapedRecipe(sender, (ShapedRecipe)recipe);
- }
- else if (recipe instanceof ShapelessRecipe)
- {
- shapelessRecipe(sender, (ShapelessRecipe)recipe);
- }
- if (recipes.size() > 1 && args.length == 1)
- {
- sender.sendMessage(_("recipeMore", commandLabel, args[0], getMaterialName(item)));
- }
- }
+ @Override
+ public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+ {
+ if (args.length < 1)
+ {
+ throw new NotEnoughArgumentsException();
+ }
+ final ItemStack item = ess.getItemDb().get(args[0]);
+ final List<Recipe> recipes = ess.getServer().getRecipesFor(item);
+ if (recipes.size() < 1)
+ {
+ throw new Exception(_("recipeNone", getMaterialName(item)));
+ }
+ int recipeNo = 0;
+ if (args.length > 1)
+ {
+ if (Util.isInt(args[1]))
+ {
+ recipeNo = Integer.parseInt(args[1]) - 1;
+ }
+ else
+ {
+ throw new Exception(_("invalidNumber"));
+ }
+ }
+ if (recipeNo < 0 || recipeNo >= recipes.size())
+ {
+ throw new Exception(_("recipeBadIndex"));
+ }
+ final Recipe recipe = recipes.get(recipeNo);
+ sender.sendMessage(_("recipe", getMaterialName(item), recipeNo + 1, recipes.size()));
+ if (recipe instanceof FurnaceRecipe)
+ {
+ furnaceRecipe(sender, (FurnaceRecipe) recipe);
+ }
+ else if (recipe instanceof ShapedRecipe)
+ {
+ shapedRecipe(sender, (ShapedRecipe) recipe);
+ }
+ else if (recipe instanceof ShapelessRecipe)
+ {
+ shapelessRecipe(sender, (ShapelessRecipe) recipe);
+ }
+ if (recipes.size() > 1 && args.length == 1)
+ {
+ sender.sendMessage(_("recipeMore", commandLabel, args[0], getMaterialName(item)));
+ }
+ }
- public void furnaceRecipe(CommandSender sender, FurnaceRecipe recipe)
- {
- sender.sendMessage(_("recipeFurnace", getMaterialName(recipe.getInput())));
- }
+ public void furnaceRecipe(CommandSender sender, FurnaceRecipe recipe)
+ {
+ sender.sendMessage(_("recipeFurnace", getMaterialName(recipe.getInput())));
+ }
- public void shapedRecipe(CommandSender sender, ShapedRecipe recipe)
- {
- Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
- if (sender instanceof IUser)
- {
- IUser user = getUser(sender);
- user.setRecipeSee(true);
- InventoryView view = user.getPlayer().openWorkbench(null, true);
- for (Map.Entry<Character, ItemStack> e : recipe.getIngredientMap().entrySet())
- {
- view.setItem(" abcdefghi".indexOf(e.getKey()), e.getValue());
- }
- }
- else
- {
- HashMap<ItemStack, String> colorMap = new HashMap<ItemStack, String>();
- int i = 1;
- for (Character c : "abcdefghi".toCharArray())
- {
- if (!colorMap.containsKey(recipeMap.get(c)))
- {
- colorMap.put(recipeMap.get(c), String.valueOf(i++));
- }
- }
- sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('a')), colorMap.get(recipeMap.get('b')), colorMap.get(recipeMap.get('c'))));
- sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('d')), colorMap.get(recipeMap.get('e')), colorMap.get(recipeMap.get('f'))));
- sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('g')), colorMap.get(recipeMap.get('h')), colorMap.get(recipeMap.get('i'))));
+ public void shapedRecipe(CommandSender sender, ShapedRecipe recipe)
+ {
+ Map<Character, ItemStack> recipeMap = recipe.getIngredientMap();
+ if (sender instanceof IUser)
+ {
+ IUser user = getUser(sender);
+ user.setRecipeSee(true);
+ InventoryView view = user.getPlayer().openWorkbench(null, true);
+ for (Map.Entry<Character, ItemStack> e : recipe.getIngredientMap().entrySet())
+ {
+ view.setItem(" abcdefghi".indexOf(e.getKey()), e.getValue());
+ }
+ }
+ else
+ {
+ HashMap<ItemStack, String> colorMap = new HashMap<ItemStack, String>();
+ int i = 1;
+ for (Character c : "abcdefghi".toCharArray())
+ {
+ if (!colorMap.containsKey(recipeMap.get(c)))
+ {
+ colorMap.put(recipeMap.get(c), String.valueOf(i++));
+ }
+ }
+ sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('a')), colorMap.get(recipeMap.get('b')), colorMap.get(recipeMap.get('c'))));
+ sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('d')), colorMap.get(recipeMap.get('e')), colorMap.get(recipeMap.get('f'))));
+ sender.sendMessage(_("recipeGrid", colorMap.get(recipeMap.get('g')), colorMap.get(recipeMap.get('h')), colorMap.get(recipeMap.get('i'))));
- StringBuilder s = new StringBuilder();
- for (ItemStack items : colorMap.keySet().toArray(new ItemStack[colorMap.size()]))
- {
- s.append(_("recipeGridItem", colorMap.get(items), getMaterialName(items)));
- }
- sender.sendMessage(_("recipeWhere", s.toString()));
- }
- }
+ StringBuilder s = new StringBuilder();
+ for (ItemStack items : colorMap.keySet().toArray(new ItemStack[colorMap.size()]))
+ {
+ s.append(_("recipeGridItem", colorMap.get(items), getMaterialName(items)));
+ }
+ sender.sendMessage(_("recipeWhere", s.toString()));
+ }
+ }
- public void shapelessRecipe(CommandSender sender, ShapelessRecipe recipe)
- {
- List<ItemStack> ingredients = recipe.getIngredientList();
- if (sender instanceof IUser)
- {
- IUser user = getUser(sender);
- user.setRecipeSee(true);
- InventoryView view = user.getPlayer().openWorkbench(null, true);
- for (int i = 0; i < ingredients.size(); i++)
- {
- view.setItem(i + 1, ingredients.get(i));
- }
- }
- else
- {
- ess.getLogger().info(sender.getClass().getName());
- StringBuilder s = new StringBuilder();
- for (int i = 0; i < ingredients.size(); i++)
- {
- s.append(getMaterialName(ingredients.get(i)));
- if (i != ingredients.size() - 1)
- {
- s.append(",");
- }
- s.append(" ");
- }
- sender.sendMessage(_("recipeShapeless", s.toString()));
- }
- }
+ public void shapelessRecipe(CommandSender sender, ShapelessRecipe recipe)
+ {
+ List<ItemStack> ingredients = recipe.getIngredientList();
+ if (sender instanceof IUser)
+ {
+ IUser user = getUser(sender);
+ user.setRecipeSee(true);
+ InventoryView view = user.getPlayer().openWorkbench(null, true);
+ for (int i = 0; i < ingredients.size(); i++)
+ {
+ view.setItem(i + 1, ingredients.get(i));
+ }
+ }
+ else
+ {
+ ess.getLogger().info(sender.getClass().getName());
+ StringBuilder s = new StringBuilder();
+ for (int i = 0; i < ingredients.size(); i++)
+ {
+ s.append(getMaterialName(ingredients.get(i)));
+ if (i != ingredients.size() - 1)
+ {
+ s.append(",");
+ }
+ s.append(" ");
+ }
+ sender.sendMessage(_("recipeShapeless", s.toString()));
+ }
+ }
- public String getMaterialName(ItemStack stack)
- {
- if (stack == null)
- {
- return _("recipeNothing");
- }
- return getMaterialName(stack.getType());
- }
+ public String getMaterialName(ItemStack stack)
+ {
+ if (stack == null)
+ {
+ return _("recipeNothing");
+ }
+ return getMaterialName(stack.getType());
+ }
- public String getMaterialName(Material type)
- {
- if (type == null)
- {
- return _("recipeNothing");
- }
- return type.toString().replace("_", " ").toLowerCase(Locale.ENGLISH);
- }
+ public String getMaterialName(Material type)
+ {
+ if (type == null)
+ {
+ return _("recipeNothing");
+ }
+ return type.toString().replace("_", " ").toLowerCase(Locale.ENGLISH);
+ }
} \ No newline at end of file
diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
index 277820fba..de737a79c 100755..100644
--- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
+++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
@@ -495,14 +495,14 @@ public class EssentialsPlayerListener implements Listener
}
}
}
- if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH)
- {
- final IUser user = ess.getUserMap().getUser((Player)event.getWhoClicked());
- if(user.isRecipeSee())
- {
- event.setCancelled(true);
- }
- }
+ if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH)
+ {
+ final IUser user = ess.getUserMap().getUser((Player)event.getWhoClicked());
+ if(user.isRecipeSee())
+ {
+ event.setCancelled(true);
+ }
+ }
}
@EventHandler(priority = EventPriority.MONITOR)
@@ -513,17 +513,17 @@ public class EssentialsPlayerListener implements Listener
final IUser user = ess.getUserMap().getUser((Player)event.getPlayer());
user.setInvSee(false);
}
- else if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH)
- {
- final IUser user = ess.getUserMap().getUser((Player)event.getPlayer());
- if(user.isRecipeSee())
- {
- user.setRecipeSee(false);
- event.getView().getTopInventory().clear();
- }
- }
+ else if (event.getView().getTopInventory().getType() == InventoryType.WORKBENCH)
+ {
+ final IUser user = ess.getUserMap().getUser((Player)event.getPlayer());
+ if (user.isRecipeSee())
+ {
+ user.setRecipeSee(false);
+ event.getView().getTopInventory().clear();
+ }
+ }
}
-
+
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerFishEvent(final PlayerFishEvent event)
{
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index 9aa10d366..aaae52ead 100755..100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -54,9 +54,9 @@ public class User extends UserBase implements IUser
private transient Location afkPosition;
private AtomicBoolean gotMailInfo = new AtomicBoolean(false);
private WeakReference<Player> playerCache;
- @Getter
- @Setter
- private boolean recipeSee = false;
+ @Getter
+ @Setter
+ private boolean recipeSee = false;
public User(final OfflinePlayer base, final IEssentials ess) throws InvalidNameException
{