Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/main/java/net/tfminecraft/rpcharacters/Cache.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public class Cache {

public static boolean requireCharacter;
/** Playtest server: tag in-game creates and stop syncing characters with the website. */
public static boolean devCharacters;
public static boolean noCharacterFreeze;
public static boolean lackingCluesFreeze;
public static boolean excessCharactersFreeze;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

import net.tfminecraft.rpcharacters.RPCharacters;

import net.tfminecraft.rpcharacters.Cache;

import net.tfminecraft.rpcharacters.loaders.StageLoader;

Expand Down Expand Up @@ -828,12 +827,6 @@ public void finish() {

character.update();

if (Cache.devCharacters) {

character.setDev(true);

}

pd.addCharacter(character);

net.tfminecraft.rpcharacters.lifecycle.CharacterLifecycle.fireCreated(p, pd.getUniqueId(), character);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -702,9 +702,6 @@ private void loadPersonaFields(RPCharacter character, JSONObject characterJson)
if (characterJson.containsKey("hidden")) {
character.setHidden(Boolean.parseBoolean(characterJson.get("hidden").toString()));
}
if (characterJson.containsKey("dev")) {
character.setDev(Boolean.parseBoolean(characterJson.get("dev").toString()));
}
if (characterJson.containsKey("kit-statuses")) {
Object raw = characterJson.get("kit-statuses");
if (raw instanceof JSONObject statuses) {
Expand Down Expand Up @@ -807,9 +804,6 @@ private void savePersonaFields(HashMap<String, Object> defaults, RPCharacter cha
if (character.isHidden()) {
defaults.put("hidden", "true");
}
if (character.isDev()) {
defaults.put("dev", "true");
}
if (!character.getKitStatuses().isEmpty()) {
JSONObject statuses = new JSONObject();
for (var entry : character.getKitStatuses().entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;

import net.tfminecraft.rpcharacters.Cache;
import net.tfminecraft.rpcharacters.RPCharacters;
import net.tfminecraft.rpcharacters.api.ProvinceSystemClient;
import net.tfminecraft.rpcharacters.calendar.AgeCalculator;
Expand Down Expand Up @@ -53,7 +52,7 @@ private CharacterIngestService() {}
* Pull if the 15s cooldown has elapsed. Used by join, reload, and the timer.
*/
public static void tryPullAsync(JavaPlugin plugin) {
if (plugin == null || Cache.devCharacters) {
if (plugin == null) {
return;
}
long now = System.currentTimeMillis();
Expand All @@ -74,12 +73,6 @@ public static void forcePullAsync(JavaPlugin plugin) {
if (plugin == null) {
return;
}
if (Cache.devCharacters) {
plugin.getLogger().warning(
"[character-ingest] skipped: dev-characters is on, website characters are not synced"
);
return;
}
lastPullAtMs.set(System.currentTimeMillis());
pullAsync(plugin);
}
Expand All @@ -89,7 +82,7 @@ public static void forcePullAsync(JavaPlugin plugin) {
* (or immediately if the pull is skipped).
*/
public static void tryPullForPlayerAsync(JavaPlugin plugin, UUID playerUuid) {
if (plugin == null || playerUuid == null || Cache.devCharacters) {
if (plugin == null || playerUuid == null) {
return;
}
long now = System.currentTimeMillis();
Expand Down Expand Up @@ -127,7 +120,7 @@ public static void stopPeriodicPull() {
}

public static void pullAsync(JavaPlugin plugin) {
if (plugin == null || Cache.devCharacters) {
if (plugin == null) {
return;
}
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
Expand All @@ -153,7 +146,7 @@ public static void pullAsync(JavaPlugin plugin) {
}

public static void pullForPlayerAsync(JavaPlugin plugin, UUID playerUuid) {
if (plugin == null || playerUuid == null || Cache.devCharacters) {
if (plugin == null || playerUuid == null) {
return;
}
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;

import net.tfminecraft.rpcharacters.Cache;
import net.tfminecraft.rpcharacters.RPCharacters;
import net.tfminecraft.rpcharacters.api.ProvinceSystemClient;
import net.tfminecraft.rpcharacters.database.Database;
Expand Down Expand Up @@ -43,7 +42,7 @@ public static void pullAsync(JavaPlugin plugin) {
* Safe to call from {@link CharacterIngestService} after creates pull.
*/
public static void pullNow(JavaPlugin plugin) {
if (plugin == null || Cache.devCharacters) {
if (plugin == null) {
return;
}
ProvinceSystemClient.SimpleResult pending =
Expand Down Expand Up @@ -83,7 +82,7 @@ public static List<JSONObject> applyReadyForCharacterOnMain(
RPCharacter character,
List<JSONObject> all
) {
if (player == null || character == null || Cache.devCharacters) {
if (player == null || character == null) {
return List.of();
}
String characterId = character.getId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ public final class RosterSyncService {
private RosterSyncService() {}

public static void pushRosterAsync(UUID playerUuid) {
if (playerUuid == null || RPCharacters.plugin == null || Cache.devCharacters) {
if (playerUuid == null || RPCharacters.plugin == null) {
return;
}
Bukkit.getScheduler().runTaskAsynchronously(RPCharacters.plugin, () -> pushRosterNow(playerUuid));
}

public static void pushRosterForPlayer(Player player) {
if (player == null || Cache.devCharacters) {
if (player == null) {
return;
}
pushRosterAsync(player.getUniqueId());
}

/** Push roster for every online player (e.g. after {@code /rpcharacter reload}). */
public static void pushAllOnlineAsync() {
if (RPCharacters.plugin == null || Cache.devCharacters) {
if (RPCharacters.plugin == null) {
return;
}
for (Player player : Bukkit.getOnlinePlayers()) {
Expand All @@ -68,7 +68,7 @@ public static void pushAllOnlineAsync() {

@SuppressWarnings("unchecked")
public static void pushRosterNow(UUID playerUuid) {
if (playerUuid == null || Cache.devCharacters) {
if (playerUuid == null) {
return;
}
PlayerData pd = null;
Expand Down Expand Up @@ -104,7 +104,7 @@ public static void pushRosterNow(UUID playerUuid) {
root.put("player_uuid", playerUuid.toString());
JSONArray characters = new JSONArray();
for (RPCharacter c : pd.getCharacters()) {
if (c == null || c.getId() == null || c.isDev()) {
if (c == null || c.getId() == null) {
continue;
}
JSONObject row = new JSONObject();
Expand Down
35 changes: 16 additions & 19 deletions src/main/java/net/tfminecraft/rpcharacters/kit/KitService.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.json.simple.JSONObject;

import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.rpcharacters.Cache;
import net.tfminecraft.rpcharacters.loaders.KitLoader;
import net.tfminecraft.rpcharacters.managers.PlayerManager;
import net.tfminecraft.rpcharacters.objects.PlayerData;
Expand Down Expand Up @@ -148,27 +147,25 @@ public static void tryClaim(Player player, String kitIdRaw) {
}

List<JSONObject> pendingItems = List.of();
if (!Cache.devCharacters) {
ProvinceSystemClient.SimpleResult pending =
ProvinceSystemClient.fetchPendingLoreItems();
if (!pending.ok) {
RPCharacters.plugin.getLogger().warning(
"[kit-customise] claim-pull failed: " + pending.error
ProvinceSystemClient.SimpleResult pending =
ProvinceSystemClient.fetchPendingLoreItems();
if (!pending.ok) {
RPCharacters.plugin.getLogger().warning(
"[kit-customise] claim-pull failed: " + pending.error
);
} else {
String body = pending.body != null ? pending.body : "";
if (body.isBlank()) {
RPCharacters.plugin.getLogger().info(
"[kit-customise] claim-pull empty body char=" + characterId
+ " uuid=" + playerId
);
} else {
String body = pending.body != null ? pending.body : "";
if (body.isBlank()) {
RPCharacters.plugin.getLogger().info(
"[kit-customise] claim-pull empty body char=" + characterId
+ " uuid=" + playerId
);
} else {
RPCharacters.plugin.getLogger().info(
"[kit-customise] claim-pull body=" + body
);
}
pendingItems = ProvinceSystemClient.parsePendingLoreItems(pending.body);
RPCharacters.plugin.getLogger().info(
"[kit-customise] claim-pull body=" + body
);
}
pendingItems = ProvinceSystemClient.parsePendingLoreItems(pending.body);
}

List<JSONObject> itemsForMain = pendingItems;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public void load(File configFile) {
Cache.backgroundTraitTypes = config.getStringList("background-trait-types");
Cache.continent = config.getString("continent", "Cerrith");
Cache.requireCharacter = config.getBoolean("require-character", false);
Cache.devCharacters = config.getBoolean("dev-characters", false);
Cache.noCharacterFreeze = config.getBoolean("no-character-freeze", true);
Cache.lackingCluesFreeze = config.getBoolean("lacking-clues-freeze", true);
Cache.excessCharactersFreeze = config.getBoolean("excess-characters-freeze", true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
RPTexts.send(sender, RPTexts.ERROR + "Usage: /rpcharacter pending sync");
return true;
}
if (Cache.devCharacters) {
RPTexts.send(sender, RPTexts.ERROR + "Website character sync is off while "
+ RPTexts.WARN + "dev-characters" + RPTexts.ERROR + " is enabled.");
return true;
}
RPTexts.send(sender, RPTexts.COMMAND + "Pulling pending web character creates…");
net.tfminecraft.rpcharacters.ingest.CharacterIngestService.forcePullAsync(RPCharacters.plugin);
RPTexts.send(sender, RPTexts.SUCCESS + "Pending sync started (see console for results).");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ public class RPCharacter {
private String slug;
private boolean hidden;
private boolean mailListed = true;
/** Throwaway character made in-game while dev-characters is on. */
private boolean dev;
/** Per grant-kit id. Empty/missing kit = legacy never claim for that kit. */
private final Map<String, net.tfminecraft.rpcharacters.kit.KitStatus> kitStatuses =
new HashMap<>();
Expand Down Expand Up @@ -555,14 +553,6 @@ public void setHidden(boolean hidden) {
this.hidden = hidden;
}

public boolean isDev() {
return dev;
}

public void setDev(boolean dev) {
this.dev = dev;
}

public Map<String, net.tfminecraft.rpcharacters.kit.KitStatus> getKitStatuses() {
return kitStatuses;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String labe
return filter(List.of("sync"), args[1]);
}
if (args[0].equalsIgnoreCase("wipe") && Permissions.isAdmin(sender)) {
return filter(List.of("website", "tagged"), args[1]);
return filter(List.of("website"), args[1]);
}
if (args[0].equalsIgnoreCase("stage") && Permissions.isAdmin(sender)) {
return filter(List.of("preview"), args[1]);
Expand Down Expand Up @@ -193,7 +193,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String labe
}
}
} else if (args[0].equalsIgnoreCase("wipe") && Permissions.isAdmin(sender)
&& (args[1].equalsIgnoreCase("website") || args[1].equalsIgnoreCase("tagged"))) {
&& args[1].equalsIgnoreCase("website")) {
completions.add("confirm");
} else if (args[0].equalsIgnoreCase("discordgate") && Permissions.isAdmin(sender)) {
completions.add("on");
Expand Down
Loading
Loading