mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-26 08:59:49 +08:00
Merge unstable into development (#2173)
* Remove more scene synchronized
* Fix worktop options not appearing
* Format code [skip actions]
* Fix delay with server tasks
* Format code [skip actions]
* Fully fix fairy clock (#2146)
* Fix scene transition
* fully fix fairy clock
* Re-add call to `Player#updatePlayerGameTime`
* Format code [skip actions]
* Initialize the script loader in `ResourceLoader#loadAll`
* Fix region removal checking
* Format code [skip actions]
* Use Lombok's `EqualsAndHashCode` for comparing scene regions
* Format code [skip actions]
* Move 'invalid gather object' to `trace`
* Add more information to the 'unknown condition handler' message
* Move invalid ability action to trace
* Make `KcpTunnel` public
* Validate the NPC being talked to
* Format code [skip actions]
* NPCs are not spawned server side; change logic to handle it
* Format code [skip actions]
* unload scene when there are no players (#2147)
* unload scene when there are no players
* Update src/main/java/emu/grasscutter/game/world/Scene.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Check if a command should be copied or HTTP should be used
* Lint Code [skip actions]
* Fix character names rendering incorrectly
* Add basic troubleshooting command
* Implement handbook teleporting
also a few formatting changes and sort data by logical sense
* Fix listener `ConcurrentModificationException` issue
* Add color change to `Join the Community!`
* Lint Code [skip actions]
* Make clickable buttons appear clickable
* Remove 'Mechanicus' entities from the list of entities
* Format code [skip actions]
* Fix going back returning a blank screen
* Implement entity spawning
* Add setting level to entity card
* Add support for 'plain text' mode
* Make descriptions of objects scrollable
* Lint Code [skip actions]
* Format code [skip actions]
* Change the way existing hooks work
* Format code [skip actions]
* Upgrade Javalin to 5.5.0 & Fix project warnings
* Upgrade logging libraries
* Fix gacha mappings static file issue
* Add temporary backwards compatability for `ServerHelper`
* Format code [skip actions]
* Remove artifact signatures from VCS
* Fix forge queue data protocol definition
* Run `spotlessApply`
* Format code [skip actions]
* Download data required for building artifacts
* Add call for Facebook logins
* Add the wiki page as a submodule
* Format code [skip actions]
* Update translation (#2150)
* Update translation
* Update translation
* Separate the dispatch and game servers (pt. 1)
gacha is still broken, handbook still needs to be done
* Format code [skip actions]
* Separate the dispatch and game servers (pt. 2)
this commit fixes the gacha page
* Add description for '/troubleshoot'
* Set default avatar talent level to 10
* Separate the dispatch and game servers (pt. 3)
implement handbook across servers!
* Format code [skip actions]
* Update GitHub Actions to use 'download-file' over 'wget'
* Gm handbook lmao (#2149)
* Fix font issue
* Fix avatars
* Fix text overflow in commands
* Fix virtualized lists and items page 😭😭
* magix why 💀
* use hover style in all minicards
* button
* remove console.log
* lint
* Add icons
* magix asked
* Fix overflow padding issue
* Fix achievement text overflow
* remove icons from repo
* Change command icon
* Add the wiki page as a submodule
* total magix moment
* fix text overflow in commands
* Fix discord button
* Make text scale on Minicard
* import icons and font from another source
* Add hover effects to siebar buttons
* move font and readme to submodule repo
* Make data folder a submodule
* import icons and font from data submodule
* Update README.md
* total magix moment
* magix moment v2
* submodule change
* Import `.webp` files
* Resize `HomeButton`
* Fix 'Copy Command' reappearing after changing pages
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
* Lint Code [skip actions]
* Download data for the build, not for the lint
* format imports
this is really just to see if build handbook works kek
* Implement proper handbook authentication (pt. 1)
* Implement proper handbook authentication (pt. 2)
* Format code [skip actions]
* Add quest data dumping for the handbook
* Change colors to fit _something suitable_
* Format code [skip actions]
* Fix force pushing to branches after linting
* Fix logic of `SetPlayerPropReq`
* Move more group loading to `trace`
* Add handbook IP authentication in hybrid mode
* Fix player level up not displaying on the client properly
* Format code [skip actions]
* Fix game time locking
* Format code [skip actions]
* Update player properties
* Format code [skip actions]
* Move `warn`s for groups to `debug`
* Fix player pausing
* Move more logs to `trace`
* Use `removeItemById` for deleting items via quests
* Clean up logger more
* Pause in-game time when the world is paused
* Format code [skip actions]
* More player property documentation
* Multi-threaded resource loading
* Format code [skip actions]
* Add quest widgets
* Add quests page (basic impl.)
* Add/fix colors
also fix tailwind
* Remove banned packets
client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted
* Re-add `BeginCameraSceneLookNotify`
* Fix being unable to attack (#2157)
* Add `PlayerOpenChestEvent`
* Add methods to get players from the server
* Add static methods to register an event handler
* Add `PlayerEnterDungeonEvent`
* Remove legacy documentation from `PlayerMoveEvent`
* Add `PlayerChatEvent`
* Add defaults to `Position`
* Clean up `.utils`
* Revert `Multi-threaded resource loading`
* Fix changing target UID when talking to the server
* Lint Code [skip actions]
* Format code [skip actions]
* fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
* Format code [skip actions]
* Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows
* Go ahead and move it before the return before Magix tells me to.
* Format code [skip actions]
* Bring back period lol (#2160)
* Disable SNI for the HTTPS server
* Add `EntityCreationEvent`
* Add initial startup message
this is so the server appears like its preparing to start
* Format code [skip actions]
* Enable debug mode for plugin loggers if enabled for the primary logger
* Add documentation about `WorldAreaConfigData`
* Make more fields in excels accessible
* Remove deprecated fields from `GetShopRsp`
* Run `spotlessApply` on definitions
* Add `PlayerEnterAreaEvent`
* Optimize event calls
* Fix event invokes
* Format code [skip actions]
* Remove manual autofinish for main quests. (#2162)
* Add world areas to the textmap cache
* Format code [skip actions]
* Don't overdefine variables in extended classes (#2163)
* Add dumper for world areas
* Format code [skip actions]
* instantiate personalLineList (#2165)
* Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
* Fix the background color leaking from the character widget
* Change HTML spacing to 2 spaces
* Implement hiding widgets
* Change scrollbar to a vibrant color
* Add _some_ scaling to the home buttons and its text
* Build the handbook with Gradle
* Fix the 'finer details' with the handbook UI
* Lint Code [skip actions]
* Fix target destination for the Gradle-built handbook
* Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
* Fix GitHub actions
* Fix event calling & canceling
* Run `spotlessApply`
* Rename fields (might be wrong)
* Add/update all/more protocol definitions
* Add/update all/more protocol definitions
* Remove outdated packet
* Fix protocol definitions
* Format code [skip actions]
* Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam
* Add GetHostQuestState
This fixes some chapter 3 stuff.
* Format code [skip actions]
* Fix merge import
* Format code [skip actions]
* Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time
* Make it so relogging keeps the time lock state.
* Refactor out questLockTime
* Per Hartie, the client packet needs to be changed too
* Update src/main/java/emu/grasscutter/game/world/World.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
* Remove all code not needed to get clock working
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Implement a proper ability system (#2166)
* Apply fix `21dec2fe`
* Apply fix `89d01d5f`
* Apply fix `d900f154`
this one was already implemented; updated to use call from previous commit
* Ability changing commit
TODO: change info to debug
* Remove use of deprecated methods/fields
* Temp commit v2
(Adding LoseHP and some fixes)
* Oopsie
* Probably fix monster battle
* Fix issue with reflecting into fields
* Fix some things
* Fix ability names for 3.6 resources
* Improve logging
---------
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
* Format code [skip actions]
* Add system for sending messages between servers
* Format some code
* Remove protocol definitions from Spotless
* Default debug to false; enable with `-debug`
* Implement completely useless global value copying
* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
* Add properties to `AbilityModifier`
* Change the way HTML is served after authentication
* Use thread executors to speed up the database loading process
* Format code [skip actions]
* Add system for setting handbook address and port
* Lint Code [skip actions]
* Format code [skip actions]
* Fix game-related data not saving
* Format code [skip actions]
* Fix handbook server details
* Lint Code [skip actions]
* Format code [skip actions]
* Use the headers provided by a context to get the IP address
should acknowledge #1975
* Format code [skip actions]
* Move more logs to `trace`
* Format code [skip actions]
* more trace
* Fix something and implement weapon entities
* Format code [skip actions]
* Fix `EntityWeapon`
* Remove deprecated API & Fix resource checking
* Fix unnecessary warning for first-time setup
* Implement handbook request limiting
* Format code [skip actions]
* Fix new avatar weapons being null
* Format code [skip actions]
* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
* Load activity config on server startup
* Require plugins to specify an API version and match with the server
* Add default open state ignore list
* Format code [skip actions]
* Quick fix for questing, needs more investigation
This would make the questing work again
* Remove existing hack for 35303
* Fix ignored open states from being set
* Format code [skip actions]
* fix the stupidest bug ive ever seen
* Optimize player kicking on server close
* Format code [skip actions]
* Re-add hack to fix 35303
* Update GitHub actions
* Format code [skip actions]
* Potentially fix issues with regions
* Download additional handbook data
* Revert "Potentially fix issues with regions"
This reverts commit 84e3823695.
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import emu.grasscutter.server.event.Event;
|
||||
|
||||
public interface EventConsumer<T extends Event> {
|
||||
void consume(T event);
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import com.google.gson.JsonNull;
|
||||
import com.google.gson.JsonObject;
|
||||
import emu.grasscutter.server.dispatch.IDispatcher;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
|
||||
public interface FieldFetch {
|
||||
/**
|
||||
* Fetches the specified fields. Serializes them into a JSON object.
|
||||
*
|
||||
* @param fields The fields to fetch.
|
||||
* @return The JSON object containing the fields.
|
||||
*/
|
||||
default JsonObject fetchFields(String... fields) {
|
||||
// Prepare field properties.
|
||||
var fieldValues = new JsonObject();
|
||||
var fieldMap = new HashMap<String, Field>();
|
||||
Arrays.stream(this.getClass().getDeclaredFields())
|
||||
.forEach(field -> fieldMap.put(field.getName(), field));
|
||||
|
||||
// Find the values of all requested fields.
|
||||
for (var fieldName : fields) {
|
||||
try {
|
||||
var field = fieldMap.get(fieldName);
|
||||
if (field == null) fieldValues.add(fieldName, JsonNull.INSTANCE);
|
||||
else {
|
||||
var wasAccessible = field.canAccess(this);
|
||||
field.setAccessible(true);
|
||||
fieldValues.add(fieldName, IDispatcher.JSON.toJsonTree(field.get(this)));
|
||||
field.setAccessible(wasAccessible);
|
||||
}
|
||||
} catch (Exception exception) {
|
||||
exception.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
return fieldValues;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
/** HTTP request object for handbook controls. */
|
||||
@SuppressWarnings("FieldMayBeFinal")
|
||||
public interface HandbookBody {
|
||||
@Builder
|
||||
@Getter
|
||||
class Response {
|
||||
private int status;
|
||||
private String message;
|
||||
}
|
||||
|
||||
enum Action {
|
||||
GRANT_AVATAR,
|
||||
GIVE_ITEM,
|
||||
TELEPORT_TO,
|
||||
SPAWN_ENTITY
|
||||
}
|
||||
|
||||
@Getter
|
||||
class GrantAvatar {
|
||||
private String player; // Parse into online player ID.
|
||||
private String playerToken; // Parse into session token.
|
||||
private String avatar; // Parse into avatar ID.
|
||||
|
||||
private int level = 90; // Range between 1 - 90.
|
||||
private int constellations = 6; // Range between 0 - 6.
|
||||
private int talentLevels = 10; // Range between 1 - 15.
|
||||
}
|
||||
|
||||
@Getter
|
||||
class GiveItem {
|
||||
private String player; // Parse into online player ID.
|
||||
private String playerToken; // Parse into session token.
|
||||
private String item; // Parse into item ID.
|
||||
|
||||
private long amount = 1; // Range between 1 - Long.MAX_VALUE.
|
||||
}
|
||||
|
||||
@Getter
|
||||
class TeleportTo {
|
||||
private String player; // Parse into online player ID.
|
||||
private String playerToken; // Parse into session token.
|
||||
private String scene; // Parse into a scene ID.
|
||||
}
|
||||
|
||||
@Getter
|
||||
class SpawnEntity {
|
||||
private String player; // Parse into online player ID.
|
||||
private String playerToken; // Parse into session token.
|
||||
private String entity; // Parse into entity ID.
|
||||
|
||||
private long amount = 1; // Range between 1 - Long.MAX_VALUE.
|
||||
private int level = 1; // Range between 1 - 200.
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.ConsoleAppender;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import java.util.Arrays;
|
||||
|
||||
public final class JLineLogbackAppender extends ConsoleAppender<ILoggingEvent> {
|
||||
@Override
|
||||
protected void append(ILoggingEvent eventObject) {
|
||||
if (!this.started) return;
|
||||
|
||||
Arrays.stream(new String(encoder.encode(eventObject)).split("\n\r"))
|
||||
.forEach(Grasscutter.getConsole()::printAbove);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import emu.grasscutter.utils.JsonUtils;
|
||||
import java.io.IOException;
|
||||
|
||||
/* Replica of JsonObject. Includes chaining. */
|
||||
public final class JObject {
|
||||
/* Type adapter for gson. */
|
||||
public static class Adapter extends TypeAdapter<JObject> {
|
||||
@Override
|
||||
public void write(JsonWriter out, JObject value) throws IOException {
|
||||
out.beginObject();
|
||||
for (var entry : value.members.entrySet()) {
|
||||
out.name(entry.getKey());
|
||||
out.jsonValue(entry.getValue().toString());
|
||||
}
|
||||
out.endObject();
|
||||
}
|
||||
|
||||
@Override
|
||||
public JObject read(JsonReader in) throws IOException {
|
||||
var object = JObject.c();
|
||||
in.beginObject();
|
||||
while (in.hasNext()) {
|
||||
object.add(in.nextName(), JsonParser.parseReader(in));
|
||||
}
|
||||
in.endObject();
|
||||
return object;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new empty object.
|
||||
*
|
||||
* @return The new object.
|
||||
*/
|
||||
public static JObject c() {
|
||||
return new JObject();
|
||||
}
|
||||
|
||||
private final LinkedTreeMap<String, JsonElement> members = new LinkedTreeMap<>();
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, JsonElement value) {
|
||||
this.members.put(name, value);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, String value) {
|
||||
return this.add(name, value == null ? JsonNull.INSTANCE : new JsonPrimitive(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, Number value) {
|
||||
return this.add(name, value == null ? JsonNull.INSTANCE : new JsonPrimitive(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, Boolean value) {
|
||||
return this.add(name, value == null ? JsonNull.INSTANCE : new JsonPrimitive(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, Character value) {
|
||||
return this.add(name, value == null ? JsonNull.INSTANCE : new JsonPrimitive(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a member to this object.
|
||||
*
|
||||
* @param name The name of the member.
|
||||
* @param value The value of the member.
|
||||
* @return This object.
|
||||
*/
|
||||
public JObject add(String name, Object[] value) {
|
||||
return this.add(name, value == null ? JsonNull.INSTANCE : JsonUtils.toJson(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return A {@link JsonObject} representation of this object.
|
||||
*/
|
||||
public JsonObject gson() {
|
||||
var object = new JsonObject();
|
||||
for (var entry : this.members.entrySet()) {
|
||||
object.add(entry.getKey(), entry.getValue());
|
||||
}
|
||||
return object;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The property holder.
|
||||
*/
|
||||
public Object json() {
|
||||
return this.members;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return A string representation of this object.
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
return JsonUtils.encode(this.gson());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Stack;
|
||||
|
||||
public class KahnsSort {
|
||||
public static class Node {
|
||||
int source, dest; // Dest is a value, and source too
|
||||
|
||||
public Node(int source, int dest) {
|
||||
this.source = source;
|
||||
this.dest = dest;
|
||||
}
|
||||
}
|
||||
|
||||
public static class Graph {
|
||||
Map<Integer, List<Integer>> mainList;
|
||||
Map<Integer, Integer> degreeList;
|
||||
|
||||
List<Integer> nodeList;
|
||||
|
||||
public Graph(List<Node> nodes, List<Integer> nodeList) {
|
||||
mainList = new HashMap<>();
|
||||
this.nodeList = nodeList;
|
||||
|
||||
for (int i = 0; i < nodeList.size(); i++) mainList.put(nodeList.get(i), new ArrayList<>());
|
||||
|
||||
degreeList = new HashMap<>();
|
||||
for (int i = 0; i < nodeList.size(); i++) degreeList.put(nodeList.get(i), 0);
|
||||
|
||||
for (Node node : nodes) {
|
||||
mainList.get(node.source).add(node.dest);
|
||||
degreeList.replace(node.dest, degreeList.get(node.dest) + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static List<Integer> doSort(Graph graph) {
|
||||
List<Integer> orderedList = new ArrayList<>();
|
||||
Map<Integer, Integer> degreeList = graph.degreeList;
|
||||
|
||||
Stack<Integer> zeroStack = new Stack<>();
|
||||
degreeList.forEach(
|
||||
(key, value) -> {
|
||||
if (value == 0) zeroStack.add(key);
|
||||
});
|
||||
|
||||
while (!zeroStack.isEmpty()) {
|
||||
int element = zeroStack.pop();
|
||||
|
||||
// If the list is empty then this node
|
||||
if (!graph.mainList.get(element).isEmpty()) orderedList.add(element);
|
||||
for (int topElement : graph.mainList.get(element)) {
|
||||
degreeList.replace(topElement, degreeList.get(topElement) - 1);
|
||||
|
||||
if (degreeList.get(topElement) == 0) zeroStack.add(topElement);
|
||||
}
|
||||
}
|
||||
|
||||
if (degreeList.values().stream().filter(value -> value != 0).count() != 0)
|
||||
return null; // Loop found
|
||||
|
||||
return orderedList;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
public interface Returnable<T> {
|
||||
/**
|
||||
* @return The value.
|
||||
*/
|
||||
T invoke();
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.AppenderBase;
|
||||
import ch.qos.logback.core.encoder.Encoder;
|
||||
import emu.grasscutter.server.event.internal.ServerLogEvent;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public final class ServerLogEventAppender<E> extends AppenderBase<E> {
|
||||
protected Encoder<E> encoder;
|
||||
|
||||
@Override
|
||||
protected void append(E event) {
|
||||
byte[] byteArray = this.encoder.encode(event);
|
||||
ServerLogEvent sle =
|
||||
new ServerLogEvent((ILoggingEvent) event, new String(byteArray, StandardCharsets.UTF_8));
|
||||
sle.call();
|
||||
}
|
||||
|
||||
public Encoder<E> getEncoder() {
|
||||
return this.encoder;
|
||||
}
|
||||
|
||||
public void setEncoder(Encoder<E> encoder) {
|
||||
this.encoder = encoder;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
public final class SparseSet {
|
||||
private final List<Range> rangeEntries;
|
||||
private final Set<Integer> denseEntries;
|
||||
|
||||
public SparseSet(String csv) {
|
||||
this.rangeEntries = new ArrayList<>();
|
||||
this.denseEntries = new TreeSet<>();
|
||||
|
||||
for (String token : csv.replace("\n", "").replace(" ", "").split(",")) {
|
||||
String[] tokens = token.split("-");
|
||||
switch (tokens.length) {
|
||||
case 1:
|
||||
this.denseEntries.add(Integer.parseInt(tokens[0]));
|
||||
break;
|
||||
case 2:
|
||||
this.rangeEntries.add(
|
||||
new Range(Integer.parseInt(tokens[0]), Integer.parseInt(tokens[1])));
|
||||
break;
|
||||
default:
|
||||
throw new IllegalArgumentException(
|
||||
"Invalid token passed to SparseSet initializer - "
|
||||
+ token
|
||||
+ " (split length "
|
||||
+ tokens.length
|
||||
+ ")");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean contains(int i) {
|
||||
for (Range range : this.rangeEntries) {
|
||||
if (range.check(i)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return this.denseEntries.contains(i);
|
||||
}
|
||||
|
||||
/*
|
||||
* A convenience class for constructing integer sets out of large ranges
|
||||
* Designed to be fed literal strings from this project only -
|
||||
* can and will throw exceptions to tell you to fix your code if you feed it garbage. :)
|
||||
*/
|
||||
private static class Range {
|
||||
private final int min, max;
|
||||
|
||||
public Range(int min, int max) {
|
||||
if (min > max) {
|
||||
throw new IllegalArgumentException(
|
||||
"Range passed minimum higher than maximum - " + min + " > " + max);
|
||||
}
|
||||
this.min = min;
|
||||
this.max = max;
|
||||
}
|
||||
|
||||
public boolean check(int value) {
|
||||
return value >= this.min && value <= this.max;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package emu.grasscutter.utils.objects;
|
||||
|
||||
import java.util.NavigableMap;
|
||||
import java.util.TreeMap;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class WeightedList<E> {
|
||||
private final NavigableMap<Double, E> map = new TreeMap<Double, E>();
|
||||
private double total = 0;
|
||||
|
||||
public WeightedList() {}
|
||||
|
||||
public WeightedList<E> add(double weight, E result) {
|
||||
if (weight <= 0) return this;
|
||||
total += weight;
|
||||
map.put(total, result);
|
||||
return this;
|
||||
}
|
||||
|
||||
public E next() {
|
||||
double value = ThreadLocalRandom.current().nextDouble() * total;
|
||||
return map.higherEntry(value).getValue();
|
||||
}
|
||||
|
||||
public int size() {
|
||||
return map.size();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,234 @@
|
||||
package emu.grasscutter.utils.objects.text;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
/* Text style container. */
|
||||
@Builder
|
||||
@Data
|
||||
public final class Style {
|
||||
private static final Map<Character, String> unity = new HashMap<>();
|
||||
private static final Map<Character, String> ansi = new HashMap<>();
|
||||
|
||||
static {
|
||||
// Add the Minecraft color codes to the color map.
|
||||
unity.put('0', "#000000"); // Black
|
||||
unity.put('1', "#0000AA"); // Dark Blue
|
||||
unity.put('2', "#00AA00"); // Dark Green
|
||||
unity.put('3', "#00AAAA"); // Dark Aqua
|
||||
unity.put('4', "#AA0000"); // Dark Red
|
||||
unity.put('5', "#AA00AA"); // Dark Purple
|
||||
unity.put('6', "#FFAA00"); // Gold
|
||||
unity.put('7', "#AAAAAA"); // Gray
|
||||
unity.put('8', "#555555"); // Dark Gray
|
||||
unity.put('9', "#5555FF"); // Blue
|
||||
unity.put('a', "#55FF55"); // Green
|
||||
unity.put('b', "#55FFFF"); // Aqua
|
||||
unity.put('c', "#FF5555"); // Red
|
||||
unity.put('d', "#FF55FF"); // Light Purple
|
||||
unity.put('e', "#FFFF55"); // Yellow
|
||||
unity.put('f', "#FFFFFF"); // White
|
||||
|
||||
ansi.put('0', "\u001B[30m"); // Black
|
||||
ansi.put('1', "\u001B[34m"); // Dark Blue
|
||||
ansi.put('2', "\u001B[32m"); // Dark Green
|
||||
ansi.put('3', "\u001B[36m"); // Dark Aqua
|
||||
ansi.put('4', "\u001B[31m"); // Dark Red
|
||||
ansi.put('5', "\u001B[35m"); // Dark Purple
|
||||
ansi.put('6', "\u001B[33m"); // Gold
|
||||
ansi.put('7', "\u001B[37m"); // Gray
|
||||
ansi.put('8', "\u001B[90m"); // Dark Gray
|
||||
ansi.put('9', "\u001B[94m"); // Blue
|
||||
ansi.put('a', "\u001B[92m"); // Green
|
||||
ansi.put('b', "\u001B[96m"); // Aqua
|
||||
ansi.put('c', "\u001B[91m"); // Red
|
||||
ansi.put('d', "\u001B[95m"); // Light Purple
|
||||
ansi.put('e', "\u001B[93m"); // Yellow
|
||||
ansi.put('f', "\u001B[97m"); // White
|
||||
}
|
||||
|
||||
@Builder.Default private int size = -1; // Unity only.
|
||||
@Builder.Default private boolean bold = false; // Unity only.
|
||||
@Builder.Default private boolean italic = false; // Unity only.
|
||||
|
||||
@Builder.Default private Color color = null;
|
||||
|
||||
/**
|
||||
* Replaces detected sequences of &color with the specified text.
|
||||
*
|
||||
* @param input The input text.
|
||||
* @return The replaced text.
|
||||
*/
|
||||
private String replaceUnity(String input) {
|
||||
// Thanks ChatGPT! (from ChatGPT)
|
||||
// Check if the input string is null or empty
|
||||
if (input == null || input.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
|
||||
var output = new StringBuilder();
|
||||
var i = 0;
|
||||
while (i < input.length()) {
|
||||
var c = input.charAt(i);
|
||||
if (c == '&') {
|
||||
// Check if the Minecraft color code is valid
|
||||
if (i + 1 < input.length() && unity.containsKey(input.charAt(i + 1))) {
|
||||
// Append the Unity color code
|
||||
output.append("<color=").append(unity.get(input.charAt(i + 1))).append(">");
|
||||
|
||||
// Move the index past the Minecraft color code
|
||||
i += 2;
|
||||
|
||||
// Find the end of the color code span
|
||||
var end = input.indexOf('&', i);
|
||||
if (end == -1) {
|
||||
end = input.length();
|
||||
}
|
||||
|
||||
// Append the text within the color code span
|
||||
output.append(input, i, end);
|
||||
|
||||
// Append the closing tag for the Unity color code
|
||||
output.append("</color>");
|
||||
|
||||
// Move the index to the end of the color code span
|
||||
i = end;
|
||||
} else {
|
||||
// Invalid Minecraft color code, treat it as regular text
|
||||
output.append(c);
|
||||
i++;
|
||||
}
|
||||
} else {
|
||||
// Append regular text
|
||||
output.append(c);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
return output.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces detected sequences of &color with the specified text.
|
||||
*
|
||||
* @param input The input text.
|
||||
* @return The replaced text.
|
||||
*/
|
||||
private String replaceTerminal(String input) {
|
||||
// Check if the input string is null or empty
|
||||
if (input == null || input.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
|
||||
var output = new StringBuilder();
|
||||
var i = 0;
|
||||
while (i < input.length()) {
|
||||
var c = input.charAt(i);
|
||||
if (c == '&') {
|
||||
// Check if the Minecraft color code is valid
|
||||
if (i + 1 < input.length() && ansi.containsKey(input.charAt(i + 1))) {
|
||||
// Append the ANSI escape code
|
||||
output.append(ansi.get(input.charAt(i + 1)));
|
||||
|
||||
// Move the index past the Minecraft color code
|
||||
i += 2;
|
||||
|
||||
// Find the end of the color code span
|
||||
var end = input.indexOf('&', i);
|
||||
if (end == -1) {
|
||||
end = input.length();
|
||||
}
|
||||
|
||||
// Append the text within the color code span
|
||||
output.append(input, i, end);
|
||||
|
||||
// Reset the color back to default
|
||||
output.append("\u001B[0m");
|
||||
|
||||
// Move the index to the end of the color code span
|
||||
i = end;
|
||||
} else {
|
||||
// Invalid Minecraft color code, treat it as regular text
|
||||
output.append(c);
|
||||
i++;
|
||||
}
|
||||
} else {
|
||||
// Append regular text
|
||||
output.append(c);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
return output.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Wraps the text in the style. Formatted for Unity clients.
|
||||
*
|
||||
* @param text The text to wrap.
|
||||
* @return The wrapped text.
|
||||
*/
|
||||
public String toUnity(String text) {
|
||||
var builder = new StringBuilder();
|
||||
|
||||
// Set the size.
|
||||
if (this.size != -1) {
|
||||
builder.append("<size=").append(this.size).append(">");
|
||||
}
|
||||
|
||||
// Set the color.
|
||||
if (this.color != null) {
|
||||
builder
|
||||
.append("<color=")
|
||||
.append(
|
||||
String.format(
|
||||
"#%02x%02x%02x",
|
||||
this.color.getRed(), this.color.getGreen(), this.color.getBlue()))
|
||||
.append(">");
|
||||
}
|
||||
|
||||
// Set the boldness.
|
||||
if (this.bold) builder.append("<b>");
|
||||
// Set the italicness.
|
||||
if (this.italic) builder.append("<i>");
|
||||
|
||||
// Append the text.
|
||||
builder.append(this.replaceUnity(text));
|
||||
|
||||
// Close the tags.
|
||||
if (this.italic) builder.append("</i>");
|
||||
if (this.bold) builder.append("</b>");
|
||||
if (this.color != null) builder.append("</color>");
|
||||
if (this.size != -1) builder.append("</size>");
|
||||
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Wraps the text in the style. Formatted for terminal clients.
|
||||
*
|
||||
* @param text The text to wrap.
|
||||
* @return The wrapped text.
|
||||
*/
|
||||
public String toTerminal(String text) {
|
||||
// Check for color.
|
||||
if (this.color == null) return this.replaceTerminal(text);
|
||||
|
||||
// Convert the color to an ANSI color.
|
||||
var ansiColor =
|
||||
this.color.getRed() > 127
|
||||
? this.color.getGreen() > 127
|
||||
? this.color.getBlue() > 127 ? 15 : 11
|
||||
: this.color.getBlue() > 127 ? 13 : 9
|
||||
: this.color.getGreen() > 127
|
||||
? this.color.getBlue() > 127 ? 14 : 10
|
||||
: this.color.getBlue() > 127 ? 12 : 8;
|
||||
|
||||
// Return the text with the ANSI color.
|
||||
// Reset the color at the end.
|
||||
return "\u001B[38;5;" + ansiColor + "m" + this.replaceTerminal(text) + "\u001B[0m";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package emu.grasscutter.utils.objects.text;
|
||||
|
||||
import java.awt.*;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/* An instance of text. */
|
||||
public final class Text {
|
||||
/**
|
||||
* Creates a new rich instance of text.
|
||||
*
|
||||
* @param text The text to use.
|
||||
* @return The new instance of text.
|
||||
*/
|
||||
public static Text of(String text) {
|
||||
return new Text(text, false);
|
||||
}
|
||||
|
||||
@Getter private final boolean raw;
|
||||
private final Style.StyleBuilder style = Style.builder();
|
||||
|
||||
@Setter private String text;
|
||||
|
||||
/**
|
||||
* Creates a new rich instance of text.
|
||||
*
|
||||
* @param text The text to use.
|
||||
*/
|
||||
public Text(String text) {
|
||||
this.raw = false;
|
||||
this.text = text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new instance of text.
|
||||
*
|
||||
* @param text The text to use.
|
||||
* @param raw Whether the text is raw.
|
||||
*/
|
||||
public Text(String text, boolean raw) {
|
||||
this.raw = raw;
|
||||
this.text = text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the size of the text.
|
||||
*
|
||||
* @param size The size of the text.
|
||||
* @return This object.
|
||||
*/
|
||||
public Text size(int size) {
|
||||
this.style.size(size);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the color of the text.
|
||||
*
|
||||
* @param color The color of the text.
|
||||
* @return This object.
|
||||
*/
|
||||
public Text color(Color color) {
|
||||
this.style.color(color);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the boldness of the text.
|
||||
*
|
||||
* @param bold Whether the text is bold.
|
||||
* @return This object.
|
||||
*/
|
||||
public Text bold(boolean bold) {
|
||||
this.style.bold(bold);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the italicness of the text.
|
||||
*
|
||||
* @param italic Whether the text is italic.
|
||||
* @return This object.
|
||||
*/
|
||||
public Text italic(boolean italic) {
|
||||
this.style.italic(italic);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts this object to a string. Converts to a console or Unity format.
|
||||
*
|
||||
* @param console Whether to convert the text for the console.
|
||||
* @return The converted string.
|
||||
*/
|
||||
public String toString(boolean console) {
|
||||
// Pull instances of style and text.
|
||||
var style = this.style.build();
|
||||
var text = this.text;
|
||||
|
||||
return console ? style.toTerminal(text) : style.toUnity(text);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user