Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fc8ffc0
Added Reserve Support, and tested.
creatorfromhell Jun 16, 2019
6528b37
Modified to address PR requested modifications.
creatorfromhell Jun 20, 2019
2140f77
Added Reserve Support, and tested.
creatorfromhell Jun 16, 2019
fdf5781
Modified to address PR requested modifications.
creatorfromhell Jun 20, 2019
5046a8c
Minor formatting and organisation fixes
mdcfe Aug 5, 2019
b0d4210
Modified to suite requested changes.
creatorfromhell Dec 30, 2019
2bb6242
Merge remote-tracking branch 'origin/patch-reserve-support' into patc…
creatorfromhell Dec 30, 2019
ee7c379
Formatting fixes.
creatorfromhell Dec 30, 2019
1211f31
Localize currency names
creatorfromhell Dec 31, 2019
4022d9f
Remove outdated comments.
creatorfromhell Dec 31, 2019
a49e414
reorder new strings for alphabetical correctness
creatorfromhell Dec 31, 2019
43fbcc1
Styling fixes, and pom update.
creatorfromhell Dec 31, 2019
73c0452
Update to latest Reserve Version.
creatorfromhell Jan 1, 2020
97245c3
Bump Reserve to 0.1.4.4.
creatorfromhell Jan 1, 2020
6e9fe16
Update pom.
creatorfromhell Jan 1, 2020
a1c55e5
Only call createAccount if it doesn't exist.
creatorfromhell Jan 8, 2020
9c86ddb
Fix issue where the createAccount method wouldn't be called if hasAcc…
creatorfromhell Jan 9, 2020
709ee22
Remove extra ReserveEssentials class.
creatorfromhell Jan 10, 2020
0630c42
Merge upstream into local branch for package building and testing.
creatorfromhell Jan 10, 2020
15c5df7
Fix for merge commit.
creatorfromhell Jan 10, 2020
29b457c
Revert EssentialsProtect class showing modified from merge.
creatorfromhell Jan 10, 2020
1142536
Resolve requested changes.
creatorfromhell Jan 10, 2020
bc29d5c
Revert EssentialsProtect dif
creatorfromhell Jan 10, 2020
27ca930
Fixes for requested changes.
creatorfromhell Jan 12, 2020
89198ab
Move currency namings to config.yml
creatorfromhell Jan 14, 2020
251eb87
Remove unneeded check as Reserve checks for existing providers for us.
creatorfromhell Jan 14, 2020
b5b3835
Match ReserveEco ess naming scheme to ReserveEssentials.
creatorfromhell Jan 15, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Essentials/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
</build>

<dependencies>
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>Reserve</artifactId>
<version>0.1.4.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.milkbowl</groupId>
<artifactId>VaultAPI</artifactId>
Expand Down
45 changes: 34 additions & 11 deletions Essentials/src/com/earth2me/essentials/Essentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@
*/
package com.earth2me.essentials;

import com.earth2me.essentials.commands.*;
import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
import com.earth2me.essentials.commands.QuietAbortException;
import com.earth2me.essentials.items.AbstractItemDb;
import com.earth2me.essentials.items.CustomItemResolver;
import com.earth2me.essentials.items.FlatItemDb;
import com.earth2me.essentials.items.LegacyItemDb;
import com.earth2me.essentials.metrics.Metrics;
import com.earth2me.essentials.perm.PermissionsHandler;
import com.earth2me.essentials.register.payment.Methods;
import com.earth2me.essentials.services.ReserveEssentials;
import com.earth2me.essentials.signs.SignBlockListener;
import com.earth2me.essentials.signs.SignEntityListener;
import com.earth2me.essentials.signs.SignPlayerListener;
Expand All @@ -34,17 +39,11 @@
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.base.Throwables;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import net.ess3.api.Economy;
import net.ess3.api.IEssentials;
import net.ess3.api.IItemDb;
import net.ess3.api.IJails;
import net.ess3.api.ISettings;
import net.ess3.api.*;
import net.ess3.nms.PotionMetaProvider;
import net.ess3.nms.SpawnEggProvider;
import net.ess3.nms.SpawnerProvider;
Expand All @@ -62,7 +61,11 @@
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.command.*;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -83,6 +86,22 @@
import org.bukkit.scheduler.BukkitTask;
import org.yaml.snakeyaml.error.YAMLException;

import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tl;


Expand Down Expand Up @@ -183,6 +202,10 @@ public void onEnable() {
}
}

if (pm.isPluginEnabled("Reserve")) {
ReserveEssentials.register(this);
}

for (Method method : Server.class.getDeclaredMethods()) {
if (method.getName().endsWith("getOnlinePlayers") && method.getReturnType() == Player[].class) {
oldGetOnlinePlayers = method;
Expand Down
4 changes: 4 additions & 0 deletions Essentials/src/com/earth2me/essentials/ISettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public interface ISettings extends IConf {

String getCurrencySymbol();

String getCurrencySingular();

String getCurrencyPlural();

int getOversizedStackSize();

int getDefaultStackSize();
Expand Down
10 changes: 10 additions & 0 deletions Essentials/src/com/earth2me/essentials/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,16 @@ public String getCurrencySymbol() {
return config.getString("currency-symbol", "$").concat("$").substring(0, 1).replaceAll("[0-9]", "$");
}

@Override
public String getCurrencySingular() {
return config.getString("currency-singular");
}

@Override
public String getCurrencyPlural() {
return config.getString("currency-plural");
}

// #easteregg
@Override
@Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class Methods {
* Implement all methods along with their respective name & class.
*/
private static void _init() {
addMethod("Reserve", new com.earth2me.essentials.register.payment.methods.ReserveEco());
addMethod("Vault", new com.earth2me.essentials.register.payment.methods.VaultEco());
}

Expand Down
Loading