From 0cc9f980737488894657b00fe65a23226cf505ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Mar 2024 15:29:18 -0500 Subject: [PATCH 01/13] Bump org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0 (#6332) --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index e5432e8214f..78b185aca4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' } rootProject.name = 'Skript' From d864baa7c979e5499c745bd89684de0e99979117 Mon Sep 17 00:00:00 2001 From: Shane Bee Date: Sat, 9 Mar 2024 12:37:53 -0800 Subject: [PATCH 02/13] EntityData - check if entity can spawn (#6484) --- .../ch/njol/skript/entity/EntityData.java | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/njol/skript/entity/EntityData.java b/src/main/java/ch/njol/skript/entity/EntityData.java index 435415b8c91..2b4fbd1947e 100644 --- a/src/main/java/ch/njol/skript/entity/EntityData.java +++ b/src/main/java/ch/njol/skript/entity/EntityData.java @@ -37,6 +37,7 @@ import org.bukkit.RegionAccessor; import org.bukkit.World; import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.eclipse.jdt.annotation.Nullable; @@ -94,6 +95,7 @@ public abstract class EntityData implements SyntaxElement, Ygg } catch (NoSuchMethodException | SecurityException ignored) { /* We already checked if the method exists */ } } + private static final boolean HAS_ENABLED_BY_FEATURE = Skript.methodExists(EntityType.class, "isEnabledByFeature", World.class); public final static String LANGUAGE_NODE = "entities"; public final static Message m_age_pattern = new Message(LANGUAGE_NODE + ".age pattern"); @@ -463,6 +465,25 @@ private E apply(E entity) { return entity; } + /** + * Check if this entity type can spawn. + *

Some entity types may be restricted by experimental datapacks.

+ * + * @param world World to check if entity can spawn in + * @return True if entity can spawn else false + */ + public boolean canSpawn(@Nullable World world) { + if (world == null) + return false; + if (HAS_ENABLED_BY_FEATURE) { + // Check if the entity can actually be spawned + // Some entity types may be restricted by experimental datapacks + EntityType bukkitEntityType = EntityUtils.toBukkitEntityType(this); + return bukkitEntityType.isEnabledByFeature(world); + } + return true; + } + /** * Spawn this entity data at a location. * @@ -476,7 +497,7 @@ public final E spawn(Location location) { /** * Spawn this entity data at a location. - * The consumer allows for modiciation to the entity before it actually gets spawned. + * The consumer allows for modification to the entity before it actually gets spawned. *

* Bukkit's own {@link org.bukkit.util.Consumer} is deprecated. * Use {@link #spawn(Location, Consumer)} @@ -494,7 +515,7 @@ public E spawn(Location location, org.bukkit.util.@Nullable Consumer consumer /** * Spawn this entity data at a location. - * The consumer allows for modiciation to the entity before it actually gets spawned. + * The consumer allows for modification to the entity before it actually gets spawned. * * @param location The {@link Location} to spawn the entity at. * @param consumer A {@link Consumer} to apply the entity changes to. @@ -503,10 +524,13 @@ public E spawn(Location location, org.bukkit.util.@Nullable Consumer consumer @Nullable public E spawn(Location location, @Nullable Consumer consumer) { assert location != null; + World world = location.getWorld(); + if (!canSpawn(world)) + return null; if (consumer != null) { return EntityData.spawn(location, getType(), e -> consumer.accept(this.apply(e))); } else { - return apply(location.getWorld().spawn(location, getType())); + return apply(world.spawn(location, getType())); } } From a44ed2fad68bd2618be040642e8a2273a3514cc5 Mon Sep 17 00:00:00 2001 From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:21:24 -0600 Subject: [PATCH 03/13] Fixes entitydata consumer on versions 1.20.1 and below. (#6475) * Fix entitydata consumer on 1.20.1 and older * Update aliases to master --------- Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> --- src/main/java/ch/njol/skript/entity/EntityData.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/njol/skript/entity/EntityData.java b/src/main/java/ch/njol/skript/entity/EntityData.java index 2b4fbd1947e..9cf1f427fd7 100644 --- a/src/main/java/ch/njol/skript/entity/EntityData.java +++ b/src/main/java/ch/njol/skript/entity/EntityData.java @@ -670,15 +670,18 @@ public void deserialize(final Fields fields) throws StreamCorruptedException, No protected boolean deserialize(final String s) { return false; } - + @SuppressWarnings({"unchecked", "deprecation"}) protected static @Nullable E spawn(Location location, Class type, Consumer consumer) { + World world = location.getWorld(); + if (world == null) + return null; try { if (WORLD_1_17_CONSUMER) { - return (@Nullable E) WORLD_1_17_CONSUMER_METHOD.invoke(location.getWorld(), location, type, + return (@Nullable E) WORLD_1_17_CONSUMER_METHOD.invoke(world, location, type, (org.bukkit.util.Consumer) consumer::accept); } else if (WORLD_1_13_CONSUMER) { - return (@Nullable E) WORLD_1_13_CONSUMER_METHOD.invoke(location.getWorld(), location, type, + return (@Nullable E) WORLD_1_13_CONSUMER_METHOD.invoke(world, location, type, (org.bukkit.util.Consumer) consumer::accept); } } catch (InvocationTargetException | IllegalAccessException e) { @@ -686,7 +689,7 @@ protected boolean deserialize(final String s) { Skript.exception(e, "Can't spawn " + type.getName()); return null; } - return location.getWorld().spawn(location, type, consumer); + return world.spawn(location, type, consumer); } - + } From 7a79d8733857c6dc66a7c3c3065fdc1622b8cf70 Mon Sep 17 00:00:00 2001 From: Shane Bee Date: Tue, 26 Mar 2024 14:54:37 -0700 Subject: [PATCH 04/13] Examples Update (#6510) * ExprAnvilText - fix docs * DefaultFunctions - better location examples --------- Co-authored-by: Moderocky --- .../skript/classes/data/DefaultFunctions.java | 26 ++++++++++++++++--- .../skript/expressions/ExprAnvilText.java | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java index 556f396b80b..e2c5392dd39 100644 --- a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java +++ b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java @@ -376,10 +376,28 @@ public Location[] execute(FunctionEvent e, Object[][] params) { } }.description("Creates a location from a world and 3 coordinates, with an optional yaw and pitch.", "If for whatever reason the world is not found, it will fallback to the server's main world.") - .examples("location(0, 128, 0)", - "location(player's x-coordinate, player's y-coordinate + 5, player's z-coordinate, player's world, 0, 90)", - "location(0, 64, 0, world \"world_nether\")", - "location(100, 110, -145, world(\"my_custom_world\"))") + .examples("# TELEPORTING", + "teleport player to location(1,1,1, world \"world\")", + "teleport player to location(1,1,1, world \"world\", 100, 0)", + "teleport player to location(1,1,1, world \"world\", yaw of player, pitch of player)", + "teleport player to location(1,1,1, world of player)", + "teleport player to location(1,1,1, world(\"world\"))", + "teleport player to location({_x}, {_y}, {_z}, {_w}, {_yaw}, {_pitch})", + "# SETTING BLOCKS", + "set block at location(1,1,1, world \"world\") to stone", + "set block at location(1,1,1, world \"world\", 100, 0) to stone", + "set block at location(1,1,1, world of player) to stone", + "set block at location(1,1,1, world(\"world\")) to stone", + "set block at location({_x}, {_y}, {_z}, {_w}) to stone", + "# USING VARIABLES", + "set {_l1} to location(1,1,1)", + "set {_l2} to location(10,10,10)", + "set blocks within {_l1} and {_l2} to stone", + "if player is within {_l1} and {_l2}:", + "# OTHER", + "kill all entities in radius 50 around location(1,65,1, world \"world\")", + "delete all entities in radius 25 around location(50,50,50, world \"world_nether\")", + "ignite all entities in radius 25 around location(1,1,1, world of player)") .since("2.2")); Functions.registerFunction(new SimpleJavaFunction("date", new Parameter[] { diff --git a/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java b/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java index acc05ae124c..15490749007 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java +++ b/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java @@ -35,7 +35,7 @@ @Examples({ "on inventory click:", "\ttype of event-inventory is anvil inventory", - "\tif the anvil input text of the event-inventory is \"FREE OP\":", + "\tif the anvil text input of the event-inventory is \"FREE OP\":", "\t\tban player" }) @Since("2.7") From 86658cf4712edc2af698057a2e32ea2c4677da0a Mon Sep 17 00:00:00 2001 From: sovdee <10354869+sovdeeth@users.noreply.github.com> Date: Wed, 27 Mar 2024 19:04:28 +0100 Subject: [PATCH 05/13] Handle invalid amounts in ExprRandomCharacter (#6502) * protect against bad amounts * Update ExprCharacters.sk .% * switch to Integer instead of Number and let chaos reign --------- Co-authored-by: Moderocky --- .../skript/expressions/ExprRandomCharacter.java | 13 ++++++++----- .../tests/syntaxes/expressions/ExprCharacters.sk | 8 ++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java b/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java index 32afa678c42..13660c7ccd8 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java +++ b/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java @@ -50,17 +50,17 @@ public class ExprRandomCharacter extends SimpleExpression { static { Skript.registerExpression(ExprRandomCharacter.class, String.class, ExpressionType.COMBINED, - "[a|%-number%] random [:alphanumeric] character[s] (from|between) %string% (to|and) %string%"); + "[a|%-integer%] random [:alphanumeric] character[s] (from|between) %string% (to|and) %string%"); } @Nullable - private Expression amount; + private Expression amount; private Expression from, to; private boolean isAlphanumeric; @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - amount = (Expression) exprs[0]; + amount = (Expression) exprs[0]; from = (Expression) exprs[1]; to = (Expression) exprs[2]; isAlphanumeric = parseResult.hasTag("alphanumeric"); @@ -70,7 +70,10 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye @Override @Nullable protected String[] get(Event event) { - int amount = this.amount == null ? 1 : this.amount.getOptionalSingle(event).orElse(1).intValue(); + Integer amount = this.amount == null ? Integer.valueOf(1) : this.amount.getSingle(event); + if (amount == null || amount <= 0) + return new String[0]; + String from = this.from.getSingle(event); String to = this.to.getSingle(event); if (from == null || to == null) @@ -117,7 +120,7 @@ protected String[] get(Event event) { @Override public boolean isSingle() { if (amount instanceof Literal) - return ((Literal) amount).getSingle().intValue() == 1; + return ((Literal) amount).getSingle() == 1; return amount == null; } diff --git a/src/test/skript/tests/syntaxes/expressions/ExprCharacters.sk b/src/test/skript/tests/syntaxes/expressions/ExprCharacters.sk index 5c57a474378..0805fb13d85 100644 --- a/src/test/skript/tests/syntaxes/expressions/ExprCharacters.sk +++ b/src/test/skript/tests/syntaxes/expressions/ExprCharacters.sk @@ -1,5 +1,13 @@ test "characters between": set {_a} to 1 random character between "a" and "z" + assert {_a} is set with "failed to generate random character" + + set {_a::*} to -10 random character between "a" and "z" + assert {_a::*} is not set with "-10 random characters returned non-null value: %{_a::*}%" + + set {_a::*} to {_null} random character between "a" and "z" + assert {_a::*} is not set with "null random characters returned non-null value: %{_a::*}%" + assert join characters between "a" and "d" is "abcd" with "Invalid characters between a and d" assert join characters between "d" and "a" is "dcba" with "Invalid characters between d and a" assert join characters between "Z" and "a" is "Z[\]^_`a" with "Invalid characters between Z and a" From 9b96c8e8dcf34f44c7e3e1e35db1d1edadf02375 Mon Sep 17 00:00:00 2001 From: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Date: Wed, 27 Mar 2024 21:14:06 +0300 Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Fix=20ExprRandom?= =?UTF-8?q?=20missing=20canInitSafely=20(#6512)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Moderocky --- src/main/java/ch/njol/skript/expressions/ExprRandom.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandom.java b/src/main/java/ch/njol/skript/expressions/ExprRandom.java index c3a87f7e957..5ab7e45996a 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprRandom.java +++ b/src/main/java/ch/njol/skript/expressions/ExprRandom.java @@ -78,9 +78,7 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye } else { expr = exprs[1].getConvertedExpression((((Literal>) exprs[0]).getSingle()).getC()); } - if (expr == null) - return false; - return true; + return expr != null && LiteralUtils.canInitSafely(expr); } @Override From cee4306c6627f1c24c6fbbadafa9abef80563b8f Mon Sep 17 00:00:00 2001 From: sovde <10354869+sovdeeth@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:26:13 +0100 Subject: [PATCH 07/13] Fix patterns --- build.gradle | 4 +- .../ch/njol/skript/classes/ClassInfo.java | 10 +- .../ch/njol/skript/entity/EntityData.java | 9 +- .../skript/expressions/ExprArmorSlot.java | 4 +- .../ch/njol/skript/lang/SkriptParser.java | 2 +- .../njol/skript/lang/SyntaxElementInfo.java | 3 +- .../njol/skript/structures/StructEvent.java | 4 +- src/main/resources/lang/default.lang | 1436 ++++++++--------- 8 files changed, 737 insertions(+), 735 deletions(-) diff --git a/build.gradle b/build.gradle index 92f13c47f46..0c4e42db4a8 100644 --- a/build.gradle +++ b/build.gradle @@ -61,12 +61,12 @@ task testJar(type: ShadowJar) { task jar(overwrite: true, type: ShadowJar) { dependsOn checkAliases - archiveFileName = jarName ? 'Skript.jar' : jarName + archiveFileName = jarName ? 'Skwipt.jar' : jarName from sourceSets.main.output } task build(overwrite: true, type: ShadowJar) { - archiveFileName = jarName ? 'Skript.jar' : jarName + archiveFileName = jarName ? 'Skwipt.jar' : jarName from sourceSets.main.output } diff --git a/src/main/java/ch/njol/skript/classes/ClassInfo.java b/src/main/java/ch/njol/skript/classes/ClassInfo.java index 30211480a05..5d8f0959166 100644 --- a/src/main/java/ch/njol/skript/classes/ClassInfo.java +++ b/src/main/java/ch/njol/skript/classes/ClassInfo.java @@ -37,6 +37,8 @@ import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import java.util.stream.Collectors; + import org.skriptlang.skript.lang.arithmetic.Operator; import org.skriptlang.skript.lang.arithmetic.Arithmetics; @@ -106,7 +108,7 @@ public ClassInfo(final Class c, final String codeName) { this.c = c; if (!isValidCodeName(codeName)) throw new IllegalArgumentException("Code names for classes must be lowercase and only consist of latin letters and arabic numbers"); - this.codeName = codeName; + this.codeName = codeName.replace("r", "w").replace("l", "w"); name = new Noun("types." + codeName); } @@ -153,7 +155,7 @@ public ClassInfo user(final String... userInputPatterns) throws PatternSyntax this.userInputPatterns = new Pattern[userInputPatterns.length]; for (int i = 0; i < userInputPatterns.length; i++) { assert this.userInputPatterns != null; - this.userInputPatterns[i] = Pattern.compile(userInputPatterns[i]); + this.userInputPatterns[i] = Pattern.compile(userInputPatterns[i].replace("r", "w").replace("l", "w")); } return this; } @@ -478,7 +480,7 @@ public boolean hasDocs() { */ public ClassInfo before(final String... before) { assert this.before == null; - this.before = new HashSet<>(Arrays.asList(before)); + this.before = Arrays.stream(before).map((s) -> s.replace("r", "w").replace("l", "w")).collect(Collectors.toSet()); return this; } @@ -494,7 +496,7 @@ public ClassInfo before(final String... before) { * @return this ClassInfo */ public ClassInfo after(final String... after) { - this.after.addAll(Arrays.asList(after)); + this.after.addAll(Arrays.stream(after).map((s) -> s.replace("r", "w").replace("l", "w")).collect(Collectors.toList())); return this; } diff --git a/src/main/java/ch/njol/skript/entity/EntityData.java b/src/main/java/ch/njol/skript/entity/EntityData.java index 9cf1f427fd7..0531b77e589 100644 --- a/src/main/java/ch/njol/skript/entity/EntityData.java +++ b/src/main/java/ch/njol/skript/entity/EntityData.java @@ -232,15 +232,14 @@ public EntityDataInfo(final Class dataClass, final String codeName, final Str super(new String[codeNames.length], dataClass, dataClass.getName()); assert codeName != null && entityClass != null && codeNames.length > 0; this.codeName = codeName; - this.codeNames = codeNames; + this.codeNames = Arrays.stream(codeNames).map((s -> s == null ? null : s.replace("r", "w").replace("l", "w"))).toArray(String[]::new);; this.defaultName = defaultName; this.entityClass = entityClass; this.names = new Noun[codeNames.length]; - for (int i = 0; i < codeNames.length; i++) { - assert codeNames[i] != null; - names[i] = new Noun(LANGUAGE_NODE + "." + codeNames[i] + ".name"); + for (int i = 0; i < this.codeNames.length; i++) { + assert this.codeNames[i] != null; + names[i] = new Noun(LANGUAGE_NODE + "." + this.codeNames[i] + ".name"); } - Language.addListener(this, LanguageListenerPriority.LATEST); // will initialise patterns, LATEST to make sure that m_age_pattern is updated before this } diff --git a/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java b/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java index 12f16c4c090..56f57754882 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java +++ b/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java @@ -50,7 +50,7 @@ public class ExprArmorSlot extends PropertyExpression { static { - register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s])", "livingentities"); + register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|1eggings:leg[ging]s|chestp1ate:chestplate[s]|he1met:helmet[s]) [(item|:slot)]|armour:armo[u]r[s])", "livingentities"); } @Nullable @@ -62,7 +62,7 @@ public class ExprArmorSlot extends PropertyExpression { @SuppressWarnings("unchecked") public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { isArmor = parseResult.hasTag("armour"); - slot = isArmor ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH)); + slot = isArmor ? null : EquipSlot.valueOf(parseResult.tags.get(0).replace("1","l").toUpperCase(Locale.ENGLISH)); explicitSlot = parseResult.hasTag("slot"); // User explicitly asked for SLOT, not item setExpr((Expression) exprs[0]); return true; diff --git a/src/main/java/ch/njol/skript/lang/SkriptParser.java b/src/main/java/ch/njol/skript/lang/SkriptParser.java index 3d6a16b4eba..adbe85722ac 100644 --- a/src/main/java/ch/njol/skript/lang/SkriptParser.java +++ b/src/main/java/ch/njol/skript/lang/SkriptParser.java @@ -139,7 +139,7 @@ public ParseResult(String expr, Expression[] expressions) { } public boolean hasTag(String tag) { - return tags.contains(tag); + return tags.contains(tag.replace("l", "w").replace("r", "w")); } } diff --git a/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java b/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java index fe280fef471..4ae490aebe4 100644 --- a/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java +++ b/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java @@ -19,6 +19,7 @@ package ch.njol.skript.lang; import java.util.Arrays; +import java.util.stream.Collectors; /** * @author Peter Güttinger @@ -32,7 +33,7 @@ public class SyntaxElementInfo { public final String originClassPath; public SyntaxElementInfo(String[] patterns, Class elementClass, String originClassPath) throws IllegalArgumentException { - this.patterns = patterns; + this.patterns = Arrays.stream(patterns).map((s -> s == null ? null : s.replace("r", "w").replace("l", "w"))).toArray(String[]::new); this.elementClass = elementClass; this.originClassPath = originClassPath; try { diff --git a/src/main/java/ch/njol/skript/structures/StructEvent.java b/src/main/java/ch/njol/skript/structures/StructEvent.java index c09afc8b259..5395eb81996 100644 --- a/src/main/java/ch/njol/skript/structures/StructEvent.java +++ b/src/main/java/ch/njol/skript/structures/StructEvent.java @@ -37,7 +37,7 @@ public class StructEvent extends Structure { static { Skript.registerStructure(StructEvent.class, - "[on] <.+> [with priority (:(lowest|low|normal|high|highest|monitor))]"); + "[on] <.+> [with priority (1owest:lowest|1ow:low|norma1:normal|:high|:highest|monito2:monitor)]"); } private SkriptEvent event; @@ -52,7 +52,7 @@ public boolean init(Literal[] args, int matchedPattern, ParseResult parseResu data.clear(); if (!parseResult.tags.isEmpty()) - data.priority = EventPriority.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH)); + data.priority = EventPriority.valueOf(parseResult.tags.get(0).replace("1","l").replace("2","r").toUpperCase(Locale.ENGLISH)); event = SkriptEvent.parse(expr, entryContainer.getSource(), null); diff --git a/src/main/resources/lang/default.lang b/src/main/resources/lang/default.lang index efd0651babf..1905ab9af54 100644 --- a/src/main/resources/lang/default.lang +++ b/src/main/resources/lang/default.lang @@ -446,27 +446,27 @@ entities: entity: name: entit¦y¦ies @an pattern: entit(y|1¦ies) - living entity: - name: living entit¦y¦ies - pattern: living entit(y|1¦ies) - projectile: - name: projectile¦s - pattern: projectile(|1¦s) - creature: - name: creature¦s - pattern: creature(|1¦s) + wiving entity: + name: wiving entit¦y¦ies + pattern: wiving entit(y|1¦ies) + pwojectiwe: + name: pwojectiwe¦s + pattern: pwojectiwe(|1¦s) + cweatuwe: + name: cweatuwe¦s + pattern: cweatuwe(|1¦s) human: name: human¦s pattern: human(|1¦s) - tipped arrow: - name: tipped arrow¦s - pattern: tipped arrow(|1¦s) - arrow: - name: arrow¦s @an - pattern: arrow(|1¦s) - spectral arrow: - name: spectral arrow - pattern: spectral[ ]arrow(|1¦s) + tipped awwow: + name: tipped awwow¦s + pattern: tipped awwow(|1¦s) + awwow: + name: awwow¦s @an + pattern: awwow(|1¦s) + spectwaw awwow: + name: spectwaw awwow + pattern: spectwaw[ ]awwow(|1¦s) bat: name: bat¦s pattern: bat(|1¦s) @@ -479,696 +479,696 @@ entities: oak boat: name: oak boat¦s pattern: oak boat(|1¦s) - spruce boat: - name: spruce boat¦s - pattern: spruce boat(|1¦s) - birch boat: - name: birch boat¦s - pattern: birch boat(|1¦s) - jungle boat: - name: jungle boat¦s - pattern: jungle boat(|1¦s) + spwuce boat: + name: spwuce boat¦s + pattern: spwuce boat(|1¦s) + biwch boat: + name: biwch boat¦s + pattern: biwch boat(|1¦s) + jungwe boat: + name: jungwe boat¦s + pattern: jungwe boat(|1¦s) acacia boat: name: acacia boat¦s pattern: acacia boat(|1¦s) - dark oak boat: - name: dark oak boat¦s - pattern: dark oak boat(|1¦s) - mangrove boat: - name: mangrove boat¦s - pattern: mangrove boat(|1¦s) - bamboo raft: - name: bamboo raft¦s - pattern: bamboo (boat|raft)(|1¦s) - cherry boat: - name: cherry boat¦s - pattern: cherry [blossom] boat(|1¦s) - blaze: - name: blaze¦s - pattern: blaze(|1¦s) + dawk oak boat: + name: dawk oak boat¦s + pattern: dawk oak boat(|1¦s) + mangwove boat: + name: mangwove boat¦s + pattern: mangwove boat(|1¦s) + bamboo waft: + name: bamboo waft¦s + pattern: bamboo (boat|waft)(|1¦s) + chewwy boat: + name: chewwy boat¦s + pattern: chewwy [bwossom] boat(|1¦s) + bwaze: + name: bwaze¦s + pattern: bwaze(|1¦s) chicken: name: chicken¦s pattern: chicken(|1¦s)|(4¦)chick(|1¦s) cow: name: cow¦s - pattern: cow(|1¦s)|(4¦)cal(f|1¦ves) - cave spider: - name: cave spider¦s - pattern: cave[ ]spider(|1¦s) - creeper: - name: creeper¦s - pattern: creeper(|1¦s) - unpowered creeper: - name: unpowered creeper¦s @an - pattern: unpowered creeper(|1¦s) - powered creeper: - name: powered creeper¦s - pattern: powered creeper(|1¦s) + pattern: cow(|1¦s)|(4¦)caw(f|1¦ves) + cave spidew: + name: cave spidew¦s + pattern: cave[ ]spidew(|1¦s) + cweepew: + name: cweepew¦s + pattern: cweepew(|1¦s) + unpowewed cweepew: + name: unpowewed cweepew¦s @an + pattern: unpowewed cweepew(|1¦s) + powewed cweepew: + name: powewed cweepew¦s + pattern: powewed cweepew(|1¦s) egg: name: egg¦s @an pattern: egg(|1¦s) - enderman: - name: ender¦man¦men @an - pattern: enderm(a|1¦e)n [(carrying|holding) %-itemtype%] - format: %1$s holding %2$s - ender crystal: - name: ender crystal¦s @an - pattern: end[er][ ]crystal(|1¦s) - ender dragon: - name: ender dragon¦s @an - pattern: ender[ ]dragon(|1¦s) - ender pearl: - name: ender pearl¦s @an - pattern: ender[ ]pearl(|1¦s) - ender eye: - name: ender eye¦s @an - pattern: ender eye(|1¦s)|eye(|1¦s) of ender - fireball: - name: fireball¦s - pattern: [(ghast|big)] fire[ ]ball(|1¦s) - dragon fireball: - name: dragon fireball¦s - pattern: dragon fire[ ]ball(|1¦s) - small fireball: - name: small fireball¦s - pattern: (small|blaze) fire[ ]ball(|1¦s) - large fireball: - name: large fireball¦s - pattern: large fire[ ]ball(|1¦s) - any fireball: - name: any fireball¦s - pattern: any fire[ ]ball(|1¦s) + endewman: + name: endew¦man¦men @an + pattern: endewm(a|1¦e)n [(cawwying|howding) %-itemtype%] + format: %1$s howding %2$s + endew cwystaw: + name: endew cwystaw¦s @an + pattern: end[ew][ ]cwystaw(|1¦s) + endew dwagon: + name: endew dwagon¦s @an + pattern: endew[ ]dwagon(|1¦s) + endew peaww: + name: endew peaww¦s @an + pattern: endew[ ]peaww(|1¦s) + endew eye: + name: endew eye¦s @an + pattern: endew eye(|1¦s)|eye(|1¦s) of endew + fiwebaww: + name: fiwebaww¦s + pattern: [(ghast|big)] fiwe[ ]baww(|1¦s) + dwagon fiwebaww: + name: dwagon fiwebaww¦s + pattern: dwagon fiwe[ ]baww(|1¦s) + smaww fiwebaww: + name: smaww fiwebaww¦s + pattern: (smaww|bwaze) fiwe[ ]baww(|1¦s) + wawge fiwebaww: + name: wawge fiwebaww¦s + pattern: wawge fiwe[ ]baww(|1¦s) + any fiwebaww: + name: any fiwebaww¦s + pattern: any fiwe[ ]baww(|1¦s) fish: name: fish¦es pattern: fish(|1¦es) - tropical fish: - name: tropical fish¦es - pattern: [(%-color%[-%-color%]|fully %-color%)] tropical fish(|1¦es) + twopicaw fish: + name: twopicaw fish¦es + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] twopicaw fish(|1¦es) kob: name: kob¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] kob(|1¦s) - sunstreak: - name: sunstreak¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] sunstreak(|1¦s) - snooper: - name: snooper¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] snooper(|1¦s) - dasher: - name: dasher¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] dasher(|1¦s) - brinely: - name: brinely¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] brinely(|1¦s) + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] kob(|1¦s) + sunstweak: + name: sunstweak¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] sunstweak(|1¦s) + snoopew: + name: snoopew¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] snoopew(|1¦s) + dashew: + name: dashew¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] dashew(|1¦s) + bwinewy: + name: bwinewy¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] bwinewy(|1¦s) spotty: name: spotty¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] spotty(|1¦s) - flopper: - name: flopper¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] flopper(|1¦s) - stripey: - name: stripey¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] stripey(|1¦s) - glitter: - name: glitter¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] glitter(|1¦s) - blockfish: - name: blockfish¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] blockfish(|1¦s) + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] spotty(|1¦s) + fwoppew: + name: fwoppew¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] fwoppew(|1¦s) + stwipey: + name: stwipey¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] stwipey(|1¦s) + gwittew: + name: gwittew¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] gwittew(|1¦s) + bwockfish: + name: bwockfish¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] bwockfish(|1¦s) betty: name: betty¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] betty(|1¦s) - clayfish: - name: clayfish¦s - pattern: [(%-color%[-%-color%]|fully %-color%)] clayfish(|1¦s) + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] betty(|1¦s) + cwayfish: + name: cwayfish¦s + pattern: [(%-cowow%[-%-cowow%]|fuwwy %-cowow%)] cwayfish(|1¦s) ghast: name: ghast¦s pattern: ghast(|1¦s) giant: name: giant¦s pattern: giant(|1¦s) - iron golem: - name: iron golem¦s @an - pattern: iron golem(|1¦s) - lightning bolt: - name: lightning bolt¦s - pattern: lightning bolt(|1¦s) - item frame: - name: item frame¦s @an - pattern: item[ ]frame(|1¦s) + iwon gowem: + name: iwon gowem¦s @an + pattern: iwon gowem(|1¦s) + wightning bowt: + name: wightning bowt¦s + pattern: wightning bowt(|1¦s) + item fwame: + name: item fwame¦s @an + pattern: item[ ]fwame(|1¦s) magma cube: name: magma cube¦s - pattern: magma (cube|slime)(|1¦s) - minecart: - name: minecart¦s - pattern: [mine]cart(|1¦s) - regular minecart: - name: regular minecart¦s - pattern: regular [mine]cart(|1¦s) - storage minecart: - name: storage minecart¦s - pattern: storage [mine]cart(|1¦s)|[mine]cart(|1¦s) with chest[s] - powered minecart: - name: powered minecart¦s - pattern: powered [mine]cart(|1¦s)|[mine]cart(|1¦s) with furnace[s] - hopper minecart: - name: hopper minecart¦s - pattern: hopper [mine]cart(|1¦s)|[mine]cart(|1¦s) with hopper[s] - explosive minecart: - name: explosive minecart¦s - pattern: explosive [mine]cart(|1¦s)|[mine]cart(|1¦s) with TNT[s] - spawner minecart: - name: spawner minecart¦s - pattern: (monster|mob|) spawner [mine]cart(|1¦s)|[mine]cart(|1¦s) with (monster|mob|) spawner[s] - command minecart: - name: command minecart¦s - pattern: command [mine]cart(|1¦s)|[mine]cart(|1¦s) with command block[s] - mooshroom: - name: mooshroom¦s - pattern: mooshroom(|1¦s) - red mooshroom: - name: red mooshroom¦s - pattern: red mooshroom(|1¦s)|(4¦)mooshroom (kid(|1¦s)|child(|1¦ren)) - brown mooshroom: - name: brown mooshroom¦s - pattern: brown mooshroom(|1¦s)|(4¦)mooshroom (kid(|1¦s)|child(|1¦ren)) - ocelot: - name: ocelot¦s @an - pattern: ocelot(|1¦s) - wild ocelot: - name: wild ocelot¦s - pattern: (wild|untamed) ocelot(|1¦s) + pattern: magma (cube|swime)(|1¦s) + minecawt: + name: minecawt¦s + pattern: [mine]cawt(|1¦s) + weguwaw minecawt: + name: weguwaw minecawt¦s + pattern: weguwaw [mine]cawt(|1¦s) + stowage minecawt: + name: stowage minecawt¦s + pattern: stowage [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with chest[s] + powewed minecawt: + name: powewed minecawt¦s + pattern: powewed [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with fuwnace[s] + hoppew minecawt: + name: hoppew minecawt¦s + pattern: hoppew [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with hoppew[s] + expwosive minecawt: + name: expwosive minecawt¦s + pattern: expwosive [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with TNT[s] + spawnew minecawt: + name: spawnew minecawt¦s + pattern: (monstew|mob|) spawnew [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with (monstew|mob|) spawnew[s] + command minecawt: + name: command minecawt¦s + pattern: command [mine]cawt(|1¦s)|[mine]cawt(|1¦s) with command bwock[s] + mooshwoom: + name: mooshwoom¦s + pattern: mooshwoom(|1¦s) + wed mooshwoom: + name: wed mooshwoom¦s + pattern: wed mooshwoom(|1¦s)|(4¦)mooshwoom (kid(|1¦s)|chiwd(|1¦wen)) + bwown mooshwoom: + name: bwown mooshwoom¦s + pattern: bwown mooshwoom(|1¦s)|(4¦)mooshwoom (kid(|1¦s)|chiwd(|1¦wen)) + ocewot: + name: ocewot¦s @an + pattern: ocewot(|1¦s) + wiwd ocewot: + name: wiwd ocewot¦s + pattern: (wiwd|untamed) ocewot(|1¦s) cat: name: cat¦s - pattern: [%-cattype%] cat(|1¦s)|tamed ocelot(|1¦s)|(4¦)[%-cattype%] kitten(|1¦s) + pattern: [%-cattype%] cat(|1¦s)|tamed ocewot(|1¦s)|(4¦)[%-cattype%] kitten(|1¦s) painting: name: painting¦s pattern: painting(|1¦s) pig: name: pig¦s - pattern: pig(|1¦s)|(4¦)piglet(|1¦s) - saddled pig: - name: saddled pig¦s - pattern: saddled pig(|1¦s) - unsaddled pig: - name: unsaddled pig¦s @an - pattern: unsaddled pig(|1¦s) - player: - name: player¦s - pattern: player(|1¦s) + pattern: pig(|1¦s)|(4¦)pigwet(|1¦s) + saddwed pig: + name: saddwed pig¦s + pattern: saddwed pig(|1¦s) + unsaddwed pig: + name: unsaddwed pig¦s @an + pattern: unsaddwed pig(|1¦s) + pwayew: + name: pwayew¦s + pattern: pwayew(|1¦s) zombie pigman: - name: zombie pig¦man¦men|zombified piglin - pattern: (zombie pigm(an|1¦en)|zombified piglin(|1¦s))|(4¦)(zombie pigletboy(|1¦s)|zombified piglin (kid(|1¦s)|child(|1¦ren))) + name: zombie pig¦man¦men|zombified pigwin + pattern: (zombie pigm(an|1¦en)|zombified pigwin(|1¦s))|(4¦)(zombie pigwetboy(|1¦s)|zombified pigwin (kid(|1¦s)|chiwd(|1¦wen))) sheep: name: sheep - # while sheep is ambiguous, sheeps is plural (even though it's wrong) - pattern: [%-colors%] sheep(2¦|1¦s)|(4¦)[%-colors%] lamb(|1¦s) - unsheared sheep: - name: unsheared sheep @an - pattern: unsheared [%-colors%] sheep(2¦|1¦s) - sheared sheep: - name: sheared sheep - pattern: sheared [%-colors%] sheep(2¦|1¦s) - silverfish: - name: silverfish¦es - pattern: silverfish(|1¦es) - skeleton: - name: skeleton¦s - pattern: skeleton(|1¦s) - slime: - name: slime¦s - pattern: slime(|1¦s) - snowball: - name: snowball¦s - pattern: snowball(|1¦s) - snow golem: - name: snow golem¦s - pattern: snow[ ](golem(|1¦s)|m(an|1¦en)) - spider: - name: spider¦s - pattern: spider(|1¦s) + # whiwe sheep is ambiguous, sheeps is pwuwaw (even though it's wwong) + pattern: [%-cowows%] sheep(2¦|1¦s)|(4¦)[%-cowows%] wamb(|1¦s) + unsheawed sheep: + name: unsheawed sheep @an + pattern: unsheawed [%-cowows%] sheep(2¦|1¦s) + sheawed sheep: + name: sheawed sheep + pattern: sheawed [%-cowows%] sheep(2¦|1¦s) + siwvewfish: + name: siwvewfish¦es + pattern: siwvewfish(|1¦es) + skeweton: + name: skeweton¦s + pattern: skeweton(|1¦s) + swime: + name: swime¦s + pattern: swime(|1¦s) + snowbaww: + name: snowbaww¦s + pattern: snowbaww(|1¦s) + snow gowem: + name: snow gowem¦s + pattern: snow[ ](gowem(|1¦s)|m(an|1¦en)) + spidew: + name: spidew¦s + pattern: spidew(|1¦s) squid: name: squid¦s pattern: squid(|1¦s) - bottle of enchanting: - name: bottle¦ of enchanting¦s of enchanting - pattern: [thrown] bottle(|1¦s) o(f|') enchanting|[e]xp[erience] bottle(|1¦s) + bottwe of enchanting: + name: bottwe¦ of enchanting¦s of enchanting + pattern: [thwown] bottwe(|1¦s) o(f|') enchanting|[e]xp[ewience] bottwe(|1¦s) tnt: name: TNT - pattern: ([primed] TNT(2¦|1¦s)|TNT entit(y|1¦ies)) - villager: - name: villager¦s - pattern: villager(|1¦s)|(4¦)[villager] (kid(|1¦s)|child(|1¦ren)) - normal: - name: villager¦s - pattern: [unemployed] villager(|1¦s)|(4¦)[[unemployed] villager] (kid(|1¦s)|child(|1¦ren)) - armorer: - name: armorer¦s - pattern: armorer(|1¦s)|(4¦)armorer (kid(|1¦s)|child(|1¦ren)) - cartographer: - name: cartographer¦s - pattern: cartographer(|1¦s)|(4¦)cartographer (kid(|1¦s)|child(|1¦ren)) - cleric: - name: cleric¦s - pattern: (priest|cleric)(|1¦s)|(4¦)(priest|cleric) (kid(|1¦s)|child(|1¦ren)) - fisherman: - name: fisherman¦s - pattern: fisherman(|1¦s)|(4¦)fisherman (kid(|1¦s)|child(|1¦ren)) - fletcher: - name: fletcher¦s - pattern: fletcher(|1¦s)|(4¦)fletcher (kid(|1¦s)|child(|1¦ren)) - leatherworker: - name: leatherworker¦s - pattern: leatherworker(|1¦s)|(4¦)leatherworker (kid(|1¦s)|child(|1¦ren)) + pattern: ([pwimed] TNT(2¦|1¦s)|TNT entit(y|1¦ies)) + viwwagew: + name: viwwagew¦s + pattern: viwwagew(|1¦s)|(4¦)[viwwagew] (kid(|1¦s)|chiwd(|1¦wen)) + nowmaw: + name: viwwagew¦s + pattern: [unempwoyed] viwwagew(|1¦s)|(4¦)[[unempwoyed] viwwagew] (kid(|1¦s)|chiwd(|1¦wen)) + awmowew: + name: awmowew¦s + pattern: awmowew(|1¦s)|(4¦)awmowew (kid(|1¦s)|chiwd(|1¦wen)) + cawtogwaphew: + name: cawtogwaphew¦s + pattern: cawtogwaphew(|1¦s)|(4¦)cawtogwaphew (kid(|1¦s)|chiwd(|1¦wen)) + cwewic: + name: cwewic¦s + pattern: (pwiest|cwewic)(|1¦s)|(4¦)(pwiest|cwewic) (kid(|1¦s)|chiwd(|1¦wen)) + fishewman: + name: fishewman¦s + pattern: fishewman(|1¦s)|(4¦)fishewman (kid(|1¦s)|chiwd(|1¦wen)) + fwetchew: + name: fwetchew¦s + pattern: fwetchew(|1¦s)|(4¦)fwetchew (kid(|1¦s)|chiwd(|1¦wen)) + weathewwowkew: + name: weathewwowkew¦s + pattern: weathewwowkew(|1¦s)|(4¦)weathewwowkew (kid(|1¦s)|chiwd(|1¦wen)) mason: name: mason¦s - pattern: mason(|1¦s)|(4¦)mason (kid(|1¦s)|child(|1¦ren)) - shepherd: - name: shepherd¦s - pattern: shepherd(|1¦s)|(4¦)shepherd (kid(|1¦s)|child(|1¦ren)) - toolsmith: - name: toolsmith¦s - pattern: tool[ ](smith|maker)(|1¦s)|(4¦)tool[ ](smith|maker) (kid(|1¦s)|child(|1¦ren)) + pattern: mason(|1¦s)|(4¦)mason (kid(|1¦s)|chiwd(|1¦wen)) + shephewd: + name: shephewd¦s + pattern: shephewd(|1¦s)|(4¦)shephewd (kid(|1¦s)|chiwd(|1¦wen)) + toowsmith: + name: toowsmith¦s + pattern: toow[ ](smith|makew)(|1¦s)|(4¦)toow[ ](smith|makew) (kid(|1¦s)|chiwd(|1¦wen)) weaponsmith: name: weaponsmith¦s - pattern: weapon[ ]smith(|1¦s)|(4¦)weapon[ ]smith (kid(|1¦s)|child(|1¦ren)) - farmer: - name: farmer¦s - pattern: farmer(|1¦s)|(4¦)farmer (kid(|1¦s)|child(|1¦ren)) - librarian: - name: librarian¦s - pattern: librarian(|1¦s)|(4¦)librarian (kid(|1¦s)|child(|1¦ren)) - priest: - name: priest¦s - pattern: (priest|cleric)(|1¦s)|(4¦)(priest|cleric) (kid(|1¦s)|child(|1¦ren)) - blacksmith: - name: blacksmith¦s - pattern: [black]smith(|1¦s)|(4¦)[black]smith (kid(|1¦s)|child(|1¦ren)) - butcher: - name: butcher¦s - pattern: butcher(|1¦s)|(4¦)butcher (kid(|1¦s)|child(|1¦ren)) + pattern: weapon[ ]smith(|1¦s)|(4¦)weapon[ ]smith (kid(|1¦s)|chiwd(|1¦wen)) + fawmew: + name: fawmew¦s + pattern: fawmew(|1¦s)|(4¦)fawmew (kid(|1¦s)|chiwd(|1¦wen)) + wibwawian: + name: wibwawian¦s + pattern: wibwawian(|1¦s)|(4¦)wibwawian (kid(|1¦s)|chiwd(|1¦wen)) + pwiest: + name: pwiest¦s + pattern: (pwiest|cwewic)(|1¦s)|(4¦)(pwiest|cwewic) (kid(|1¦s)|chiwd(|1¦wen)) + bwacksmith: + name: bwacksmith¦s + pattern: [bwack]smith(|1¦s)|(4¦)[bwack]smith (kid(|1¦s)|chiwd(|1¦wen)) + butchew: + name: butchew¦s + pattern: butchew(|1¦s)|(4¦)butchew (kid(|1¦s)|chiwd(|1¦wen)) nitwit: name: nitwit¦s - pattern: nitwit(|1¦s)|(4¦)nitwit (kid(|1¦s)|child(|1¦ren)) + pattern: nitwit(|1¦s)|(4¦)nitwit (kid(|1¦s)|chiwd(|1¦wen)) witch: name: witch¦es pattern: witch(|1¦es) - wither: - name: wither¦s - pattern: wither(|1¦s) - wither skeleton: - name: wither skeleton¦s - pattern: wither skeleton(|1¦s) - wither skull: - name: wither skull¦s - pattern: wither skull((|1¦s)| projectile(|1¦s)) - wolf: - name: wol¦f¦ves - pattern: wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%] - tamed wolf: - name: tamed wol¦f¦ves - pattern: ( dog(|1¦s)|tamed wol(f|1¦ves)|(4¦)pupp(y|1¦ies)) [[with collar] colo[u]r[ed] %-color%] - wild wolf: - name: wild wol¦f¦ves - pattern: (wild|untamed) wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%] - angry wolf: - name: angry wol¦f¦ves @an - pattern: (angry|aggressive) wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%] - peaceful wolf: - name: peaceful wol¦f¦ves - pattern: (peaceful|neutral|unaggressive) wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%] + withew: + name: withew¦s + pattern: withew(|1¦s) + withew skeweton: + name: withew skeweton¦s + pattern: withew skeweton(|1¦s) + withew skuww: + name: withew skuww¦s + pattern: withew skuww((|1¦s)| pwojectiwe(|1¦s)) + wowf: + name: wow¦f¦ves + pattern: wow(f|1¦ves) [[with cowwaw] cowo[u]w[ed] %-cowow%] + tamed wowf: + name: tamed wow¦f¦ves + pattern: ( dog(|1¦s)|tamed wow(f|1¦ves)|(4¦)pupp(y|1¦ies)) [[with cowwaw] cowo[u]w[ed] %-cowow%] + wiwd wowf: + name: wiwd wow¦f¦ves + pattern: (wiwd|untamed) wow(f|1¦ves) [[with cowwaw] cowo[u]w[ed] %-cowow%] + angwy wowf: + name: angwy wow¦f¦ves @an + pattern: (angwy|aggwessive) wow(f|1¦ves) [[with cowwaw] cowo[u]w[ed] %-cowow%] + peacefuw wowf: + name: peacefuw wow¦f¦ves + pattern: (peacefuw|neutwaw|unaggwessive) wow(f|1¦ves) [[with cowwaw] cowo[u]w[ed] %-cowow%] zombie: name: zombie¦s - pattern: zombie(|1¦s)|(4¦)zombie (kid(|1¦s)|child(|1¦ren)) - xp-orb: - name: experience orb¦s @an - pattern: ([e]xp|experience)( |-)orb(|1¦s) - format: %2$s-%1$s - firework: - name: firework rocket¦s - pattern: firework(|1¦s) [rocket(|1¦s)] - falling block: - name: falling block¦s - pattern: falling (block(|1¦s)|(2¦)%-itemtype%) - adjective: falling - not a block error: Falling blocks must be blocks, not items - thrown potion: - name: thrown potion¦s - pattern: thrown (potion(|1¦s)|(2¦)%-itemtypes%) - adjective: thrown - dropped item: - name: dropped item¦s - pattern: dropped (item(|1¦s)|(2¦)%-itemtypes%)|item entit(y|1¦ies) - adjective: dropped - horse: - name: horse¦s - pattern: horse(|1¦s)|(4¦)foal(|1¦s) + pattern: zombie(|1¦s)|(4¦)zombie (kid(|1¦s)|chiwd(|1¦wen)) + xp-owb: + name: expewience owb¦s @an + pattern: ([e]xp|expewience)( |-)owb(|1¦s) + fowmat: %2$s-%1$s + fiwewowk: + name: fiwewowk wocket¦s + pattern: fiwewowk(|1¦s) [wocket(|1¦s)] + fawwing bwock: + name: fawwing bwock¦s + pattern: fawwing (bwock(|1¦s)|(2¦)%-itemtype%) + adjective: fawwing + not a block error: Fawwing bwocks must be bwocks, not items + thwown potion: + name: thwown potion¦s + pattern: thwown (potion(|1¦s)|(2¦)%-itemtypes%) + adjective: thwown + dwopped item: + name: dwopped item¦s + pattern: dwopped (item(|1¦s)|(2¦)%-itemtypes%)|item entit(y|1¦ies) + adjective: dwopped + howse: + name: howse¦s + pattern: howse(|1¦s)|(4¦)foaw(|1¦s) donkey: name: donkey¦s pattern: donkey(|1¦s) - mule: - name: mule¦s - pattern: mule(|1¦s) - chested horse: - name: chested horse¦s - pattern: chested horse(|1¦s) - undead horse: - name: undead horse¦s @an - pattern: (zombie|undead) horse(|1¦s)|(zombie|undead) horse(|1¦s)|(zombie|undead) (4¦)foal(|1¦s) - skeleton horse: - name: skeleton horse¦s - pattern: skeleton horse(|1¦s)|skeleton horse(|1¦s)|skeleton (4¦)foal(|1¦s) - any horse: - name: any horse¦s - pattern: any horse(|1¦s)|(4¦)foal(|1¦s) - llama: - name: llama¦s - pattern: llama(|1¦s)| llama (4¦)cria(|1¦s) - creamy llama: - name: creamy llama¦s - pattern: creamy llama(|1¦s)| creamy llama (4¦)cria(|1¦s) - white llama: - name: white llama¦s - pattern: white llama(|1¦s)| white llama (4¦)cria(|1¦s) - brown llama: - name: brown llama¦s - pattern: brown llama(|1¦s)| brown llama (4¦)cria(|1¦s) - gray llama: - name: gray llama¦s - pattern: gray llama(|1¦s)| gray llama (4¦)cria(|1¦s) - trader llama: - name: trader llama¦s - pattern: trader llama(|1¦s)| trader llama (4¦)cria(|1¦s) - creamy trader llama: - name: creamy trader llama¦s - pattern: creamy trader llama(|1¦s)| creamy trader llama (4¦)cria(|1¦s) - white trader llama: - name: white trader llama¦s - pattern: white trader llama(|1¦s)| white trader llama (4¦)cria(|1¦s) - brown trader llama: - name: brown trader llama¦s - pattern: brown trader llama(|1¦s)| brown trader llama (4¦)cria(|1¦s) - gray trader llama: - name: gray trader llama¦s - pattern: gray trader llama(|1¦s)| gray trader llama (4¦)cria(|1¦s) - llama spit: - name: llama spit¦s - pattern: llama spit(|1¦s) - elder guardian: - name: elder guardian¦s - pattern: elder guardian(|1¦s) - guardian: - name: guardian¦s - pattern: guardian(|1¦s) - normal guardian: - name: normal guardian¦s - pattern: normal guardian(|1¦s) - rabbit: - name: rabbit¦s - pattern: rabbit(|1¦s)|rabbit (|1¦s) - brown rabbit: - name: brown rabbit¦s - pattern: brown rabbit(|1¦s)|brown rabbit (|1¦s) - black and white rabbit: - name: black and white rabbit¦s - pattern: black [and] white rabbit(|1¦s)|black [and] white rabbit (|1¦s) - white rabbit: - name: white rabbit¦s - pattern: white rabbit(|1¦s)|white rabbit (|1¦s) - black rabbit: - name: black rabbit¦s - pattern: black rabbit(|1¦s)|black rabbit (|1¦s) - gold rabbit: - name: gold rabbit¦s - pattern: gold rabbit(|1¦s)|gold rabbit (|1¦s) - salt and pepper rabbit: - name: salt and pepper rabbit¦s - pattern: salt [and] pepper rabbit(|1¦s)|salt [and] pepper rabbit (|1¦s) - killer rabbit: - name: killer rabbit¦s - pattern: killer rabbit(|1¦s)|killer rabbit (|1¦s) + muwe: + name: muwe¦s + pattern: muwe(|1¦s) + chested howse: + name: chested howse¦s + pattern: chested howse(|1¦s) + undead howse: + name: undead howse¦s @an + pattern: (zombie|undead) howse(|1¦s)|(zombie|undead) howse(|1¦s)|(zombie|undead) (4¦)foaw(|1¦s) + skeweton howse: + name: skeweton howse¦s + pattern: skeweton howse(|1¦s)|skeweton howse(|1¦s)|skeweton (4¦)foaw(|1¦s) + any howse: + name: any howse¦s + pattern: any howse(|1¦s)|(4¦)foaw(|1¦s) + wwama: + name: wwama¦s + pattern: wwama(|1¦s)| wwama (4¦)cwia(|1¦s) + cweamy wwama: + name: cweamy wwama¦s + pattern: cweamy wwama(|1¦s)| cweamy wwama (4¦)cwia(|1¦s) + white wwama: + name: white wwama¦s + pattern: white wwama(|1¦s)| white wwama (4¦)cwia(|1¦s) + bwown wwama: + name: bwown wwama¦s + pattern: bwown wwama(|1¦s)| bwown wwama (4¦)cwia(|1¦s) + gway wwama: + name: gway wwama¦s + pattern: gway wwama(|1¦s)| gway wwama (4¦)cwia(|1¦s) + twadew wwama: + name: twadew wwama¦s + pattern: twadew wwama(|1¦s)| twadew wwama (4¦)cwia(|1¦s) + cweamy twadew wwama: + name: cweamy twadew wwama¦s + pattern: cweamy twadew wwama(|1¦s)| cweamy twadew wwama (4¦)cwia(|1¦s) + white twadew wwama: + name: white twadew wwama¦s + pattern: white twadew wwama(|1¦s)| white twadew wwama (4¦)cwia(|1¦s) + bwown twadew wwama: + name: bwown twadew wwama¦s + pattern: bwown twadew wwama(|1¦s)| bwown twadew wwama (4¦)cwia(|1¦s) + gway twadew wwama: + name: gway twadew wwama¦s + pattern: gway twadew wwama(|1¦s)| gway twadew wwama (4¦)cwia(|1¦s) + wwama spit: + name: wwama spit¦s + pattern: wwama spit(|1¦s) + ewdew guawdian: + name: ewdew guawdian¦s + pattern: ewdew guawdian(|1¦s) + guawdian: + name: guawdian¦s + pattern: guawdian(|1¦s) + nowmaw guawdian: + name: nowmaw guawdian¦s + pattern: nowmaw guawdian(|1¦s) + wabbit: + name: wabbit¦s + pattern: wabbit(|1¦s)|wabbit (|1¦s) + bwown wabbit: + name: bwown wabbit¦s + pattern: bwown wabbit(|1¦s)|bwown wabbit (|1¦s) + bwack and white wabbit: + name: bwack and white wabbit¦s + pattern: bwack [and] white wabbit(|1¦s)|bwack [and] white wabbit (|1¦s) + white wabbit: + name: white wabbit¦s + pattern: white wabbit(|1¦s)|white wabbit (|1¦s) + bwack wabbit: + name: bwack wabbit¦s + pattern: bwack wabbit(|1¦s)|bwack wabbit (|1¦s) + gowd wabbit: + name: gowd wabbit¦s + pattern: gowd wabbit(|1¦s)|gowd wabbit (|1¦s) + sawt and peppew wabbit: + name: sawt and peppew wabbit¦s + pattern: sawt [and] peppew wabbit(|1¦s)|sawt [and] peppew wabbit (|1¦s) + kiwwew wabbit: + name: kiwwew wabbit¦s + pattern: kiwwew wabbit(|1¦s)|kiwwew wabbit (|1¦s) fish hook: name: fish hook¦s pattern: fish[ ]hook(|1¦s) - armor stand: - name: armor stand¦s - pattern: armor stand(|1¦s) - endermite: - name: endermite¦s - pattern: endermite(|1¦s) - stray: - name: stray¦s - pattern: stray(|1¦s) - golem: - name: golem¦s - pattern: golem(|1¦s) - shulker: - name: shulker¦s - pattern: shulker(|1¦s) - shulker bullet: - name: shulker bullet¦s - pattern: shulker bullet(|1¦s) - polar bear: - name: polar bear¦s - pattern: polar bear(|1¦s) - area effect cloud: - name: area effect cloud¦s - pattern: area effect cloud(|1¦s) + awmow stand: + name: awmow stand¦s + pattern: awmow stand(|1¦s) + endewmite: + name: endewmite¦s + pattern: endewmite(|1¦s) + stway: + name: stway¦s + pattern: stway(|1¦s) + gowem: + name: gowem¦s + pattern: gowem(|1¦s) + shuwkew: + name: shuwkew¦s + pattern: shuwkew(|1¦s) + shuwkew buwwet: + name: shuwkew buwwet¦s + pattern: shuwkew buwwet(|1¦s) + powaw beaw: + name: powaw beaw¦s + pattern: powaw beaw(|1¦s) + awea effect cwoud: + name: awea effect cwoud¦s + pattern: awea effect cwoud(|1¦s) husk: name: husk¦s pattern: husk(|1¦s) - zombie villager: - name: zombie villager¦s - pattern: zombie villager(|1¦s) - zombie farmer: - name: zombie farmer¦s - pattern: zombie farmer(|1¦s) - zombie librarian: - name: zombie librarian¦s - pattern: zombie librarian(|1¦s) - zombie priest: - name: zombie priest¦s - pattern: zombie priest(|1¦s) - zombie blacksmith: - name: zombie blacksmith¦s - pattern: zombie blacksmith(|1¦s) - zombie butcher: - name: zombie butcher¦s - pattern: zombie butcher(|1¦s) + zombie viwwagew: + name: zombie viwwagew¦s + pattern: zombie viwwagew(|1¦s) + zombie fawmew: + name: zombie fawmew¦s + pattern: zombie fawmew(|1¦s) + zombie wibwawian: + name: zombie wibwawian¦s + pattern: zombie wibwawian(|1¦s) + zombie pwiest: + name: zombie pwiest¦s + pattern: zombie pwiest(|1¦s) + zombie bwacksmith: + name: zombie bwacksmith¦s + pattern: zombie bwacksmith(|1¦s) + zombie butchew: + name: zombie butchew¦s + pattern: zombie butchew(|1¦s) zombie nitwit: name: zombie nitwit¦s pattern: zombie nitwit(|1¦s) - zombie armorer: - name: zombie armorer¦s - pattern: zombie armorer(|1¦s) - zombie cartographer: - name: zombie cartographer¦s - pattern: zombie cartographer(|1¦s) - zombie cleric: - name: zombie cleric¦s - pattern: zombie cleric(|1¦s) - zombie fisherman: - name: zombie fisher¦man¦men - pattern: zombie fisherm(an|1¦en) - zombie fletcher: - name: zombie fletcher¦s - pattern: zombie fletcher(|1¦s) - zombie leatherworker: - name: zombie leatherworker¦s - pattern: zombie leatherworker(|1¦s) + zombie awmowew: + name: zombie awmowew¦s + pattern: zombie awmowew(|1¦s) + zombie cawtogwaphew: + name: zombie cawtogwaphew¦s + pattern: zombie cawtogwaphew(|1¦s) + zombie cwewic: + name: zombie cwewic¦s + pattern: zombie cwewic(|1¦s) + zombie fishewman: + name: zombie fishew¦man¦men + pattern: zombie fishewm(an|1¦en) + zombie fwetchew: + name: zombie fwetchew¦s + pattern: zombie fwetchew(|1¦s) + zombie weathewwowkew: + name: zombie weathewwowkew¦s + pattern: zombie weathewwowkew(|1¦s) zombie mason: name: zombie mason¦s pattern: zombie mason(|1¦s) - zombie shepherd: - name: zombie shepherd¦s - pattern: zombie shepherd(|1¦s) - zombie toolsmith: - name: zombie toolsmith¦s - pattern: zombie toolsmith(|1¦s) + zombie shephewd: + name: zombie shephewd¦s + pattern: zombie shephewd(|1¦s) + zombie toowsmith: + name: zombie toowsmith¦s + pattern: zombie toowsmith(|1¦s) zombie weaponsmith: name: zombie weaponsmith¦s pattern: zombie weaponsmith(|1¦s) - evoker: - name: evoker¦s - pattern: evoker(|1¦s) - evoker fangs: - name: evoker fangs - pattern: evoker fangs - illusioner: - name: illusioner¦s - pattern: illusioner(|1¦s) + evokew: + name: evokew¦s + pattern: evokew(|1¦s) + evokew fangs: + name: evokew fangs + pattern: evokew fangs + iwwusionew: + name: iwwusionew¦s + pattern: iwwusionew(|1¦s) vex: name: vex¦es pattern: vex(|1¦es) - vindicator: - name: vindicator¦s - pattern: vindicator(|1¦s) - illager: - name: illager¦s - pattern: illager(|1¦s) - spellcaster: - name: spellcaster¦s - pattern: spellcaster(|1¦s) - parrot: - name: parrot¦s - pattern: parrot(|1¦s) - red parrot: - name: red parrot¦s - pattern: red parrot(|1¦s) - blue parrot: - name: blue parrot¦s - pattern: blue parrot(|1¦s) - green parrot: - name: green parrot¦s - pattern: green parrot(|1¦s) - cyan parrot: - name: cyan parrot¦s - pattern: cyan parrot(|1¦s) - gray parrot: - name: gray parrot¦s - pattern: gray parrot(|1¦s) - monster: - name: monster¦s - pattern: monster(|1¦s) + vindicatow: + name: vindicatow¦s + pattern: vindicatow(|1¦s) + iwwagew: + name: iwwagew¦s + pattern: iwwagew(|1¦s) + spewwcastew: + name: spewwcastew¦s + pattern: spewwcastew(|1¦s) + pawwot: + name: pawwot¦s + pattern: pawwot(|1¦s) + wed pawwot: + name: wed pawwot¦s + pattern: wed pawwot(|1¦s) + bwue pawwot: + name: bwue pawwot¦s + pattern: bwue pawwot(|1¦s) + gween pawwot: + name: gween pawwot¦s + pattern: gween pawwot(|1¦s) + cyan pawwot: + name: cyan pawwot¦s + pattern: cyan pawwot(|1¦s) + gway pawwot: + name: gway pawwot¦s + pattern: gway pawwot(|1¦s) + monstew: + name: monstew¦s + pattern: monstew(|1¦s) mob: name: mob¦s pattern: mob(|1¦s) - animal: - name: animal¦s - pattern: animal(|1¦s) - damageable: - name: damageable mob¦s - pattern: damageable mob(|1¦s) - water mob: - name: water mob¦s - pattern: water mob(|1¦s) + animaw: + name: animaw¦s + pattern: animaw(|1¦s) + damageabwe: + name: damageabwe mob¦s + pattern: damageabwe mob(|1¦s) + watew mob: + name: watew mob¦s + pattern: watew mob(|1¦s) cod: name: cod¦s pattern: cod(|1¦s) - salmon: - name: salmon¦s - pattern: salmon(|1¦s) - puffer fish: - name: puffer fish¦es - pattern: puffer fish(|1¦es) - tropical fish: - name: tropical fish¦es - pattern: tropical fish(|1¦es) - drowned: - name: drowned¦s - pattern: drowned(|1¦s)|(4¦)drowned (kid(|1¦s)|child(|1¦ren)) - dolphin: - name: dolphin¦s - pattern: dolphin(|1¦s) + sawmon: + name: sawmon¦s + pattern: sawmon(|1¦s) + puffew fish: + name: puffew fish¦es + pattern: puffew fish(|1¦es) + twopicaw fish: + name: twopicaw fish¦es + pattern: twopicaw fish(|1¦es) + dwowned: + name: dwowned¦s + pattern: dwowned(|1¦s)|(4¦)dwowned (kid(|1¦s)|chiwd(|1¦wen)) + dowphin: + name: dowphin¦s + pattern: dowphin(|1¦s) phantom: name: phantom¦s pattern: phantom(|1¦s) - turtle: - name: turtle¦s - pattern: turtle(|1¦s)|(4¦)turtle (kid(|1¦s)|child(|1¦ren)) - trident: - name: trident¦s - pattern: trident(|1¦s) - leash hitch: - name: leash hitch¦es - pattern: leash hitch(|1¦es) + tuwtwe: + name: tuwtwe¦s + pattern: tuwtwe(|1¦s)|(4¦)tuwtwe (kid(|1¦s)|chiwd(|1¦wen)) + twident: + name: twident¦s + pattern: twident(|1¦s) + weash hitch: + name: weash hitch¦es + pattern: weash hitch(|1¦es) #1.14 entities fox: name: fox¦es - pattern: fox(|1¦es)|(4¦)fox (kid(|1¦s)|child(|1¦ren)) - red fox: - name: red fox¦es - pattern: red fox(|1¦es)|(4¦)fox (kid(|1¦s)|child(|1¦ren)) + pattern: fox(|1¦es)|(4¦)fox (kid(|1¦s)|chiwd(|1¦wen)) + wed fox: + name: wed fox¦es + pattern: wed fox(|1¦es)|(4¦)fox (kid(|1¦s)|chiwd(|1¦wen)) snow fox: name: snow fox¦es - pattern: snow fox(|1¦es)|(4¦)fox (kid(|1¦s)|child(|1¦ren)) - pillager: - name: pillager¦s - pattern: pillager(|1¦s) - ravager: - name: ravager¦s - pattern: ravager(|1¦s) - wandering trader: - name: wandering trader¦s - pattern: wandering trader(|1¦s)|(4¦)wandering trader (kid(|1¦s)|child(|1¦ren)) //supposed to be ageable, but not working, spigot bug? - raider: - name: raider¦s - pattern: raider(|1¦s) + pattern: snow fox(|1¦es)|(4¦)fox (kid(|1¦s)|chiwd(|1¦wen)) + piwwagew: + name: piwwagew¦s + pattern: piwwagew(|1¦s) + wavagew: + name: wavagew¦s + pattern: wavagew(|1¦s) + wandewing twadew: + name: wandewing twadew¦s + pattern: wandewing twadew(|1¦s)|(4¦)wandewing twadew (kid(|1¦s)|chiwd(|1¦wen)) //supposed to be ageabwe, but not wowking, spigot bug? + waidew: + name: waidew¦s + pattern: waidew(|1¦s) panda: name: panda¦s pattern: [%-gene%[%-gene%]] panda(|1¦s) #1.15 entity - no nectar bee: - name: no nectar bee¦s - pattern: bee(|1¦s) without nectar + no nectaw bee: + name: no nectaw bee¦s + pattern: bee(|1¦s) without nectaw happy bee: name: happy bee¦s pattern: happy bee(|1¦s) bee: name: bee¦s pattern: bee(|1¦s) - nectar bee: - name: nectar bee¦s - pattern: bee(|1¦s) with nectar - angry bee: - name: angry bee¦s - pattern: angry bee(|1¦s) - angry nectar bee: - name: angry nectar bee¦s - pattern: angry bee(|1¦s) with nectar + nectaw bee: + name: nectaw bee¦s + pattern: bee(|1¦s) with nectaw + angwy bee: + name: angwy bee¦s + pattern: angwy bee(|1¦s) + angwy nectaw bee: + name: angwy nectaw bee¦s + pattern: angwy bee(|1¦s) with nectaw #1.16 entities - piglin: - name: piglin¦s - pattern: piglin(|1¦s)|(4¦)piglin (kid(|1¦s)|child(|1¦ren)) - hoglin: - name: hoglin¦s - pattern: hoglin(|1¦s)|(4¦)hoglin (kid(|1¦s)|child(|1¦ren)) - zoglin: - name: zoglin¦s - pattern: zoglin(|1¦s)|(4¦)zoglin (kid(|1¦s)|child(|1¦ren)) - strider: - name: strider¦s - pattern: strider(|1¦s)|(4¦)strider (kid(|1¦s)|child(|1¦ren)) + pigwin: + name: pigwin¦s + pattern: pigwin(|1¦s)|(4¦)pigwin (kid(|1¦s)|chiwd(|1¦wen)) + hogwin: + name: hogwin¦s + pattern: hogwin(|1¦s)|(4¦)hogwin (kid(|1¦s)|chiwd(|1¦wen)) + zogwin: + name: zogwin¦s + pattern: zogwin(|1¦s)|(4¦)zogwin (kid(|1¦s)|chiwd(|1¦wen)) + stwidew: + name: stwidew¦s + pattern: stwidew(|1¦s)|(4¦)stwidew (kid(|1¦s)|chiwd(|1¦wen)) #1.16.2 entity - piglin brute: - name: piglin brute¦s - pattern: piglin brute(|1¦s)|(4¦)piglin brute (kid(|1¦s)|child(|1¦ren)) + pigwin bwute: + name: pigwin bwute¦s + pattern: pigwin bwute(|1¦s)|(4¦)pigwin bwute (kid(|1¦s)|chiwd(|1¦wen)) #1.17 entities goat: name: goat¦s - pattern: goat(|1¦s)|(4¦)goat (kid(|1¦s)|child(|1¦ren)) - screaming goat: + pattern: goat(|1¦s)|(4¦)goat (kid(|1¦s)|chiwd(|1¦wen)) + scweaming goat: name: goat¦s - pattern: screaming goat(|1¦s)|(4¦)screaming goat (kid(|1¦s)|child(|1¦ren)) + pattern: scweaming goat(|1¦s)|(4¦)scweaming goat (kid(|1¦s)|chiwd(|1¦wen)) quiet goat: name: goat¦s - pattern: quiet goat(|1¦s)|(4¦)quiet goat (kid(|1¦s)|child(|1¦ren)) - glow squid: - name: glow squid¦s - pattern: glow squid(|1¦s) - axolotl: - name: axolotl¦s @an - pattern: axolotl(|1¦s)|(4¦)axolotl (kid(|1¦s)|child(|1¦ren)) - lucy axolotl: - name: axolotl¦s - pattern: lucy axolotl(|1¦s)|(4¦)lucy axolotl (kid(|1¦s)|child(|1¦ren)) - wild axolotl: - name: axolotl¦s - pattern: wild axolotl(|1¦s)|(4¦)wild axolotl (kid(|1¦s)|child(|1¦ren)) - gold axolotl: - name: axolotl¦s - pattern: gold axolotl(|1¦s)|(4¦)gold axolotl (kid(|1¦s)|child(|1¦ren)) - cyan axolotl: - name: axolotl¦s - pattern: cyan axolotl(|1¦s)|(4¦)cyan axolotl (kid(|1¦s)|child(|1¦ren)) - blue axolotl: - name: axolotl¦s - pattern: blue axolotl(|1¦s)|(4¦)blue axolotl (kid(|1¦s)|child(|1¦ren)) - marker: - name: marker¦s - pattern: marker(|1¦s) - glow item frame: - name: glow item frame¦s - pattern: glow item[ ]frame(|1¦s) + pattern: quiet goat(|1¦s)|(4¦)quiet goat (kid(|1¦s)|chiwd(|1¦wen)) + gwow squid: + name: gwow squid¦s + pattern: gwow squid(|1¦s) + axowotw: + name: axowotw¦s @an + pattern: axowotw(|1¦s)|(4¦)axowotw (kid(|1¦s)|chiwd(|1¦wen)) + wucy axowotw: + name: axowotw¦s + pattern: wucy axowotw(|1¦s)|(4¦)wucy axowotw (kid(|1¦s)|chiwd(|1¦wen)) + wiwd axowotw: + name: axowotw¦s + pattern: wiwd axowotw(|1¦s)|(4¦)wiwd axowotw (kid(|1¦s)|chiwd(|1¦wen)) + gowd axowotw: + name: axowotw¦s + pattern: gowd axowotw(|1¦s)|(4¦)gowd axowotw (kid(|1¦s)|chiwd(|1¦wen)) + cyan axowotw: + name: axowotw¦s + pattern: cyan axowotw(|1¦s)|(4¦)cyan axowotw (kid(|1¦s)|chiwd(|1¦wen)) + bwue axowotw: + name: axowotw¦s + pattern: bwue axowotw(|1¦s)|(4¦)bwue axowotw (kid(|1¦s)|chiwd(|1¦wen)) + mawkew: + name: mawkew¦s + pattern: mawkew(|1¦s) + gwow item fwame: + name: gwow item fwame¦s + pattern: gwow item[ ]fwame(|1¦s) # 1.19 Entities chest boat: name: chest boat¦s @@ -1179,75 +1179,75 @@ entities: oak chest boat: name: oak chest boat¦s pattern: oak chest boat(|1¦s) - spruce chest boat: - name: spruce chest boat¦s - pattern: spruce chest boat(|1¦s) - birch chest boat: - name: birch chest boat¦s - pattern: birch chest boat(|1¦s) - jungle chest boat: - name: jungle chest boat¦s - pattern: jungle chest boat(|1¦s) + spwuce chest boat: + name: spwuce chest boat¦s + pattern: spwuce chest boat(|1¦s) + biwch chest boat: + name: biwch chest boat¦s + pattern: biwch chest boat(|1¦s) + jungwe chest boat: + name: jungwe chest boat¦s + pattern: jungwe chest boat(|1¦s) acacia chest boat: name: acacia chest boat¦s pattern: acacia chest boat(|1¦s) - dark oak chest boat: - name: dark oak chest boat¦s - pattern: dark oak chest boat(|1¦s) - frog: - name: frog¦s - pattern: frog(|1¦s)|(4¦)frog (kid(|1¦s)|child(|1¦ren)) - temperate frog: - name: temperate frog¦s - pattern: temperate frog(|1¦s)|(4¦)temperate frog (kid(|1¦s)|child(|1¦ren)) - warm frog: - name: warm frog¦s - pattern: warm frog(|1¦s)|(4¦)warm frog (kid(|1¦s)|child(|1¦ren)) - cold frog: - name: cold frog¦s - pattern: cold frog(|1¦s)|(4¦)cold frog (kid(|1¦s)|child(|1¦ren)) - allay: - name: allay¦s - pattern: allay(|1¦s) - tadpole: - name: tadpole¦s - pattern: tadpole(|1¦s) - warden: - name: warden¦s - pattern: warden(|1¦s) + dawk oak chest boat: + name: dawk oak chest boat¦s + pattern: dawk oak chest boat(|1¦s) + fwog: + name: fwog¦s + pattern: fwog(|1¦s)|(4¦)fwog (kid(|1¦s)|chiwd(|1¦wen)) + tempewate fwog: + name: tempewate fwog¦s + pattern: tempewate fwog(|1¦s)|(4¦)tempewate fwog (kid(|1¦s)|chiwd(|1¦wen)) + wawm fwog: + name: wawm fwog¦s + pattern: wawm fwog(|1¦s)|(4¦)wawm fwog (kid(|1¦s)|chiwd(|1¦wen)) + cowd fwog: + name: cowd fwog¦s + pattern: cowd fwog(|1¦s)|(4¦)cowd fwog (kid(|1¦s)|chiwd(|1¦wen)) + awway: + name: awway¦s + pattern: awway(|1¦s) + tadpowe: + name: tadpowe¦s + pattern: tadpowe(|1¦s) + wawden: + name: wawden¦s + pattern: wawden(|1¦s) # 1.19.3 Entities enemy: name: enem¦y¦ies @an pattern: enem(y|1¦ies) - camel: - name: camel¦s - pattern: camel(|1¦s) + camew: + name: camew¦s + pattern: camew(|1¦s) # 1.19.4 Entities - sniffer: - name: sniffer¦s - pattern: sniffer(|1¦s) - interaction: - name: interaction¦s - pattern: interaction(|1¦s) - display: - name: display¦s - pattern: display(|1¦s) - block display: - name: block display¦s - pattern: block display(|1¦s) - item display: - name: item display¦s - pattern: item display(|1¦s) - text display: - name: text display¦s - pattern: text display(|1¦s) + sniffew: + name: sniffew¦s + pattern: sniffew(|1¦s) + intewaction: + name: intewaction¦s + pattern: intewaction(|1¦s) + dispway: + name: dispway¦s + pattern: dispway(|1¦s) + bwock dispway: + name: bwock dispway¦s + pattern: bwock dispway(|1¦s) + item dispway: + name: item dispway¦s + pattern: item dispway(|1¦s) + text dispway: + name: text dispway¦s + pattern: text dispway(|1¦s) # 1.20.3 Entities - breeze: - name: breeze¦s - pattern: breeze(|1¦s) - wind charge: - name: wind charge¦s - pattern: wind charge(|1¦s) + bweeze: + name: bweeze¦s + pattern: bweeze(|1¦s) + wind chawge: + name: wind chawge¦s + pattern: wind chawge(|1¦s) # -- Heal Reasons -- heal reasons: @@ -1746,7 +1746,7 @@ visual effects: shriek: name: shriek @- pattern: shriek - + # 1.19.4 particles dripping_cherry_leaves: name: dripping cherry leaves @- @@ -2001,84 +2001,84 @@ operators: types: # Java object: object¦s @an - number: number¦s @a - integer: integer¦s @an - long: integer¦s @an - short: integer¦s @an - byte: integer¦s @an - double: number¦s @a - float: number¦s @a - boolean: boolean¦ (yes/no)¦s (yes/no) @a - string: text¦s @a + numbew: numbew¦s @a + integew: integew¦s @an + wong: integew¦s @an + showt: integew¦s @an + byte: integew¦s @an + doubwe: numbew¦s @a + fwoat: numbew¦s @a + boowean: boowean¦ (yes/no)¦s (yes/no) @a + stwing: text¦s @a chunk: chunk¦s @a # Bukkit entity: entit¦y¦ies @an - livingentity: living entit¦y¦ies @a - projectile: projectile¦s @a - block: block¦s @a - location: location¦s @a - world: world¦s @a - inventory: inventor¦y¦ies @an - player: player¦s @a - offlineplayer: offline player¦s @a - commandsender: command sender¦s @a - inventoryholder: inventory holder¦s @an + wivingentity: wiving entit¦y¦ies @a + pwojectiwe: pwojectiwe¦s @a + bwock: bwock¦s @a + wocation: wocation¦s @a + wowwd: wowwd¦s @a + inventowy: inventow¦y¦ies @an + pwayew: pwayew¦s @a + offwinepwayew: offwine pwayew¦s @a + commandsendew: command sendew¦s @a + inventowyhowdew: inventowy howdew¦s @an gamemode: gamemode¦s @a - material: material¦s @a + matewiaw: matewiaw¦s @a itemstack: item stack¦s @an - itementity: dropped item¦s @a # same as entities.dropped item.name + itementity: dwopped item¦s @a # same as entities.dwopped item.name biome: biome¦s @a potioneffecttype: potion¦s @a potioneffect: potion effect¦s @a enchantment: enchantment¦s @an damagecause: damage cause¦s @a - teleportcause: teleport cause¦s @a - inventoryaction: inventory action¦s @a - clicktype: click type¦s @a - vector: vector¦s @a - inventorytype: inventory type¦s @an - metadataholder: metadata holder¦s @a - spawnreason: spawn reason¦s @a - cachedservericon: server icon¦s @a - difficulty: difficult¦y¦ies @a - fireworkeffect: firework effect¦s @a - fireworktype: firework type¦s @a - soundcategory: sound categor¦y¦ies @a - blockdata: block data¦s @a - healreason: heal reason¦s @a + tewepowtcause: tewepowt cause¦s @a + inventowyaction: inventowy action¦s @a + cwicktype: cwick type¦s @a + vectow: vectow¦s @a + inventowytype: inventowy type¦s @an + metadatahowdew: metadata howdew¦s @a + spawnweason: spawn weason¦s @a + cachedsewvewicon: sewvew icon¦s @a + difficuwty: difficuwt¦y¦ies @a + fiwewowkeffect: fiwewowk effect¦s @a + fiwewowktype: fiwewowk type¦s @a + soundcategowy: sound categow¦y¦ies @a + bwockdata: bwock data¦s @a + heawweason: heaw weason¦s @a cattype: cat type¦s @a - gamerule: gamerule¦s @a - attributetype: attribute type¦s @a - enchantmentoffer: enchantment offer¦s @an - environment: environment¦s @an + gamewuwe: gamewuwe¦s @a + attwibutetype: attwibute type¦s @a + enchantmentoffew: enchantment offew¦s @an + enviwonment: enviwonment¦s @an moonphase: moonphase¦s @a - resourcepackstate: resource pack state¦s @a + wesouwcepackstate: wesouwce pack state¦s @a gene: panda gene¦s @a - gamerulevalue: gamerule value¦s @a - quitreason: quit reason¦s @a - inventoryclosereason: inventory close reason¦s @an - transformreason: transform reason¦s @a + gamewuwevawue: gamewuwe vawue¦s @a + quitweason: quit weason¦s @a + inventowycwoseweason: inventowy cwose weason¦s @an + twansfowmweason: twansfowm weason¦s @a - # Skript - weathertype: weather type¦s @a + # Skwipt + weathewtype: weathew type¦s @a entitytype: entity type¦s @an entitydata: entity type¦s @an itemtype: item type¦s @an time: time¦s @a timespan: time span¦s @a - timeperiod: time period¦s @a + timepewiod: time pewiod¦s @a date: date¦s @a - direction: direction¦s @a - slot: slot¦s @a - color: color¦s @a - structuretype: tree type¦s @a + diwection: diwection¦s @a + swot: swot¦s @a + cowow: cowow¦s @a + stwuctuwetype: twee type¦s @a enchantmenttype: enchantment type¦s @an - experience: experience point¦s @an - experience.pattern: (e?xp|experience( points?)?) - classinfo: type¦s @a - visualeffect: visual effect¦s @a + expewience: expewience point¦s @an + expewience.pattewn: (e?xp|expewience( points?)?) + cwassinfo: type¦s @a + visuaweffect: visuaw effect¦s @a # Hooks money: money - region: region¦s + wegion: wegion¦s From 4a8f32d7d892f03d8c78c4071dbc8fa53d0b1c7f Mon Sep 17 00:00:00 2001 From: sovde <10354869+sovdeeth@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:03:16 +0100 Subject: [PATCH 08/13] fix a lot of logging/error messages and lang nodes --- .../java/ch/njol/skript/ScriptLoader.java | 50 ++-- src/main/java/ch/njol/skript/Skript.java | 190 ++++++------- .../ch/njol/skript/SkriptAPIException.java | 6 +- src/main/java/ch/njol/skript/SkriptAddon.java | 4 +- .../ch/njol/skript/SkriptEventHandler.java | 12 +- .../java/ch/njol/skript/SkriptUpdater.java | 8 +- .../java/ch/njol/skript/aliases/Aliases.java | 8 +- .../ch/njol/skript/aliases/AliasesParser.java | 6 +- .../java/ch/njol/skript/aliases/ItemData.java | 2 +- .../java/ch/njol/skript/aliases/ItemType.java | 4 +- .../njol/skript/bukkitutil/BukkitUnsafe.java | 4 +- .../njol/skript/bukkitutil/BurgerHelper.java | 4 +- .../skript/bukkitutil/CommandReloader.java | 2 +- .../njol/skript/bukkitutil/HealthUtils.java | 2 +- .../skript/bukkitutil/PassengerUtils.java | 4 +- .../bukkitutil/block/NewBlockCompat.java | 6 +- .../ch/njol/skript/classes/ClassInfo.java | 6 +- .../skript/classes/data/BukkitClasses.java | 10 +- .../skript/classes/data/DefaultFunctions.java | 18 +- .../skript/classes/data/SkriptClasses.java | 10 +- .../java/ch/njol/skript/command/Argument.java | 4 +- .../java/ch/njol/skript/command/Commands.java | 2 +- .../ch/njol/skript/command/ScriptCommand.java | 4 +- .../njol/skript/conditions/CondCompare.java | 2 +- .../ch/njol/skript/conditions/CondDate.java | 2 +- .../conditions/CondHasItemCooldown.java | 2 +- .../conditions/CondHasResourcePack.java | 2 +- .../skript/conditions/CondIncendiary.java | 2 +- .../CondIsBlockRedstonePowered.java | 4 +- .../njol/skript/conditions/CondIsJumping.java | 2 +- .../njol/skript/conditions/CondIsOfType.java | 2 +- .../conditions/CondIsPluginEnabled.java | 4 +- .../njol/skript/conditions/CondIsSheared.java | 4 +- .../skript/conditions/CondIsTransparent.java | 2 +- .../njol/skript/conditions/CondIsWithin.java | 2 +- .../skript/conditions/CondPlayedBefore.java | 10 +- .../skript/conditions/CondResourcePack.java | 2 +- src/main/java/ch/njol/skript/config/Node.java | 4 +- .../ch/njol/skript/config/SectionNode.java | 4 +- .../njol/skript/effects/EffCancelDrops.java | 2 +- .../ch/njol/skript/effects/EffChange.java | 6 +- .../ch/njol/skript/effects/EffCommand.java | 2 +- .../ch/njol/skript/effects/EffContinue.java | 2 +- .../java/ch/njol/skript/effects/EffDoIf.java | 4 +- .../java/ch/njol/skript/effects/EffEquip.java | 2 +- .../java/ch/njol/skript/effects/EffExit.java | 2 +- .../ch/njol/skript/effects/EffHandedness.java | 2 +- .../ch/njol/skript/effects/EffHealth.java | 2 +- .../ch/njol/skript/effects/EffIncendiary.java | 2 +- .../ch/njol/skript/effects/EffInvisible.java | 2 +- .../java/ch/njol/skript/effects/EffKill.java | 2 +- .../ch/njol/skript/effects/EffMakeSay.java | 2 +- .../ch/njol/skript/effects/EffMessage.java | 6 +- .../skript/effects/EffPlayerVisibility.java | 4 +- .../ch/njol/skript/effects/EffRespawn.java | 2 +- .../ch/njol/skript/effects/EffReturn.java | 6 +- .../skript/effects/EffSendBlockChange.java | 2 +- .../skript/effects/EffSendResourcePack.java | 2 +- .../java/ch/njol/skript/effects/EffShear.java | 4 +- .../ch/njol/skript/effects/EffSwingHand.java | 2 +- .../ch/njol/skript/effects/EffTeleport.java | 6 +- .../java/ch/njol/skript/effects/EffTree.java | 2 +- .../ch/njol/skript/entity/EntityType.java | 2 +- .../java/ch/njol/skript/events/EvtBlock.java | 2 +- .../java/ch/njol/skript/events/EvtClick.java | 4 +- .../skript/events/EvtExperienceSpawn.java | 2 +- .../java/ch/njol/skript/events/EvtGrow.java | 2 +- .../java/ch/njol/skript/events/EvtItem.java | 8 +- .../java/ch/njol/skript/events/EvtMoveOn.java | 2 +- .../skript/events/EvtPlayerChunkEnter.java | 2 +- .../skript/events/EvtPlayerCommandSend.java | 2 +- .../events/EvtResourcePackResponse.java | 4 +- .../java/ch/njol/skript/events/EvtWorld.java | 10 +- .../ch/njol/skript/events/SimpleEvents.java | 58 ++-- .../skript/expressions/ExprActiveItem.java | 4 +- .../njol/skript/expressions/ExprAmount.java | 2 +- .../njol/skript/expressions/ExprArgument.java | 16 +- .../expressions/ExprAttackCooldown.java | 4 +- .../njol/skript/expressions/ExprAttacked.java | 4 +- .../njol/skript/expressions/ExprAttacker.java | 4 +- .../ch/njol/skript/expressions/ExprBed.java | 2 +- .../skript/expressions/ExprBlockData.java | 2 +- .../skript/expressions/ExprBlockHardness.java | 2 +- .../skript/expressions/ExprBookPages.java | 2 +- .../skript/expressions/ExprBreakSpeed.java | 2 +- .../skript/expressions/ExprCharacters.java | 4 +- .../expressions/ExprChatRecipients.java | 2 +- .../expressions/ExprClientViewDistance.java | 2 +- .../njol/skript/expressions/ExprColorOf.java | 6 +- .../njol/skript/expressions/ExprColoured.java | 4 +- .../skript/expressions/ExprCursorSlot.java | 2 +- .../skript/expressions/ExprDamagedItem.java | 2 +- .../skript/expressions/ExprDifference.java | 2 +- .../expressions/ExprEnchantingExpCost.java | 2 +- .../expressions/ExprEnchantmentBonus.java | 4 +- .../expressions/ExprEnchantmentOfferCost.java | 4 +- .../expressions/ExprEntityItemUseTime.java | 2 +- .../skript/expressions/ExprExhaustion.java | 2 +- .../expressions/ExprExplosionYield.java | 4 +- .../expressions/ExprExplosiveYield.java | 4 +- .../skript/expressions/ExprEyeLocation.java | 2 +- .../njol/skript/expressions/ExprFilter.java | 2 +- .../skript/expressions/ExprFormatDate.java | 2 +- .../skript/expressions/ExprFurnaceSlot.java | 2 +- .../skript/expressions/ExprHoverList.java | 2 +- .../njol/skript/expressions/ExprIndices.java | 2 +- .../skript/expressions/ExprInventory.java | 2 +- .../ch/njol/skript/expressions/ExprItems.java | 2 +- .../skript/expressions/ExprLevelProgress.java | 6 +- .../skript/expressions/ExprLocationOf.java | 2 +- .../ch/njol/skript/expressions/ExprMOTD.java | 2 +- .../skript/expressions/ExprMaxPlayers.java | 2 +- .../njol/skript/expressions/ExprMessage.java | 4 +- .../ch/njol/skript/expressions/ExprName.java | 4 +- .../ch/njol/skript/expressions/ExprNamed.java | 2 +- .../expressions/ExprOfflinePlayers.java | 2 +- .../expressions/ExprOnlinePlayersCount.java | 4 +- .../ch/njol/skript/expressions/ExprParse.java | 4 +- .../ch/njol/skript/expressions/ExprPing.java | 4 +- .../expressions/ExprPlayerViewDistance.java | 10 +- .../njol/skript/expressions/ExprPlugins.java | 2 +- .../expressions/ExprProtocolVersion.java | 6 +- .../expressions/ExprRandomCharacter.java | 2 +- .../njol/skript/expressions/ExprRawName.java | 2 +- .../skript/expressions/ExprRawString.java | 2 +- .../expressions/ExprRedstoneBlockPower.java | 2 +- .../expressions/ExprRespawnLocation.java | 2 +- .../expressions/ExprScoreboardTags.java | 4 +- .../skript/expressions/ExprSeaPickles.java | 4 +- .../skript/expressions/ExprShuffledList.java | 2 +- .../skript/expressions/ExprSlotIndex.java | 2 +- .../skript/expressions/ExprSortedList.java | 2 +- .../skript/expressions/ExprSubstring.java | 2 +- .../ch/njol/skript/expressions/ExprTPS.java | 4 +- .../njol/skript/expressions/ExprTarget.java | 4 +- .../skript/expressions/ExprTargetedBlock.java | 2 +- .../njol/skript/expressions/ExprTernary.java | 2 +- .../skript/expressions/ExprTimePlayed.java | 6 +- .../njol/skript/expressions/ExprTypeOf.java | 2 +- .../ch/njol/skript/expressions/ExprUUID.java | 8 +- .../skript/expressions/ExprUnixTicks.java | 2 +- .../skript/expressions/ExprValueWithin.java | 2 +- .../expressions/ExprVectorArithmetic.java | 2 +- .../njol/skript/expressions/ExprVehicle.java | 2 +- .../njol/skript/expressions/ExprVersion.java | 4 +- .../skript/expressions/ExprVersionString.java | 4 +- .../skript/expressions/ExprWhitelist.java | 2 +- .../ch/njol/skript/expressions/ExprXOf.java | 2 +- .../skript/hooks/economy/classes/Money.java | 2 +- .../permission/expressions/ExprAllGroups.java | 2 +- .../permission/expressions/ExprGroup.java | 6 +- .../hooks/regions/GriefPreventionHook.java | 2 +- .../regions/conditions/CondCanBuild.java | 2 +- .../regions/conditions/CondIsMember.java | 2 +- .../conditions/CondRegionContains.java | 2 +- .../hooks/regions/events/EvtRegionBorder.java | 2 +- .../expressions/ExprBlocksInRegion.java | 2 +- .../expressions/ExprMembersOfRegion.java | 2 +- .../hooks/regions/expressions/ExprRegion.java | 2 +- .../regions/expressions/ExprRegionsAt.java | 6 +- .../java/ch/njol/skript/lang/SkriptEvent.java | 2 +- .../ch/njol/skript/lang/VariableString.java | 4 +- .../lang/function/FunctionReference.java | 4 +- .../njol/skript/lang/function/Parameter.java | 4 +- .../skript/lang/parser/ParserInstance.java | 2 +- .../java/ch/njol/skript/log/LogEntry.java | 2 +- .../java/ch/njol/skript/log/SkriptLogger.java | 4 +- .../ch/njol/skript/sections/EffSecSpawn.java | 6 +- .../njol/skript/sections/SecConditional.java | 6 +- .../java/ch/njol/skript/sections/SecLoop.java | 2 +- .../ch/njol/skript/sections/SecWhile.java | 2 +- .../njol/skript/structures/StructOptions.java | 4 +- .../skript/structures/StructVariables.java | 4 +- .../skript/test/platform/Environment.java | 2 +- .../ch/njol/skript/test/runner/EffAssert.java | 2 +- .../ch/njol/skript/test/runner/EffDebug.java | 4 +- .../njol/skript/test/runner/EvtTestCase.java | 2 +- .../ch/njol/skript/test/runner/SecParse.java | 2 +- .../java/ch/njol/skript/util/BlockUtils.java | 2 +- .../skript/variables/FlatFileStorage.java | 4 +- .../ch/njol/skript/variables/SQLStorage.java | 2 +- .../ch/njol/skript/variables/Variables.java | 2 +- .../skript/variables/VariablesStorage.java | 2 +- src/main/resources/lang/english.lang | 250 +++++++++--------- 184 files changed, 584 insertions(+), 584 deletions(-) diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java index 3fa8c855c32..8df4ecd07d9 100644 --- a/src/main/java/ch/njol/skript/ScriptLoader.java +++ b/src/main/java/ch/njol/skript/ScriptLoader.java @@ -148,7 +148,7 @@ public int compare(Script s1, Script s2) { File f1 = s1.getConfig().getFile(); File f2 = s2.getConfig().getFile(); if (f1 == null || f2 == null) - throw new IllegalArgumentException("Scripts will null config files cannot be sorted."); + throw new IllegalArgumentException("Scwipts wiww nuww config fiwes cannot be sowted."); File f1Parent = f1.getParentFile(); File f2Parent = f2.getParentFile(); @@ -187,7 +187,7 @@ private boolean isSubDir(File directory, File subDir) { @Nullable public static Script getScript(File file) { if (!file.isFile()) - throw new IllegalArgumentException("Something other than a file was provided."); + throw new IllegalArgumentException("Something othew than a fiwe was pwovided."); for (Script script : loadedScripts) { if (file.equals(script.getConfig().getFile())) return script; @@ -203,7 +203,7 @@ public static Script getScript(File file) { */ public static Set