From 43a0b89f898a861e611546af8adf52bdb0ff7428 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Tue, 20 Feb 2024 15:56:42 +0000 Subject: [PATCH] Remove unused legacy config helpers --- .../0004-Sakura-Configuration-Files.patch | 67 ------------------- 1 file changed, 67 deletions(-) diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0004-Sakura-Configuration-Files.patch index c648cb0..bed4dbe 100644 --- a/patches/server/0004-Sakura-Configuration-Files.patch +++ b/patches/server/0004-Sakura-Configuration-Files.patch @@ -801,73 +801,6 @@ index 0000000000000000000000000000000000000000..4024f9738e039ffffd560a07a2210f75 +@ConfigSerializable +public record DurableMaterial(int durability, float resistance) { +} -diff --git a/src/main/java/me/samsuik/sakura/utils/VariousHelpers.java b/src/main/java/me/samsuik/sakura/utils/VariousHelpers.java -new file mode 100644 -index 0000000000000000000000000000000000000000..141b15887ca075fef5d36ff15125b3e071049917 ---- /dev/null -+++ b/src/main/java/me/samsuik/sakura/utils/VariousHelpers.java -@@ -0,0 +1,61 @@ -+package me.samsuik.sakura.utils; -+ -+import net.minecraft.core.Registry; -+import net.minecraft.core.registries.BuiltInRegistries; -+import net.minecraft.world.entity.EntityType; -+ -+import java.util.List; -+import java.util.regex.Pattern; -+import org.apache.commons.lang.StringUtils; -+ -+public class VariousHelpers { -+ -+ public static List> getEntityTypes(String from) { -+ Pattern pattern = VariousHelpers.wildcardPattern(from); -+ -+ return BuiltInRegistries.ENTITY_TYPE.stream() -+ .filter((type) -> pattern.matcher(type.getDescriptionId()).find() -+ || pattern.matcher(type.getCategory().getName()).find()) -+ .toList(); -+ } -+ -+ public static Pattern wildcardPattern(String string) { -+ String included = string.replaceAll("\\*{2}", ".*?"); -+ return Pattern.compile("^(%s)$".formatted(included)); -+ } -+ -+ public static String capitalise(String string) { -+ StringBuilder builder = new StringBuilder(string.length()); -+ boolean capitalise = true; -+ -+ for (char character : string.toCharArray()) { -+ if (!Character.isAlphabetic(character)) { -+ capitalise = true; -+ } else if (capitalise) { -+ character = Character.toUpperCase(character); -+ capitalise = false; -+ } -+ -+ builder.append(character); -+ } -+ -+ return builder.toString(); -+ } -+ -+ public static int sequential(String of, String provided) { -+ for (int i = 0; i < of.length() && i < provided.length(); ++i) { -+ if (provided.charAt(i) != of.charAt(i)) { -+ return i; -+ } -+ } -+ -+ return Math.min(of.length(), provided.length()); -+ } -+ -+ public static double similarity(String a, String b) { -+ double distance = StringUtils.getLevenshteinDistance(a, b); -+ int highest = Math.max(a.length(), b.length()); -+ return 1 - (distance / highest); -+ } -+ -+} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index d52e24f1d5073c7b534a7dd571f6f0128ca6280e..d0789c1e01255017e8a54e8b2e80f4c4dcf3dba4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java