Compare commits
12 commits
Author | SHA1 | Date | |
---|---|---|---|
66c1b1b14f | |||
496af97e1c | |||
6ec63b5ae7 | |||
ea7520d99a | |||
|
47461d49c2 | ||
7120e3c40e | |||
|
c6b2dc3443 | ||
4e58ddd475 | |||
5c83b923da | |||
83b5f1fec4 | |||
|
59ccc55f98 | ||
f92cc773c1 |
9 changed files with 51 additions and 71 deletions
2
ButtonProcessor/pom.xml
Executable file → Normal file
2
ButtonProcessor/pom.xml
Executable file → Normal file
|
@ -11,7 +11,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.yaml</groupId>
|
<groupId>org.yaml</groupId>
|
||||||
<artifactId>snakeyaml</artifactId>
|
<artifactId>snakeyaml</artifactId>
|
||||||
<version>1.21</version>
|
<version>1.32</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -119,13 +119,9 @@
|
||||||
<id>ess-repo</id>
|
<id>ess-repo</id>
|
||||||
<url>https://ci.ender.zone/plugin/repository/everything/</url>
|
<url>https://ci.ender.zone/plugin/repository/everything/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>Votifier</id>
|
|
||||||
<url>https://dl.bintray.com/nuvotifier/maven/</url>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
<repository>
|
||||||
<id>Multiverse-Core</id>
|
<id>Multiverse-Core</id>
|
||||||
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
|
<url>https://repo.onarandombox.com/content/groups/public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>minecraft-repo</id>
|
<id>minecraft-repo</id>
|
||||||
|
@ -136,7 +132,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.reflections</groupId>
|
<groupId>org.reflections</groupId>
|
||||||
<artifactId>reflections</artifactId>
|
<artifactId>reflections</artifactId>
|
||||||
<version>0.9.10</version>
|
<version>0.10.2</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -161,12 +157,12 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.javassist</groupId>
|
<groupId>org.javassist</groupId>
|
||||||
<artifactId>javassist</artifactId>
|
<artifactId>javassist</artifactId>
|
||||||
<version>3.20.0-GA</version>
|
<version>3.28.0-GA</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mockito</groupId>
|
<groupId>org.mockito</groupId>
|
||||||
<artifactId>mockito-core</artifactId>
|
<artifactId>mockito-core</artifactId>
|
||||||
<version>3.0.0</version>
|
<version>4.2.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.TBMCPlugins.ChromaCore</groupId>
|
<groupId>com.github.TBMCPlugins.ChromaCore</groupId>
|
||||||
|
@ -180,22 +176,23 @@
|
||||||
<version>2.17.1</version>
|
<version>2.17.1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- https://mvnrepository.com/artifact/com.github.NuVotifier.NuVotifier/nuvotifier-bukkit -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.vexsoftware</groupId>
|
<groupId>com.github.NuVotifier.NuVotifier</groupId>
|
||||||
<artifactId>nuvotifier-universal</artifactId>
|
<artifactId>nuvotifier-bukkit</artifactId>
|
||||||
<version>2.3.4</version>
|
<version>v2.7.1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.onarandombox.multiversecore</groupId>
|
<groupId>com.onarandombox.multiversecore</groupId>
|
||||||
<artifactId>Multiverse-Core</artifactId>
|
<artifactId>Multiverse-Core</artifactId>
|
||||||
<version>4.0.1</version>
|
<version>4.3.1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.lucko</groupId>
|
<groupId>me.lucko</groupId>
|
||||||
<artifactId>commodore</artifactId>
|
<artifactId>commodore</artifactId>
|
||||||
<version>1.8</version>
|
<version>1.11</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package buttondevteam.core;
|
package buttondevteam.core;
|
||||||
|
|
||||||
import buttondevteam.core.component.towny.TownyComponent;
|
|
||||||
import buttondevteam.lib.*;
|
import buttondevteam.lib.*;
|
||||||
import buttondevteam.lib.architecture.ButtonPlugin;
|
import buttondevteam.lib.architecture.ButtonPlugin;
|
||||||
import buttondevteam.lib.chat.ChatMessage;
|
import buttondevteam.lib.chat.ChatMessage;
|
||||||
|
@ -36,7 +35,6 @@ public class PlayerListener implements Listener {
|
||||||
player.PlayerName.set(p.getName());
|
player.PlayerName.set(p.getName());
|
||||||
MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get());
|
MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get());
|
||||||
} else if (!p.getName().equals(pname)) {
|
} else if (!p.getName().equals(pname)) {
|
||||||
TownyComponent.renameInTowny(pname, p.getName());
|
|
||||||
MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName());
|
MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName());
|
||||||
player.PlayerName.set(p.getName());
|
player.PlayerName.set(p.getName());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,10 @@
|
||||||
package buttondevteam.core.component.towny;
|
package buttondevteam.core.component.towny;
|
||||||
|
|
||||||
import buttondevteam.core.ComponentManager;
|
|
||||||
import buttondevteam.core.MainPlugin;
|
import buttondevteam.core.MainPlugin;
|
||||||
import buttondevteam.lib.TBMCCoreAPI;
|
|
||||||
import buttondevteam.lib.architecture.Component;
|
import buttondevteam.lib.architecture.Component;
|
||||||
import com.palmergames.bukkit.towny.TownyUniverse;
|
|
||||||
import com.palmergames.bukkit.towny.exceptions.AlreadyRegisteredException;
|
|
||||||
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
|
|
||||||
import com.palmergames.bukkit.towny.object.Resident;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Automatically renames Towny players if they changed their Minecraft name
|
* Provides a command to remove invalid Towny residents.
|
||||||
*/
|
*/
|
||||||
public class TownyComponent extends Component<MainPlugin> {
|
public class TownyComponent extends Component<MainPlugin> {
|
||||||
@Override
|
@Override
|
||||||
|
@ -21,35 +15,4 @@ public class TownyComponent extends Component<MainPlugin> {
|
||||||
@Override
|
@Override
|
||||||
protected void disable() {
|
protected void disable() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Only renames the resident if this component is enabled. Used to handle name changes.
|
|
||||||
*
|
|
||||||
* @param oldName The player's old name as known by us
|
|
||||||
* @param newName The player's new name
|
|
||||||
*/
|
|
||||||
public static void renameInTowny(String oldName, String newName) {
|
|
||||||
var component = ComponentManager.getIfEnabled(TownyComponent.class);
|
|
||||||
if (component == null)
|
|
||||||
return;
|
|
||||||
component.log("Renaming " + oldName + " in Towny to " + newName);
|
|
||||||
TownyUniverse tu = TownyUniverse.getInstance();
|
|
||||||
try {
|
|
||||||
Resident resident = tu.getDataSource().getResident(oldName);
|
|
||||||
if (resident == null) {
|
|
||||||
component.logWarn("Resident not found - couldn't rename in Towny.");
|
|
||||||
TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny.");
|
|
||||||
} else if (tu.getDataSource().hasResident(newName)) {
|
|
||||||
component.logWarn("Target resident name is already in use.");
|
|
||||||
TBMCCoreAPI.sendDebugMessage("Target resident name is already in use. (" + oldName + " -> " + newName + ")");
|
|
||||||
} else {
|
|
||||||
tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2
|
|
||||||
component.log("Renaming done.");
|
|
||||||
}
|
|
||||||
} catch (AlreadyRegisteredException e) {
|
|
||||||
TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e, component);
|
|
||||||
} catch (NotRegisteredException e) {
|
|
||||||
TBMCCoreAPI.SendException("Failed to rename resident, the resident isn't registered.", e, component);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import org.yaml.snakeyaml.representer.Representer;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
@ -174,7 +175,7 @@ public class CommentedConfiguration extends YamlConfiguration {
|
||||||
while (newContents.toString().startsWith(" " + System.getProperty("line.separator"))) {
|
while (newContents.toString().startsWith(" " + System.getProperty("line.separator"))) {
|
||||||
newContents = new StringBuilder(newContents.toString().replaceFirst(" " + System.getProperty("line.separator"), ""));
|
newContents = new StringBuilder(newContents.toString().replaceFirst(" " + System.getProperty("line.separator"), ""));
|
||||||
}
|
}
|
||||||
Files.write(file.toPath(), newContents.toString().getBytes());
|
Files.write(file.toPath(), newContents.toString().getBytes(StandardCharsets.UTF_8));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -201,6 +201,13 @@ public final class IHaveConfig {
|
||||||
val ms = obj.getClass().getDeclaredMethods();
|
val ms = obj.getClass().getDeclaredMethods();
|
||||||
for (val m : ms) {
|
for (val m : ms) {
|
||||||
if (!m.getReturnType().getName().equals(ConfigData.class.getName())) continue;
|
if (!m.getReturnType().getName().equals(ConfigData.class.getName())) continue;
|
||||||
|
final String mName;
|
||||||
|
{
|
||||||
|
var name = m.getName();
|
||||||
|
var ind = name.lastIndexOf('$');
|
||||||
|
if (ind == -1) mName = name;
|
||||||
|
else mName = name.substring(ind + 1);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
m.setAccessible(true);
|
m.setAccessible(true);
|
||||||
List<ConfigData<?>> configList;
|
List<ConfigData<?>> configList;
|
||||||
|
@ -213,7 +220,7 @@ public final class IHaveConfig {
|
||||||
try {
|
try {
|
||||||
return (ConfigData<?>) m.invoke(obj, kv.getValue());
|
return (ConfigData<?>) m.invoke(obj, kv.getValue());
|
||||||
} catch (IllegalAccessException | InvocationTargetException e) {
|
} catch (IllegalAccessException | InvocationTargetException e) {
|
||||||
String msg = "Failed to pregenerate " + m.getName() + " for " + obj + " using config " + kv.getKey() + "!";
|
String msg = "Failed to pregenerate " + mName + " for " + obj + " using config " + kv.getKey() + "!";
|
||||||
if (obj instanceof Component<?>)
|
if (obj instanceof Component<?>)
|
||||||
TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
|
TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
|
||||||
else if (obj instanceof JavaPlugin)
|
else if (obj instanceof JavaPlugin)
|
||||||
|
@ -225,18 +232,18 @@ public final class IHaveConfig {
|
||||||
}).filter(Objects::nonNull).collect(Collectors.toList());
|
}).filter(Objects::nonNull).collect(Collectors.toList());
|
||||||
} else {
|
} else {
|
||||||
if (TBMCCoreAPI.IsTestServer())
|
if (TBMCCoreAPI.IsTestServer())
|
||||||
MainPlugin.Instance.getLogger().warning("Method " + m.getName() + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes()));
|
MainPlugin.Instance.getLogger().warning("Method " + mName + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes()));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (val c : configList) {
|
for (val c : configList) {
|
||||||
if (c.getPath().length() == 0)
|
if (c.getPath().length() == 0)
|
||||||
c.setPath(m.getName());
|
c.setPath(mName);
|
||||||
else if (!c.getPath().equals(m.getName()))
|
else if (!c.getPath().equals(mName))
|
||||||
MainPlugin.Instance.getLogger().warning("Config name does not match: " + c.getPath() + " instead of " + m.getName());
|
MainPlugin.Instance.getLogger().warning("Config name does not match: " + c.getPath() + " instead of " + mName);
|
||||||
c.get(); //Saves the default value if needed - also checks validity
|
c.get(); //Saves the default value if needed - also checks validity
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String msg = "Failed to pregenerate " + m.getName() + " for " + obj + "!";
|
String msg = "Failed to pregenerate " + mName + " for " + obj + "!";
|
||||||
if (obj instanceof Component<?>)
|
if (obj instanceof Component<?>)
|
||||||
TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
|
TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
|
||||||
else if (obj instanceof JavaPlugin)
|
else if (obj instanceof JavaPlugin)
|
||||||
|
|
|
@ -6,12 +6,22 @@ import lombok.RequiredArgsConstructor;
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
public enum Color implements TellrawSerializableEnum {
|
public enum Color implements TellrawSerializableEnum {
|
||||||
Black("black", 0, 0, 0), DarkBlue("dark_blue", 0, 0, 170), DarkGreen("dark_green", 0, 170, 0), DarkAqua("dark_aqua",
|
Black("black", 0, 0, 0),
|
||||||
0, 170, 170), DarkRed("dark_red", 170, 0, 0), DarkPurple("dark_purple", 0, 170, 0), Gold("gold", 255, 170,
|
DarkBlue("dark_blue", 0, 0, 170),
|
||||||
0), Gray("gray", 170, 170, 170), DarkGray("dark_gray", 85, 85, 85), Blue("blue", 85, 85,
|
DarkGreen("dark_green", 0, 170, 0),
|
||||||
255), Green("green", 85, 255, 85), Aqua("aqua", 85, 255, 255), Red("red", 255, 85,
|
DarkAqua("dark_aqua", 0, 170, 170),
|
||||||
85), LightPurple("light_purple", 255, 85,
|
DarkRed("dark_red", 170, 0, 0),
|
||||||
255), Yellow("yellow", 255, 255, 85), White("white", 255, 255, 255);
|
DarkPurple("dark_purple", 0, 170, 0),
|
||||||
|
Gold("gold", 255, 170,0),
|
||||||
|
Gray("gray", 170, 170, 170),
|
||||||
|
DarkGray("dark_gray", 85, 85, 85),
|
||||||
|
Blue("blue", 85, 85, 255),
|
||||||
|
Green("green", 85, 255, 85),
|
||||||
|
Aqua("aqua", 85, 255, 255),
|
||||||
|
Red("red", 255, 85,85),
|
||||||
|
LightPurple("light_purple", 255, 85, 255),
|
||||||
|
Yellow("yellow", 255, 255, 85),
|
||||||
|
White("white", 255, 255, 255);
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
private final int red;
|
private final int red;
|
||||||
|
|
|
@ -253,7 +253,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
|
||||||
}
|
}
|
||||||
val conv = paramConverters.get(cl);
|
val conv = paramConverters.get(cl);
|
||||||
if (conv == null)
|
if (conv == null)
|
||||||
throw new Exception("No suitable converter found for parameter type '" + cl.getCanonicalName() + "' for command '" + sd.method.toString() + "'");
|
throw new Exception("No suitable converter found for parameter type '" + cl.getCanonicalName() + "' for command '" + sd.method + "'");
|
||||||
val cparam = conv.converter.apply(param);
|
val cparam = conv.converter.apply(param);
|
||||||
if (cparam == null) {
|
if (cparam == null) {
|
||||||
sender.sendMessage(conv.errormsg); //Param conversion failed - ex. plugin not found
|
sender.sendMessage(conv.errormsg); //Param conversion failed - ex. plugin not found
|
||||||
|
@ -355,7 +355,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
|
||||||
if (ht.length > 0)
|
if (ht.length > 0)
|
||||||
ht[0] = "§6---- " + ht[0] + " ----";
|
ht[0] = "§6---- " + ht[0] + " ----";
|
||||||
YamlConfiguration yc = YamlConfiguration.loadConfiguration(new InputStreamReader(str)); //Generated by ButtonProcessor
|
YamlConfiguration yc = YamlConfiguration.loadConfiguration(new InputStreamReader(str)); //Generated by ButtonProcessor
|
||||||
val ccs = yc.getConfigurationSection(method.getDeclaringClass().getCanonicalName());
|
val ccs = yc.getConfigurationSection(method.getDeclaringClass().getCanonicalName().replace('$', '.'));
|
||||||
if (ccs != null) {
|
if (ccs != null) {
|
||||||
val cs = ccs.getConfigurationSection(method.getName());
|
val cs = ccs.getConfigurationSection(method.getName());
|
||||||
if (cs != null) {
|
if (cs != null) {
|
||||||
|
@ -371,7 +371,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
|
||||||
for (int j = 0; j < paramArray.length && j < parameters.length; j++)
|
for (int j = 0; j < paramArray.length && j < parameters.length; j++)
|
||||||
parameters[j] = paramArray[j];
|
parameters[j] = paramArray[j];
|
||||||
} else
|
} else
|
||||||
TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("Method '" + method.toString() + "' != " + mname + " or params is " + params), MainPlugin.Instance);
|
TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("Method '" + method + "' != " + mname + " or params is " + params), MainPlugin.Instance);
|
||||||
} else
|
} else
|
||||||
MainPlugin.Instance.getLogger().warning("Failed to get command data for " + method + " (cs is null)! Make sure to use 'clean install' when building the project.");
|
MainPlugin.Instance.getLogger().warning("Failed to get command data for " + method + " (cs is null)! Make sure to use 'clean install' when building the project.");
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -25,6 +25,9 @@ import java.util.function.Supplier;
|
||||||
public abstract class ChromaGamerBase {
|
public abstract class ChromaGamerBase {
|
||||||
private static final String TBMC_PLAYERS_DIR = "TBMC/players/";
|
private static final String TBMC_PLAYERS_DIR = "TBMC/players/";
|
||||||
private static final ArrayList<Function<CommandSender, ? extends Optional<? extends ChromaGamerBase>>> senderConverters = new ArrayList<>();
|
private static final ArrayList<Function<CommandSender, ? extends Optional<? extends ChromaGamerBase>>> senderConverters = new ArrayList<>();
|
||||||
|
/**
|
||||||
|
* Holds data per user class
|
||||||
|
*/
|
||||||
private static final HashMap<Class<? extends ChromaGamerBase>, StaticUserData<?>> staticDataMap = new HashMap<>();
|
private static final HashMap<Class<? extends ChromaGamerBase>, StaticUserData<?>> staticDataMap = new HashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -56,6 +59,7 @@ public abstract class ChromaGamerBase {
|
||||||
throw new RuntimeException("Class not registered as a user class! Use @UserClass or TBMCPlayerBase");
|
throw new RuntimeException("Class not registered as a user class! Use @UserClass or TBMCPlayerBase");
|
||||||
var sud = new StaticUserData<T>(folderName);
|
var sud = new StaticUserData<T>(folderName);
|
||||||
sud.getConstructors().put(cl, constructor);
|
sud.getConstructors().put(cl, constructor);
|
||||||
|
sud.getConstructors().put(userclass, constructor); // Alawys register abstract and prototype class (TBMCPlayerBase and TBMCPlayer)
|
||||||
staticDataMap.put(userclass, sud);
|
staticDataMap.put(userclass, sud);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue