Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-30 21:07:48 +01:00
Code Issues Projects Releases Wiki Activity

GigaDrill multiplayer

Browse Source
This commit is contained in:
Zrips 2015-12-21 15:11:57 +02:00
parent 992773214a
commit e24a527713
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com/gamingmesh/jobs/Gui/GuiTools.java
View File

@ -166,7 +166,8 @@ public class GuiTools {
continue; continue;
ArrayList<String> Lore = new ArrayList<String>(); ArrayList<String> Lore = new ArrayList<String>();
Lore.add(ChatColor.translateAlternateColorCodes('&', "&e" + actionType.getName())); Lore.add(ChatColor.translateAlternateColorCodes('&', "&e" + Language.getMessage("command.info.output." + actionType.getName().toLowerCase()
+ ".info")));
int y = 1; int y = 1;
for (int z = 0; z < info.size(); z++) { for (int z = 0; z < info.size(); z++) {
String itemName = TranslateName.Translate(info.get(z).getName(), info.get(z)); String itemName = TranslateName.Translate(info.get(z).getName(), info.get(z));
@ -197,7 +198,8 @@ public class GuiTools {
GuiItem = job.getGuiItem(); GuiItem = job.getGuiItem();
Lore = new ArrayList<String>(); Lore = new ArrayList<String>();
Lore.add(ChatColor.translateAlternateColorCodes('&', "&e" + actionType.getName())); Lore.add(ChatColor.translateAlternateColorCodes('&', "&e" + Language.getMessage("command.info.output." + actionType.getName().toLowerCase()
+ ".info")));
i++; i++;
} }
y++; y++;

7
com/gamingmesh/jobs/config/JobsConfiguration.java
View File

@ -78,7 +78,7 @@ public class JobsConfiguration {
public int EconomyLimitTimeLimit, EconomyExpTimeLimit; public int EconomyLimitTimeLimit, EconomyExpTimeLimit;
public int EconomyLimitAnnouncmentDelay, EconomyLimitAnnouncmentExpDelay, globalblocktimer, CowMilkingTimer, public int EconomyLimitAnnouncmentDelay, EconomyLimitAnnouncmentExpDelay, globalblocktimer, CowMilkingTimer,
CoreProtectInterval, BlockPlaceInterval, InfoUpdateInterval; CoreProtectInterval, BlockPlaceInterval, InfoUpdateInterval;
public Double payNearSpawnerMultiplier, VIPpayNearSpawnerMultiplier, TreeFellerMultiplier, PetPay, VipPetPay; public Double payNearSpawnerMultiplier, VIPpayNearSpawnerMultiplier, TreeFellerMultiplier, gigaDrillMultiplier, PetPay, VipPetPay;
public String localeString; public String localeString;
public boolean useBlockProtection; public boolean useBlockProtection;
public boolean useBlockTimer; public boolean useBlockTimer;
@ -590,6 +590,9 @@ public class JobsConfiguration {
writer.addComment("ExploitProtections.McMMO.TreeFellerMultiplier", "Players will get part of money from cutting trees with treefeller ability enabled.", writer.addComment("ExploitProtections.McMMO.TreeFellerMultiplier", "Players will get part of money from cutting trees with treefeller ability enabled.",
"0.2 means 20% of original price"); "0.2 means 20% of original price");
TreeFellerMultiplier = getDouble("ExploitProtections.McMMO.TreeFellerMultiplier", 0.2, config, writer); TreeFellerMultiplier = getDouble("ExploitProtections.McMMO.TreeFellerMultiplier", 0.2, config, writer);
writer.addComment("ExploitProtections.McMMO.gigaDrillMultiplier", "Players will get part of money from braking blocks with gigaDrill ability enabled.",
"0.2 means 20% of original price");
gigaDrillMultiplier = getDouble("ExploitProtections.McMMO.gigaDrillMultiplier", 0.2, config, writer);
writer.addComment("ExploitProtections.Spawner.PreventSlimeSplit", "Prevent slime spliting when they are from spawner", writer.addComment("ExploitProtections.Spawner.PreventSlimeSplit", "Prevent slime spliting when they are from spawner",
"Protects agains exploiting as new splited slimes is treated as naturaly spawned and not from spawner"); "Protects agains exploiting as new splited slimes is treated as naturaly spawned and not from spawner");
@ -1308,7 +1311,7 @@ public class JobsConfiguration {
GetConfigString("command.leave.help.info", "Leave the selected job.", writer, conf, true); GetConfigString("command.leave.help.info", "Leave the selected job.", writer, conf, true);
GetConfigString("command.leave.help.args", "[jobname]", writer, conf, true); GetConfigString("command.leave.help.args", "[jobname]", writer, conf, true);
GetConfigString("command.leave.success", "You have left the job %jobname%.", writer, conf, true); GetConfigString("command.leave.success", "You have left the job %jobname%.", writer, conf, true);
GetConfigString("command.fixnames.help.info", "Tries to fix NULL player names in data base.", writer, conf, true); GetConfigString("command.fixnames.help.info", "Tries to fix NULL player names in data base.", writer, conf, true);
GetConfigString("command.fixnames.help.args", "", writer, conf, true); GetConfigString("command.fixnames.help.args", "", writer, conf, true);

2
com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -312,6 +312,8 @@ public class JobsPaymentListener implements Listener {
if (McMMOlistener.mcMMOPresent) if (McMMOlistener.mcMMOPresent)
if (AbilityAPI.treeFellerEnabled(player)) if (AbilityAPI.treeFellerEnabled(player))
multiplier -= (1 - ConfigManager.getJobsConfiguration().TreeFellerMultiplier); multiplier -= (1 - ConfigManager.getJobsConfiguration().TreeFellerMultiplier);
else if (AbilityAPI.gigaDrillBreakerEnabled(player))
multiplier -= (1 - ConfigManager.getJobsConfiguration().gigaDrillMultiplier);
} catch (IndexOutOfBoundsException e) { } catch (IndexOutOfBoundsException e) {
} }

2
plugin.yml
View File

@ -1,7 +1,7 @@
name: Jobs name: Jobs
description: Jobs Plugin for the BukkitAPI description: Jobs Plugin for the BukkitAPI
main: com.gamingmesh.jobs.JobsPlugin main: com.gamingmesh.jobs.JobsPlugin
version: 2.54.3 version: 2.54.5
author: phrstbrn author: phrstbrn
softdepend: [Vault, CoreProtect, MythicMobs, McMMO] softdepend: [Vault, CoreProtect, MythicMobs, McMMO]
commands: commands: