diff --git a/build.gradle.kts b/build.gradle.kts index eacd8e6..3073a9e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.9" + id("io.papermc.paperweight.patcher") version "1.5.11" } repositories { diff --git a/gradle.properties b/gradle.properties index 9778650..98a4eaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,12 @@ group = gg.projecteden.parchment -version = 1.20.2-R0.1-SNAPSHOT +version = 1.20.4-R0.1-SNAPSHOT -mcVersion = 1.20.2 -paperRef = f186318a91cbd3b2a2259d39cb88576989a496b8 +mcVersion = 1.20.4 +paperRef = 7e15d977ecce23ee72b059e9be292d983a336c50 edenVersion = 2.2.8-SNAPSHOT +updatingMinecraft=true + org.gradle.caching=true org.gradle.parallel=true org.gradle.vfs.watch=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..3499ded 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch index 98789d4..9981499 100644 --- a/patches/api/0001-Build-changes.patch +++ b/patches/api/0001-Build-changes.patch @@ -5,22 +5,24 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..dc6c1b155e463bc857458306e199609157af2908 100644 +index 9d817bf3f26ffd484945a00a6538970eca22ee20..fa4928487cca082a770a25f6f6490286ae397037 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -21,6 +21,7 @@ val apiAndDocs: Configuration by configurations.creating { - attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) - } - } +@@ -14,6 +14,9 @@ val bungeeCordChatVersion = "1.20-R0.1" + val adventureVersion = "4.14.0" + val slf4jVersion = "2.0.9" + val log4jVersion = "2.17.1" ++ +val edenVersion: String by project // Parchment - configurations.api { - extendsFrom(apiAndDocs) ++ + val apiAndDocs: Configuration by configurations.creating { + attributes { + attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) +@@ -27,6 +30,7 @@ configurations.api { } -@@ -46,6 +47,7 @@ dependencies { - apiAndDocs("net.kyori:adventure-text-logger-slf4j") - api("org.apache.logging.log4j:log4j-api:$log4jVersion") - api("org.slf4j:slf4j-api:$slf4jVersion") -+ api("gg.projecteden:eden-interfaces:$edenVersion") // Parchment - implementation("org.ow2.asm:asm:9.4") - implementation("org.ow2.asm:asm-commons:9.4") + dependencies { ++ api("gg.projecteden:eden-interfaces:$edenVersion") // Parchment + // api dependencies are listed transitively to API consumers + api("com.google.guava:guava:32.1.2-jre") + api("com.google.code.gson:gson:2.10.1") diff --git a/patches/api/0002-Add-Getter-interfaces.patch b/patches/api/0002-Add-Getter-interfaces.patch index 7b6c469..7234fec 100644 --- a/patches/api/0002-Add-Getter-interfaces.patch +++ b/patches/api/0002-Add-Getter-interfaces.patch @@ -60,7 +60,7 @@ index abeb24fccda2acfdb0dfdadacb8fe688bd97cf78..890069604ca78a9a3f3b4c5f40969a45 private boolean cancelled = false; @NotNull private final Location location; diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java -index 59ae7bc3a0a2079fe4b3a92d777aca682a58e4e3..b0cc7665e6591c71b7cd4388d028a5f8abd65e64 100644 +index 59ae7bc3a0a2079fe4b3a92d777aca682a58e4e3..738007be082287a1f1662f2f3b7772e818042647 100644 --- a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -20,7 +20,7 @@ import java.util.UUID; @@ -68,12 +68,12 @@ index 59ae7bc3a0a2079fe4b3a92d777aca682a58e4e3..b0cc7665e6591c71b7cd4388d028a5f8 *

WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS

*/ -public class PlayerHandshakeEvent extends Event implements Cancellable { -+public class PlayerHandshakeEvent extends Event implements Cancellable, gg.projecteden.api.interfaces.OptionalUniqueId { // Parchment ++public class PlayerHandshakeEvent extends Event implements Cancellable, gg.projecteden.api.interfaces.OptionalUniqueId { // Parchment { private static final HandlerList HANDLERS = new HandlerList(); @NotNull private final String originalHandshake; diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java -index 4dcf6242c9acc62d030a94f67b78729ed29f8c85..33550df23fea251368b16dbebad27bdcb1de2e78 100644 +index 4dcf6242c9acc62d030a94f67b78729ed29f8c85..700fa58c70612ef18b26e8160e8ad1275ad56b5a 100644 --- a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; @@ -85,20 +85,16 @@ index 4dcf6242c9acc62d030a94f67b78729ed29f8c85..33550df23fea251368b16dbebad27bdc private static final HandlerList handlers = new HandlerList(); @NotNull private final String name; -@@ -49,11 +49,27 @@ public class PreLookupProfileEvent extends Event { - * {@link LookupProfileEvent} - * +@@ -51,10 +51,25 @@ public class PreLookupProfileEvent extends Event { * @return The UUID of the profile if it has already been provided by a plugin -+ * @deprecated alias of {@link #getUniqueId()} */ @Nullable -- public UUID getUUID() { + // Parchment start + @Deprecated -+ public final UUID getUUID() { -+ return getUniqueId(); -+ } -+ + public UUID getUUID() { + return uuid; + } + + /** + * If this value is left null by the completion of the event call, then the server will + * trigger a call to the Mojang API to look up the UUID (Network Request), and subsequently, fire a @@ -108,12 +104,13 @@ index 4dcf6242c9acc62d030a94f67b78729ed29f8c85..33550df23fea251368b16dbebad27bdc + */ + @Override + public @Nullable UUID getUniqueId() { - return uuid; - } ++ return uuid; ++ } + // Parchment end - ++ /** * Sets the UUID for this player name. This will skip the initial API call to find the players UUID. + * diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java index 9be64a95c2345433b6142d611077dedadcef9f5d..e3cea810881868fb5869de72f331733e6893fcee 100644 --- a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -263,10 +260,10 @@ index 0000000000000000000000000000000000000000..45410a77714ad28201520c188e280e4f +} diff --git a/src/main/java/gg/projecteden/parchment/OptionalLocation.java b/src/main/java/gg/projecteden/parchment/OptionalLocation.java new file mode 100644 -index 0000000000000000000000000000000000000000..23897904c6e2d6195f3613c36d77454587afd8bc +index 0000000000000000000000000000000000000000..305713e6095de2849a42ba1f4049b8715f1f907c --- /dev/null +++ b/src/main/java/gg/projecteden/parchment/OptionalLocation.java -@@ -0,0 +1,18 @@ +@@ -0,0 +1,17 @@ +package gg.projecteden.parchment; + +import org.bukkit.Location; @@ -279,8 +276,7 @@ index 0000000000000000000000000000000000000000..23897904c6e2d6195f3613c36d774545 +@FunctionalInterface +public interface OptionalLocation { + /** -+ * Gets a {@link Location} attached to this object if present -+ * ++ * Gets a {@link Location} attached to this object if present * + * @return attached location + */ + @Nullable Location getLocation(); @@ -427,7 +423,7 @@ index 12163a7b0591a7d022dc7eb9ee6608a1b6c39d9b..d81c7307127b135417e06a3b244416be private static final HandlerList handlers = new HandlerList(); private final Player player; diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 13f221dd4e332db01195eb0c92ef9f26a17eb6d6..e6ff56f03a7523508db16f1d6298074f681326d8 100644 +index 9bbd928f7d513ca317cd27beffa61e5111f5ffb0..7cc62b34800d7fe3d26e78945b1e4f24d09f7c85 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -30,7 +30,7 @@ import org.bukkit.entity.Player; @@ -439,45 +435,40 @@ index 13f221dd4e332db01195eb0c92ef9f26a17eb6d6..e6ff56f03a7523508db16f1d6298074f private Reference world; private double x; private double y; -@@ -1205,4 +1205,11 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm - return new Location(world, this.x(), this.y(), this.z(), this.getYaw(), this.getPitch()); - } - // Paper end -+ +@@ -38,6 +38,13 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm + private float pitch; + private float yaw; + + // Parchment start + @Override + public @NotNull Location getLocation() { + return this; + } + // Parchment end - } ++ + /** + * Constructs a new Location with the given coordinates + * diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index bce07d84cafca677bb6fad78c21b82097f06430c..3263419051207521c8c5b818714cde9a04b895e7 100644 +index bce07d84cafca677bb6fad78c21b82097f06430c..c148832d2df44faa41d239d0be5b9df284a9b7c0 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java -@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; +@@ -19,7 +19,14 @@ import org.jetbrains.annotations.Nullable; * player that is stored on the disk and can, thus, be retrieved without the * player needing to be online. */ -public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable { +public interface OfflinePlayer extends ServerOperator, AnimalTamer, ConfigurationSerializable, gg.projecteden.parchment.HasOfflinePlayer, gg.projecteden.parchment.OptionalPlayer { // Parchment - - /** - * Checks if this player is currently online -@@ -206,6 +206,13 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio - @Nullable - public Player getPlayer(); - ++ + // Parchment start + @Override + default @org.jetbrains.annotations.NotNull OfflinePlayer getOfflinePlayer() { + return this; + } + // Parchment end -+ + /** - * Gets the first date and time that this player was witnessed on this - * server. + * Checks if this player is currently online diff --git a/src/main/java/org/bukkit/Raid.java b/src/main/java/org/bukkit/Raid.java index 983a8c20a06d2b509602b27f49c090598b8ecc42..46dd8496f5a2c792ee7811e33c424e88edf8b5b3 100644 --- a/src/main/java/org/bukkit/Raid.java @@ -570,12 +561,12 @@ index 2e17b2d4f759531fbe9ee8e9b00c839186af09ca..8f4a293c131cb8b63c31b410ffa211bd /** * This is the name of the specified AnimalTamer. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d340ddcf6924cc834455de3acbbac91ab9c66e39..d088493b4c58be67ca110b172506ab73de77599f 100644 +index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..65d2b0e87feec296b9f20a6de2d2266493cd1e7b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; - /** - * Represents a base entity in the world +@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; + * Not all methods are guaranteed to work/may have side effects when + * {@link #isInWorld()} is false. */ -public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource, net.kyori.adventure.sound.Sound.Emitter { // Paper +public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource, net.kyori.adventure.sound.Sound.Emitter, gg.projecteden.api.interfaces.HasUniqueId, gg.projecteden.parchment.HasLocation { // Paper // Parchment @@ -604,10 +595,10 @@ index 8b0d04d5b39ee817555a36adddc39b18fc6f0d02..1c87047de615a85ee20297295478770e // Paper start @Override diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9240ea09206461d61cc08d4252e8507555bf41cf..401a992f340ba441bf81ebf54108b0e5b0421def 100644 +index a8d3451ccfcd21a9e80adc2feab8fc9c2926c753..c445cff54095a5389c8d186a9a191beef082c118 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -51,7 +51,17 @@ import org.jetbrains.annotations.Nullable; +@@ -52,7 +52,17 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ @@ -731,7 +722,7 @@ index d944d67f544494355f03c5bc9afd8ea7726e6412..800db8e63bdb8c05ffdc88c3a3b0f1f2 private boolean cancel = false; private final Player player; diff --git a/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java b/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java -index 59aab10c2d27247eb77bd71d75b5f9126aa0fb12..b42465617e83d3413ab647cd9c78212b61ca5833 100644 +index 59aab10c2d27247eb77bd71d75b5f9126aa0fb12..57f89f569725289d56f1c75db258ac19b6f94f30 100644 --- a/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityEnterLoveModeEvent.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; @@ -743,11 +734,8 @@ index 59aab10c2d27247eb77bd71d75b5f9126aa0fb12..b42465617e83d3413ab647cd9c78212b private static final HandlerList handlers = new HandlerList(); private boolean cancel; -@@ -42,11 +42,27 @@ public class EntityEnterLoveModeEvent extends EntityEvent implements Cancellable - * - * @return The Human entity that caused the animal to enter love mode, or +@@ -44,9 +44,24 @@ public class EntityEnterLoveModeEvent extends EntityEvent implements Cancellable * null if there wasn't one. -+ * @deprecated alias of {@link #getPlayer()} */ @Nullable - public HumanEntity getHumanEntity() { @@ -942,19 +930,18 @@ index 6800132c6288b4588fd02b08d26f016c38f27129..8e333a361cdee30a83e9472285dfb0b3 private Result result; private net.kyori.adventure.text.Component message; // Paper diff --git a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java -index d63bd62606763d0902ea800f0c35a1cfd07fc8ec..97bb62b616f8f08ec697c14681ffe6d89934b526 100644 +index d63bd62606763d0902ea800f0c35a1cfd07fc8ec..ecca20d51f8ac6f27887c55ae2aaa428ecb1ea53 100644 --- a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java -@@ -10,8 +10,7 @@ import org.jetbrains.annotations.NotNull; +@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; /** * Called prior to an entity being unleashed due to a player's action. */ -public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Cancellable { -- +public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Cancellable, gg.projecteden.parchment.HasPlayer { // Parchment + private boolean cancelled = false; - private final Player player; diff --git a/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java b/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java index 128e43cf12205f82f2b119a773208502cdccfdd4..ca1fed3081e2b0a3271a2dfa0f49cce78bdb8e23 100644 --- a/src/main/java/org/bukkit/event/raid/RaidTriggerEvent.java diff --git a/patches/api/0012-Add-Player-getHiddenEntities-API.patch b/patches/api/0012-Add-Player-getHiddenEntities-API.patch index 56962c1..e47c84b 100644 --- a/patches/api/0012-Add-Player-getHiddenEntities-API.patch +++ b/patches/api/0012-Add-Player-getHiddenEntities-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 401a992f340ba441bf81ebf54108b0e5b0421def..0dbbf842a3e25da23d4b7c574fcc56170162601d 100644 +index c445cff54095a5389c8d186a9a191beef082c118..e59cac883dc83186e0977a73b03636993696b37e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1848,6 +1848,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1912,6 +1912,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @ApiStatus.Experimental public boolean canSee(@NotNull Entity entity); diff --git a/patches/api/0014-Expanded-Insomnia-API-methods.patch b/patches/api/0014-Expanded-Insomnia-API-methods.patch index cade72f..6e19e3b 100644 --- a/patches/api/0014-Expanded-Insomnia-API-methods.patch +++ b/patches/api/0014-Expanded-Insomnia-API-methods.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expanded Insomnia API methods diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4390fa4cc4616a13855d38cb5e09d60153368428..924dc2c48b77c5c74c6058c661699efeaf72a40d 100644 +index e59cac883dc83186e0977a73b03636993696b37e..e4df334e6ceba43144114c1ad84cb5710b71030e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -61,6 +61,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -62,6 +62,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @Override @NotNull Player getPlayer(); diff --git a/patches/api/0015-Add-NPC-to-EntityType.patch b/patches/api/0015-Add-NPC-to-EntityType.patch index ff30655..251c309 100644 --- a/patches/api/0015-Add-NPC-to-EntityType.patch +++ b/patches/api/0015-Add-NPC-to-EntityType.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add NPC to EntityType diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 6cf14afd2c1b8018c67c6cac302ae28bb12ab5a5..9ab641d268cd10a2c9bd888732d4754d520c56c7 100644 +index 4aaf268f58038cd5d4101ec3fbfdc20b544d6678..29aa9227a57b4ea458379402ccfce3334d9325d8 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -295,6 +295,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans +@@ -303,6 +303,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans */ LIGHTNING("lightning_bolt", LightningStrike.class, -1, false), PLAYER("player", Player.class, -1, false), diff --git a/patches/api/0016-Revert-BungeeChat-Deprecation.patch b/patches/api/0016-Revert-BungeeChat-Deprecation.patch index 005dee7..81eb8be 100644 --- a/patches/api/0016-Revert-BungeeChat-Deprecation.patch +++ b/patches/api/0016-Revert-BungeeChat-Deprecation.patch @@ -5,23 +5,24 @@ Subject: [PATCH] Revert BungeeChat Deprecation diff --git a/build.gradle.kts b/build.gradle.kts -index dc6c1b155e463bc857458306e199609157af2908..bff223b263f21786afe21c5f711a6c45db685943 100644 +index fa4928487cca082a770a25f6f6490286ae397037..9901114fba1469c138bba1821cafd057fbafd4b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,7 +30,7 @@ dependencies { - // api dependencies are listed transitively to API consumers +@@ -35,7 +35,7 @@ dependencies { api("com.google.guava:guava:32.1.2-jre") api("com.google.code.gson:gson:2.10.1") -- api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper -+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") // Paper // Parchment - revert - api("org.yaml:snakeyaml:2.2") - api("org.joml:joml:1.10.5") - // Paper start -@@ -117,6 +117,7 @@ tasks.withType { + // Paper start - adventure +- api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") { ++ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") { // Parchment - revert + exclude("com.google.guava", "guava") + } + // Paper - adventure +@@ -133,7 +133,7 @@ tasks.withType { + "https://guava.dev/releases/32.1.2-jre/api/docs/", + "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", + "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations +- // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat ++ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat // Parchment - revert + // Paper start - add missing javadoc links + "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", - // Paper end - // Paper start -+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat // Parchment - revert - "https://jd.advntr.dev/api/$adventureVersion/", - "https://jd.advntr.dev/text-minimessage/$adventureVersion/", - "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 853cf01..9597cc7 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827608fb0ad 100644 +index 170a915098f09ace226648da342a04c5c7583d11..ff010d3680e8c6fea0f0ad7f455a2df757b495ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ @@ -14,10 +14,10 @@ index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827 plugins { java -@@ -13,8 +14,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { - val alsoShade: Configuration by configurations.creating +@@ -27,8 +28,12 @@ repositories { dependencies { + extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT")) - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) + // Parchment start @@ -29,7 +29,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -70,7 +75,7 @@ tasks.jar { +@@ -84,7 +89,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -38,7 +38,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -98,7 +103,27 @@ tasks.compileTestJava { +@@ -112,7 +117,27 @@ tasks.compileTestJava { publishing { publications.create("maven") { @@ -67,7 +67,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827 } } -@@ -154,7 +179,7 @@ fun TaskContainer.registerRunTask( +@@ -168,7 +193,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -77,7 +77,7 @@ index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 4b002e8b75d117b726b0de274a76d3596fce015b..bf6d9879810359216a60d1efe1d1bd9e23e55b1e 100644 +index 4b002e8b75d117b726b0de274a76d3596fce015b..4dca3956a76a9d57b3167f73696cf5d55d84606c 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -73,7 +73,7 @@ public class Metrics { @@ -85,7 +85,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..bf6d9879810359216a60d1efe1d1bd9e // Start submitting the data - startSubmitting(); -+ // startSubmitting(); ++ // startSubmitting(); // Parchment } /** @@ -107,10 +107,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..9b248dde91651b40b6b3e3dda8985c73 return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..5a99c361cd8db829d4a42f37dd81d26afcb285ca 100644 +index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..cb786826e228b88db7836c2641d32d025bea5a10 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoopZzga -ztPXMm+B@2rT3DL^ojvSLfF|x1rT~EZVp-Zp$8EVUCa+bIdXU!sD8p3<6s -zUM5neks5AV?tJpJWaj|RnUdQB!@2v_*TdGA^EkiYB%_v#_qzM}%TI}3Ck|)Q&3-RL -ztNr%7r<=E{56?AcbEgJ=zUcRw8%_`RW{mCnuaA%G<1oG=C~clE`w}+K51mhkXr3=F -z&o}i*y_u?mf)|I+hZ4_oA?i=};&(0q=a<@U`(-belp~jy_j9MOOi+HTqFXm}OD~Cj -zTAFsEEodd4>T4mWRcyoHJ -zY2I><+QI?Lf_oR^e!uRwG49tg@o0HLzI;5c<6!WvaE)h~U-W{3hpMIhc<&zf?l!ai -zb+?Vi_3S>O@!WqiLo_i-_0B|h@!bQDzM8!7OxwDlS0U7C)nN2w=ndy_B=v#6}DzR9In6ET3I!ybqGLo -z^WLdDwC`)ilaQ*%!F0w;^cMvdRr-9~PP<sc&3|m){G771(mJ%cn#WqZ -zyPC4HYrSQ6pYHq)*DmbdiO)I4b?I%I>{7R|tDQ7HbokL^W~O{*Zr-5~Mdhga(6;&1 -zp{w(oipV&9VTS7i0c*ic0dM=b?#e@5ef#EkdB~xe?(6orpWj^9>8GewmHVy-v$?w& -z9X|sKc-lCxzSv&k`SSx*!-+}ZX59gPecN;|*V}L{q0i0U%V{Lb?5=E?=$X7v3(c>K -zjqOKE-!EV1+Im+7-5On9vHm)Pc3)gpUq;Jqaz~q{uaDzx_i|PcZZ}~HW9CD}kK3Q` -zBb}~pNm=c0OL>L7wjUDAFbBum9+&#*`A2A1?LID#7|C{F$;SH3hzxyX(l6GdyH0RA -z28pr@mm0~(>?IlPU|Q|m)K&K{oBa+61G7G4nAPxbmoBX0?3S}O-_$+CHrE}Q%wO!L -zotFYcF4QYOBee)Q5DQxKu!U8hUy$_gZOhvoa|+oNA1@x3J+_1#ZxLCL&Uf>FO%2W8 -z@;s?NzuIjb=WNXVG9|1V@nqu@NDQj?++mqBULF74_^iH2XA}2JQsfprwcAO*qU!W6 -za3abIwXA*(i#BoUHloyC#K(X(Qi(CqC)>kRruP>|wBdj&m4%BPsps8!Bj;CgB)}CYQSz1`L(N2&X9F}X# -zdpUX<7-Up-`|u<**lpM?QCHbN*&GpzokK_4k8s1j$o(uss%I;&Wpip>)jml1uo>ZU -zF2ZT$Fdyg^&tpe&p8d2TZF48W_rbmLO8Ktb&ZH`HWfnA=_Yc9lbtMDxhtUs`W>9P(1v -z<>YbqfE8+hSh>$=d4jCw=<~qDoilA(l0)jzeFjOwhU%|Y5~^UXVy)bt<>FaBa@9p` -z`=rb}phg{ku>Xbg7Kir^!H?igFbtl&;_r$^x`IfPZ;jUMxk`&*k1sM~4wYO||dohTfP{zI-cfEH`O -zdRfD)P@onxC3N#9drhwZkDjR6iBBfbBYHN5%b*w1?1YhnDmUmW;f -zcYR>BYY{L)=Els9>M!ZCgv(>H?a6)HArg*7TGD2Gs^-UX&#k}rnw3B#^mg~(8Tpoo -z1T`ZbZ@+vjcn5$q5>1f2O3tD|g7E*@{ZP6~p3yFi-3xGK#?aHtGTWuTGY9|BG21Sf -zI9pL|T1;cpc0Fow7zaS#+$B^Cy4r@v@P-Z++j{D*>caqNMdh{?`j3-Xphqc -z0U~a=itrSIei}F?gwI3;tk2Fftd@sbw*Xltf(keK5ccLp8M2NwRL0MJ?)cANglhvD -z8VjP4!qQa&V8tOD&=X?ByD998{6nz3E%k0yaQuw6Hz|tS#HJO0dR_ua(fXLYU2u19}YuT!ff(jI8h~-7A!Z`1_Mo!u_;0l(tjQ -zL`(VRAOp`ao{E)&`aLa;x3wsnD0Q>}8DMB5<0HUj_fQ7vlMxG=rb7q{9HeSA1E0ZD -z1WV+W-*dDBwO=nm@_eLL|Iqjsv0d!>s4VNAc(U0pbY~h -z4ElxrCawBRHR&P -z8w+xG{6*bnEap!GWJ9OpBdG??%LF38 -zl7*AOP|_DED8=WCG_LY`8=B101jxxC%HbH}8m2!}6d~5CDb6p;37!Q7P@bhWuc2lk -z5l6YdO*6+W{SE9AmHmZB&4nM%LQA5n6ex9xVH{LB80Tzwbav+8;754~CC#Fg`|!E|HNC@RbtSA{*xa#d -z+&3Q3t0iBN*(!_RR<2zqaLbE*vgcvE=gV;$xg7Lf0^zz!WEUpVVWC1-0x6bRaO(|o -zvGxWL7S5hw#Mn59^FyebTiNZ?fn`XZ^7CDWRkmt~oRCxDQSddlp&JO1YME2|9s&0- -zi49HHhBNwBs3)GWNZSsq;X=(Q-`tMq=Mbr|`XTl3fp{EZ<-`yHPzmjWz -z476wPwNs*f(8ahd*P}gGlRG!40s4ag=iF|64`SRexA<^=9S-ftcsm285Z2>Pn=b%d -zRDQ|P-_3A&XBysk)?b}4K;wEuCrs}<8nzLE^zYa=L~gr7JoPJ)J{c6!t~kC@1jLJE -zecNt634-1#i$`B>3^W0&^Wq1-+VWWI2^liipkvpkWUs$#u?xBebL)nLS>(CNO1Z-1 -zKn5~D+=aI)p9SEKc4!(9u?}c!Nn8!tvWrsD>h~Ozd270U$Sd$bY(GNE#_1qcmlQK= -zjk-qVeP_Hf9tEVuwguaFY@@*SGEuC*3Ux^N@AyZlp*j!3NXC0$ -zL+-zKf$_a1@2Pe?O@YlgP2r=n?`2eGl%R)aFWm3@05*eSIT0fI+`g>67;>CxucTEN -zDrB3)DmH)4Z-@}i{>8?eB_I|*$OJRk-QR<}%x~oZg6eZ`7FC0e$itX0rY@(*Zku-x -znKYqxi)2SA{Tf824c!N1ygeVM=~TZep8mD`_~K>S*%w?X5}8FvBkRmq@hXb+0jSb- -z5lqH3{xpvd83Y+~N>c&$5#5@J)x4AL@_l-bXOR3p*_pR-pj!yu%#dEq!J^3;JXA{l4$J@Oh}E?fEhdA1e| -z&&m#jo6jzaDI7P*??J=2p?-t!vN_zO;h?;YI(tRqTpw+>(P%tHza}A2hIvN|=Mn)z -zG!|$w0zWh~iVh%htwUpxD|~TrSb)4fe6p;tx5@DT6vpWqZV@&!kYh#-T}xCugri)Y -z1ZA8Zw+_f^H~0x}+xI=|eUFnhE&|54!il5{#>gM1{#d3#NS(Qm0jb5=NII21GzdgZmPMRkI1N7JN=ev4h(18t_is;UFls**_FK0pUxVN(N$ZTN^ej -zb99=spS%5y7KunRRF;$#M3@$cd^ohnnwJ?m?OP;(C^#{^u_-uSCPH-GDfBsFm8YHQ -zT5?_{7YhnQp|ZAGWzc>v(zOj1fS3dcoVT7m_NU)lK#rTjyX^jmlp6U}B@4Nnl2_2` -zwJrB>~UThL{-(eg<2 -zEf_4qMAqy`$Ta9Kd_iT>8dM6%;RD}gxZjQ1ngsxMw-uh9KC~F4!-M#my$91+?j!F6 -zJ6v+r6m{MCtAom#$3jcH7IZQZ;I|1)wQo?yLpl{Z8OgU*XwaLA6Ktk18Z+1ffH2nz -z&yDdWcf9^-GsH)>?DcH%3c<6wIkr5ATKzOCG9I~F@1T}s=_bdX}knky8Y53|-wxXH8D;ot)j6+5#(e`LkwYSar; -zMn_JGxPQ!5?SbfdFR=n(eH?=JaQS|YRR`}B0LMr$0naCx!qf -z8UAewc@MqZgB)H>>2h$YX(GGcE~uP^oIKc^!p$9TXDs5q>G0RZ6QOOYK#NnFWL$`9 -zUc=E+RIO-tLLPM{$tp~E#R--f5z=ym9-JpXN%~53Mie!Q={tzvXsyK-q??zP<{H)_ -zeJ)%_hE?|8@wIIJYzc0#4h;p94kks%MRvytQi+sNWvUwl347+J@YfwN6^a%Z;wT(x_?$L> -z>uXl)DNq-{G%3yFOju3SjgC3L^f%tzBva7^Gv>=(8_SACgXjM+~p*4$y2k=qR%gqs-t -z5YnGr2*DVSW9h}Zsr8ENm$CwwvXcX5MXaY -ztGzEo?hYE6t#+wpQT#j?wj?$9E`Ir_qn8xwXZ$#VgUpGTk`C`~2%M0KiuMSDrZR&u -za=-tTRQJ=Th(_9lFXvQ-M~)xax1Nb+Zb#fzdBBaCFneTkKJ1d>i;eg1-BuE%Ybz#EM -z+s;6}!J7R}!DEWDF_{oichA`GpG_0;RhsG$mLMKKN!82;2dX7Cr{bgD@sU{5#YrP} -z=|=QBozQ~RZoceobiL2ctA%g_8~!^$D;&=TXiS}5siry0a>x->G@#xZxt&yK$CTTX -zb#bLy(WhpGg#0gwV(}E%vAREkLd4Mivabd*PQ{E_bC`>D?U)-;R^HEQrClo?1Ha1u!50l -z%+7QMgiHWLjq_^jk4crO5v`QcwrAAiP`*$AP)s_E)5!ez6-FhvS@oJ|@dC9Yo~@V$vjUv*5$ -z=#137Q+{kHe+}%z6rDuWbWRNcl`W`zGmr$Va{=)mN)Dgp_vgo^Ap?&@Zg5e!f+E18 -zIeBHjE@9(C5rSxLN}lJ9pCa7E9Cv&{YxW>pKxlLlM7T@?QAM)-3DJ4NFyh(KQY8N* -ztF_VEUG_Iak%e!ffEhc-YUtMl?+lI+N=Hc3yEq -zzl1oRdvD`YKDX3+QsX6m*c-PTgRmm-XfQ|uGYN9FG2%HmCuWX{;37D^Z1foOJy22t -z?udlnPWrJn2VNO{29-2P$(@F^R-OJk0HGQ2OVEu(<(Y9>I$0LpB<*pDP@rWdZU@3g -zFE+N6v6h%D94komDW7C+Mcmy=V9x?|Rn= -zzftF-S3sHrs}Xw!QXa0-l_OyfkK#h2YK|c`7w!<)p*jNkRM{-CC7wE7;q>;JIwKiS -zmqH+0qU-FwYBB1PL57wbIQ&N850}V1ihvHZnyE^(fF3?@(GP~a34(t`501o!R~E!B -z#V0HJzR*s!O|QO79AWtc&3ctTT1L$1g68?WN@d$%9Y9POOS|!d>oBGRhy1G;$Q6ZJ>{}+=UU2?mwlTw=l%@o1|7Dp4 -zOAj<6G0(|i)SdV`i4~V4S&>E1K+BYr8vCjn_b$c4!Mr3ry~0D{&Bgl)sgJFAB?!eI -zm=fh)&+aMt<$MgIKOm2zK$4`28DS -zKF{f@G=$ak+tb7g(|$-sM>~fNO(J}iY1oZC0_VvIAZNH7h1N|)(-sq~h+Bo!1G86Y -zT~C=cwHy?LE*l`MR&qDCJ4KrHG8;wPc?l5>tiTWbaW37!oepnXSvh0Ml@LUCOX1-m -z9M20u3~129e=uscY5*-3P`G{Ev*I3nbcCuam)>JTf_qy7eH*dOIr$ue-*AuLU?^?^ -z7FEkk)|4S{DTH3jG~i#RI}5>RH+UDsP23|G=q3f9L`uYpp-z7b>x#`I!N>kNF^>mY -zi!eDM_vaErY^@NF(8vgn -z=n)9c5@7*OBfa-Uk|?TlHcNkjEUnJpo_2j#&1IxQ_i)TyayySMaD+~bwli?aByr8r -zUUP2V!gJE -zsJ@?Jgzvzy#?Wv2X;!tip^`!PTSZRtk(k(ogqE@)Ir<2hIAe{Xz|6gNZ8|(s6CmAq -z$!_~AN`RwigPpX#ZeaJC~dbRNKXYm!AI -zOkuxg1K`-@U%zg4g_WoY*_gOPVt($em#?%;n`NIDIDt?fNkAWP^ZraxAaZ7F4;g9I -zDV}@Za!#`6YtFzc7TqIj_m~m;f$&!-*F&H4ITx>gIz@f^k(LRl|U+O5I -zQ}Sm>aM|P3Y?k(Y!o#xA1L_tI*?}-jb?CO~OhQ_yy-Y0;Xp}pHM+lXHQbP3Zcrcl@ -z$%!Q`v(sZirPcZYnMp}T5o%b6)ljpjUy7xwG9hevz97^&hto>Y2T}|P>-6Kt-;hn2 -zUd&iS?8FI33F)!DBm&wIWS)8>)ka&r7tRY)33ghuXL^w3c`jgikqkufT8N;yP++!o -zgcg~2A_8*uk|gk}$pKvtAMPJjP1zY|yNLbPat9JMGmjabX({)11 -z7|gD}vi5LvozXdjPPQf_rAVkCJ5jKZ5lp4=aEBL?&lycPYM+m!9zx*Ur=0XL*DP|( -zk?YI9HO~gx=zr&cyl#E$<_k3lR -zNg>co7x%wh2!UlSh8F}xOkA|j?u)m~ -z)mP%kPVUf=T1W2D=aHKS?R4L*Al7eu7wkHtyzNyNW^0I_^ykC97|&xMe@`|fXPwWB -zZ}GbPo`rOJ8P7^q443nGSz0J(7v9HpHa#6QfnMWk3m^&g5n+L+A$S*bZ1Vk6H)r>H -zY7YJ?(%He%4!7>aQTNZIrdhTHN3=RamrGZ&H0rXgL4%4;lew|EU=x^TUjl-jfG7(B -zs3l&60H%A21IOgZ58V1vwPAfd!@-^7!Yvj -zGrAo-Yw5j@^;HcICWbE~!)4X3%@TGq3d6z{xapK-IqEbTmWECmek=NtDA}s6Zlm+i -zLunl?%Pc`Y*)9j)6O?kP;I^^Wdw5bUM~?~cgCScj8rRFZBTWBoD>@;KaM=OV(P -z;oPTMUybzI2iTLN4;@46Ve**KqnH!#WWkH7kaJ{rqsZZxD(Hc3;>ZOw*i~#_A;URc -zbGuuu?ImcHdI(i+!^H) -zoQ6j%Bg8W>1{vkVQTOARLH}2RjX*g35hl72qU8 -zUCDXUWC+s2#*zmmc7f!3M6TJKa@Hkcw3ne?gQI~-v3^{ma2|}u*{lJ$h$NH^>@p+H -zzBymQ^YC;u=Scx7c05)>e9_XNUf7>!{XqjlnNjGe2u{O17(h~;2bYW-@6bkaoQ?i? -z4+^D2)$N0a=U%bWMZ>s_ihdu%F!mWh5#|bER(Ebt9F4kC=EA9YE0c~Yx#uUV?&pQ9 -zFtN$m@+wSl*yg -zcC~jE<)RA^#|4;o;uw+^L@OJv*4eFjis(JvRJIOG7)^sTrD!M>xU*lW{Ugvq?4_~$ -zAMJ3P5FulkQeG)|Ms4sKM%jUM-q*3gDW{6m3@Z64vN_Q$N-@=tb;z0ZCc`-Q9iYn| -z!S>*kPfc=L70H-c^YObdgnWMQtH15K2uy0iuL2rl(dJL0xYMJ-ol2|gydn~9X{4B= -zm`6k`ZQ(0Ns^T7a=*HiX!!ITdAy -zWxsFAZj?Ne)&1zawxA>13?Yu+Y@p4@MevCdvqC75u4bf{YFD9yu<;!O0`e}DYH%z@ -zan9)H{T7_{+H}h=>d0R)P}=y%T+%$%{ZdTWhHc3zzEJyZG92mp19}8m1tE?T>P*n) -zf}z?s$E1*%ZagNfZdfG;#Yb6BdntkhV4$la%um3BWST~+>0b%=Y;%ZH@V>DH!uEeN -zZQ@83Kn|N729={4d1GN5h5sIhrBFgm?4qcW*kXAEv^!9-O2qhMcOA4boZ5=+f!!j6 -z^==RYrR^Nb}y5%l#&qmIfVKcfJ$Miq&OgA&iH-5hx1XF4s6>E -z?K}oG66?Wa)pSB>9!CEXzgFyr{Mi=^FJ>g)Cdk((p;b8HzgrbQ!P=7d;o7sFAm9ceAhpX&M*)(V9M -zpd?{RN21Pgiu9Otl?OH*)rVy|FdNqUbW(IfO@15Xf{V3kxXA~`eHR;?xZGZkOvF`J -zL*m;s%T+743~!@w`5=~1s`Pu<7=xdUnpZM%?Gv1cSfPkfc^Bj%E)za(~p{CRUboPD|Jth#2!4G -zC!zO)VdlDG;cX}j!>?#~LcpRZL^EsgsO2lbsH>B3p|4 -z`HnD8X&D>}%&iR&QC9zc06ms?I&;+1vgS@dy;d3_p@T%y@WWIqnG@^cFIt7M2O7d^ -zk}|`az?fu#Q=WMlsmx6U=spuDzS}K#mF_y&XqZ>p9nsl~1fTS?(iNq6^67HJ2#%)P -zodPAVyndZ9LRe;iY|SXzD725lO}-QNGurIf=mpJSH~Cnb(u#xpiXogNsczx`{KbD&hjoVjpSc1rQX^TKUJb}Arj;H=rZ8OqSRVyK)^Mr^TQw8pBfK<2U5Gu -zH3Zu`FHC~gxx1{<7YW0f$%e=0)&?}uaF55m^7LLP*#l4)u}-7t@F7fL -zk~>7^kd`=m+K@Y)cLF~qQP89UExee1NSm;M41FOp@$F0k5lGNX#TCaqsJS`5m(HH5Nc0sq= -zEasaf_z3f6-UC$rN(zka9{Q>Q6u=Ia>ADk)g3cSTUzoLbui01Ze{yNkRO28Xci(HYN#V|~NsjfW)3Ui>9q -zC<$mDMxWpO?S_Qx(PAz&?Q~oczbib`XFkGd97U6)BqhT#r-V72@s>cWFA(5#C6Qyb;-K$`Y*peY#9EJ;BL5`*qj2 -z>>a`^AhJK%U#&QsKP@i+P9~3toM@qycFRdGJa`Fp_VlA`ZH$(P?tyX|TxXS-nO6FB -z?IWxp1Pjnnk^SqWjGc1RS&0ADx?gXpu;o)>5x4ax+4nl}K^6GD{$621x6pZ!KaUC% -zU-h~PJ{r+OE{q}I;`uA0X8{+;jmxcbtWCegV7;?ZxuM3;)*p6Oqi1_5-z0>kkr4Ss -z%+vq&^r*%ivs6XWK0Zl+8CdYkU+-w?b1vL?1e(f}N#yfJ0w`m;&(R+%Dj=vc2W^T* -zf&xH%i#<*BhukcSL^@hnLo`VzLKKzruh$yd -zi{Ad%x%soS<0R)l)pvfHnozer+23KduGgtTu^h1oBs6^o^pW`rwe{%h -zP-gl&d80*gfZ5P-$zkhUvJT7dlyrHndad6*@rd4{%)m4kv;rU4(b$N#n@hd;zVwch -z5dp=2e7Ds_hOINouH3E&bObPCcOPQ^fa7P1<3Bq~Kw3yaI(N7+R6Tl5A=!b&pxb{Z -zmAs&^+Ds&CS7IP0w|YCr)348K!>AYcJe^=^;y_~=cm&fbe#Eb`9({#%JtC~>7ZYC+ -z8j1SN2v;;}yDHF~&X^J>apWR=e>; -zC>p7yr?t{g)=~Ynwg>*dtDsU_TSm0%Suy6bK0})t8P8QY*7XvN)&%mIaj#c(_R?zx -zVlaFzyo$zHGaLyybIM~Ho=W|SFt$NRbu{Jp(#w(b@r1M8C)zXPnny~2D@|@W0R}g$ -z#hMp(t79+V3OTmOSc1_OsJfdofo~pJBRZOQcsOwtz$CFQZXNtV%tLSb`F$O6x&qG5 -z0*;C(u5Ru`7rJg7_Ll{Tm~4)k%13-1ah|1^`}6MM=_b-Td>jqro*jpJN;lL>3(a6d -zib8Kh49EqhZUR3iJ2sr(JsCD|Nujm+xy!UtlUk!WOyjKc=vuhuh&WXMJF8Wjn%5Yu -zBUR;UB+bax$1a)+&m5>%=o38iMPXmI^O)zZd>;3q#NQrJm1dY0@f?PZs-F8lWlFHr`*G`_sF!SO}O1vV`X>Ev+zjVW^x`3>G-$ -zu(;0rHlCpeC*ujL#~G?9(DcYoa|xGF*w`e)<`C>@(vG -z%W*2+*=;i1DR=86(Yv-Y|b^FXISUmo;`(yYU8wR3`bbn&(OW1_7*gQ7)D8ETHB5#|fFOe_vvM)voupvNIf{9z~ -zMqICv^3)$dDZ$bScJd(!$ON!gh_naEW^4`2&8eA*7L+OWN&;rDE8|x^WHQpu()V&W -zf%IDNbVw4~K;!AoIM9GCeX)d%5r>)>ZNXb;t*&CQnr -z;dLb@f+<7V)E{|aXHroHDwJ5UAnWT?CKv^_=i92xxt-mo4~NA18WM9E$5{)HQSZ># -z76Gbej_E%-N!@Q4VULJI<{ypChTVh^=2zeB -zxIc~IrZlgtD<_8=fm%bBOHf{n# -z7q(tgU#*TB4Y5&GpgY`wn%u9UhkP_klti -zv$Hb7^-xj$%glywjAeaJUH9zV4u`a*Z6iIC^O^{a(=inJhIvBL9z>aP{N?>k|PinZc?$Jgx -zoLVESiw`5svPjM86w9i>A_L)Vj0}5x|iMY}fSlzz`y^E4v@H&DuQ_X`x>2<+kw# -z7DipQAuQ0(6=Rb0?sMD670Z+dA=ix+Cm`upr)K|NOct?%M&VEKNs;g=^W*8l#1oyh -zCGI;1NE$uI6FxnC8(@>VMckN+(0Zb%Y2HuKqWC;6l6)_AaJ`TMBo&Ks4H7S9*;$PAlcIFF5u -zpLEGW)4ZC4mUo^AHl`9mv~}a;o;3jIi#WKA%1Lq>QanjzC>}>%iGCTggb9|V1m$9P -z&GpXiOo=ogrq7SE!toarUc#AD1=oFJPf_`=S+?B){nl6uA&a^_A0kLKo>8+rc^8IU -zwUH&iB#T@n^`DAWp3i?k6ldPIT1UmSAO0#gsXK#=Bzwx2e&KGc^iv1R<~VRW5j|b^ -zg04mvGc7$rpU>cDH@A-YvCtxXsC&k9DhxHLYRRjqQO -zMpWwO+pruqW!Z{R0yJ8ZV**vWBZEA*H8($S`|Y^-ib4B1XNFn!sIV>C+QW!y|6&Ul -z{G&hB9vjI94J4^*6|4~paG8JIdV=f@{ji5)Io#s%h1~wqo^Ywg>3pIdxyENhtLmzS -zK+NA90^WTsSW;a|uHQA1Q>z65*akhg5lxr^Lpa?&CU+T#A3QkUTPBbgP?ot|&h0Be -z)|M=Tf2}lOgw`FPyXM@0TyG$}Y`B!2E+jVVI(15w?d6xWpG}wOfm7t-*zoNz>^Ajk -zqC$8S8vM324rU@NEJYZo3kX6}?1s8&jrXY~u?#Li7HSR)qbNJEt9+264Yt#se5}3i -z#nHz(<*}M)p8gi{D|P}z@xq@-uv%f@3~^{L98Za7ar+5k8uyrjs&C%ePM!h;j?2U2 -znLf~J2}^3v=rea=^z#1&mM-~4C?wHSl^B<&4OnjFH_^}0fl#TMEb1MzgvJ8(K-H`; -z%A&<}Z&$%aPg4$y92ZX2@((?b0Gf9_%w7rA+P^laRwGcmFCykW1XP-h!-oO|Nd>8m -z)ocpSGQ2#-LJR^7dga=Mo{Lk+Z43}QJV#X6ze9g+x9$1@=cJpDvM;zUm5m(X=guqp -z>-(@Mvx@f5_(p50RTN3~s^Ah6rQK>hyzC$k5z>93u+6KL{ydG#?d1sk~Zx+ZrQ{9(^Xyx9NBqR -zPyfyMy3Eqy`a0s%Hvj@xyJ$b%eAvN)cvY=>+k0&01QoPSL02N(iF^0W3#yj;MMYCV -z*q>|$>xsGb6*kLQd!eNtFsztg=Icj|sH21$&fI9?CJA*1&ge$Ym`^BEVZ;7Umo -z*CI+6p<9M%k|?n}qo;6D(X+$`T6K2D^%e(3)s&-_2LkUPHgCHgAWt|iDN%12(KJ(p>Q4sfUy(=0k1&BXzkE3(F}Q_4yJqRDc^ZG_ -zZ<PDWX(WlK={E0I5*n^?@?ZbxC#=Ea9a!&&;y_>vaFo`f31nkp4_&4CI -zw9P^JAs;7yh0{jl78ks4i$B-iZt4BV_(6L!<0)i4t*xcUB}G!s5F#obC?O6*MAs=3 -zt(lIEM86pKcn9~XU5X_{kH~N;~L&J`^xb -z_#ru$dA4%jI6MIIew1vX*xSQLW7Bz!?*2|MYkl@Am|R7Bo^f>Fx~e*O+eS!e@wQ!1 -zTUki}Y-hs)GPW}^VR5&yf7?z700@b?+k?PXCeA=36Eh22VT#k{b_$?{u`q=ew=$cu -zy`+h`g`B6O$$L)~4X~#bnBSN}R0L7TUEmGC#>5!}bhoj#brNtFruYk2;H~{f%t`_L -zOU2nrm_l1w4Jc{nXaeM7;bLK9mUg#r<)9Ej1PVDCn+m8)$^0GS?Mj%!+}YV)fR)wF -z&5gy4lf}-_jFp|ApP!YDgO!7W`Avh_$-~wevoHn4TR-q0@!8lbEB_PT*6Hsoyz#;64zg!uXJKQtv0?pp3nyo3*Ef*A2lRin -zaMF0&b;+u3;$-LI2sV*+HL-Q3{C5ar@IUSCT^z0dO2-(?YGQ3-^QP+b=9T?FT*}HT -ztNqjB4+UlxHuis6y^;MNn$8xc|03%@V*AtcS33V5$eZ~;asNa6AG!af{HCR>EFfhE -zcKH*Yyp%A-AO8Zzc3=x*fxnvE#vEW?FgG7Fp9vc;GncV3Co_nh&y*R=Z)ytSW8*Ug -zaq;{cl)SBzGsqTf@(1b-oWWLeW#*;R51n^1>7xENuUhs9A%YP2UWJDU>X1 -zUEKfGp})I?Tz~ca85V)J -zWZsAc{i)M8fWPE#xd=!)nt+_`95w9htc5B5garI!`B!-Zh5j}uau!Z+8XkWt{_i#a -z-o)W=SAV+&tS$cP0s{XkTLBRGZ%&**t|rERIeN4ETNl_IWNT*fc7Ol9p#CAZ_`eJm -zh}Q@V;xy%BHU@!Bn7R1a-v-Obgol}*?Tu_sHg516&Hst+WM}H^268kJH+#$UEt|Ij -z`YRhC-CtDF|EIQ_xyc`%*f`jk*?5@Q`83!#1lZUFxVf3xxZWBRtbb3K_0L`XkBo&_ -z|391v{iX14)4-eE-(+vo%iCiVf^|$nOv2P%E5{2PO|G#T4D0*T~ABQLh)DBZMBh8ARMQ19uc)Iy(F}1{Qck+ZcM?L_weBp?9?*gwUSg;ssjr -z!eF+JG5uemDp4Cc{LY`;;};ND{U(3@RGUGe7pl6+rO@D;E3aY -zfoy{pf*Ij&X?ZiYyHA3DLbyXvLu2z(q4sM5@z42On$uh|7`sulwAy*8g6T@oB@`2= -z4V7wo6IoO*T2-|>y#grx&HNS7ST8{k_qswN@TKCpYTCHouSAL-YjLL=-@pe19{21T -z*+ldRJU)F+Dc>kM%7P~XzbbX`4`T}5{f4GxMsCYRyu&&B1axp8L_-=_?V5ysg1F;X -zgFD;z%NQJ1%^VhO@k7ON3~u8_3lv0$52fy?BL@+gmrn&!MZGq14C0)| -z0NXR6PcF)St#7W8gw>993MWAD0yZJW^cIG8EA+aidYR!N7RFc}W<{er$U#;mUlam1 -z&Bf)YujOU9;jM>*$~Da8nX)&(9Vm3-;L#*=cW#4M9nM!A8P53Z1u75Ea`~*qQS)sH>ZGpf9Wu?K@bGLM(i!%Fkl>TGov-S8S%I}>T#MT -zL1P2O*5X4XnMx*2FU^p@8DT78=iZOFDw -z_kd(!Ee97+@2vNr|53K;(In4|B<~ly6i2qG(;OCyLBni*ncXVhc`_1AVtPhaxk9k& -zNDW1#+FG!`1ct5O@;awzyx)FX=)~C>R)*kB1Fc+GTsP!JNi-V_oj_v0$hCK9;b^LcuYc6$gvDv9 -z>l#VbjUwGLmO+{3!MoP;5C6KJY!PbG@VhT3m^r~q7JBFOV-o-WLcp3$l6U>P1_Q3W -z(q_dHn;q?vSGG&;e^znJW9l!h%OLQeCoGS7?%DrYm+b!%%xeQnJeO&i=Q6eK>&>a8 -z;GZv_&WXp3VfM^=CQYm%nFuir<+_Zk%?H14+|Ag -z2f+6~WAl#rHkNR3hC6Vx9SrY&iS+0NyyxOYOrKoCKVS6}&u@Z%`i8?VznElvi_kHR -z3ZY;Bdj!xs7@ohOhLLoN%4y>)rjE5Z`#8AfLy9fCC95|nZhu_z{H78_?i}w2AnUng -zj~hRIhXv&Aam@8B!^yx&c!|4m$D;XFyysn0STw(hsZ(m1IIfziszl(vC`0KgsTkSY -zMtb1Y;I${7-pl3hpN#_SOl82U3e1&&p%KN`{x_3Q -z&w#dW#g2B##+`~sS4-}HA##Zoo>Do{`&|O7fd{;wM}gtPF4o`1QH`dPztf8&ChY5t -zmt8cG6W*b%!^H8`w6;`W+oEJs`-hYu3k9-W-Hfzt#U0v-WeGm^tpc|{sYoOQU7Iha -zq9Vc2j$I6Hd0eAb#<`wa=W_9XXaV_;PfsG-)5(8bKLWtTD+HguC_!_*h&+_$#ix_1 -ztL3JjKgnhPz6F5WzLH?UR4X{Ik7oJ&tsmT6+T`fxrcn;76i%&x)n=i32uK<;W&!+&McEB -z)?lU65sTxWd)?OX#dFS^%fxz@apPX*<6qgyjSnjBSykj4AG2A$#K!iJsiB?QX=+%+ -zic@ERCm_$gDp@q$iqcTRz0Q_B`nCC!peiFGLSB@i#ZiDzn!@5!Thb|LsTZ`=3+7F+ -zIO7=j)J3qjN3vtDV&g8wL(fYd3&kMit^3Kq*MV)o?Z9oo!(e1a4-3efc8mhfN7Kho -zpiIK^%$2QNc-~Z&E^cAUq*{_mE3#?#c_?tR!{mFq8E)H2VQ^O{G+r!$3i(r$M~545 -z$F3nJPpm;ClY#Z{ktKi~?S|_!riSYJG?#y@k#S?!aM{1Cr!Na1{-(=E-!1vbISHyO -z1^J#$pcc~9TFcTI@a#rdvq_&vD#N|( -zQR!KU%e=V4j=$mDv&L}2c~d#^h!!SKtj6-7Ba_b*7ZT+;@r8jQvYlNNySGE39U;JV -zqE^79eMpb`F>zEVAe*-6Ks}L82F|NO=Rk^%et+oODwI;#sU&Bfzl3|o)bh_)u4468 -z_~C7ejXNE_^pPs2%$tKkpe&1AL4UTbTWOccik{Q9^u`_W+^2C~Ft0ol;|KP_bRWI- -zkV;1v{(bru#n13NZYWrm1r0TVqh{M2HQVO>XDYVtQ9S#K8$bA3+;pXsQaFQyWIH<< -z-n$J|=t3z??VyZ%WS+UtEd(m -zyP}$k(W6$ -z3CI<~i?6BF*YCRFdieJv2{ZBnouiR1I7Y0JN@yabBaQFz%(W?Om1)7k>4F8*EG{`! -zv0GhHy-6|OfElV@-QSWC1@C)F2V9#Lzd40k5`+$E07RUd%^oSZh{J}XKcl2nc -zO{pyjuFb;|VF0U?BHyotqR_bo;q*}Sn6&=pDcN*Z6vgskRonZ2ZIxj8LU?EmTz|t3 -zzVlUwOez6FAe6$g^k-ZJvnPeu`Q&43IqTR2N0zJWHlDWq!xbkx+bHu`RTyf1yY}sDm;=jL-igYMkOXt`D -zZ3QDiCog{MR){v*N_DjBc%rSPavZ3jeJr4h}K0dpARyo@Zp&8nV56aGh)bcP0~|f9*r1 -zzIL?j=%!L0(xYUksTHA%F)*yS(eIyc|#j&+UPuq&e*DBik -zpuP&0%(8-A<>dRx?%hG6s+l=QP37#9Tj<@hn+KmMu(wkOL|0v6aq<#7uzY?j;&0g1 -znqP751K_a35?Qc4N;|1Sm1gEYG!l0fz -zQU}BS@$##EoP6Rq>`XQ8AQX#Q7^T$zzw`{7n;w*GX@{@=Mv_T7TyS!NWWp10nWO*Z -z2Pq6J!AUk#tZWY4^mojGi%z!57h^dZ1=7*y?=-elQ?2LT$uQGyLfJlQ!TV3ryp%|@)Da(J0%aVk^JmW$`{aTbcN){yrBNS -z&~%soGl@bQxDZ`GvDEy-2QHb!r5DX$>EafuDie_yqMZAq6u8+e*{&{f?b~oi_5{U5 -z{=>Jd@WEMDsVin1u9lQqa00&_gTfKBRHoapVTa`O&pMt38O6=NI*q=~TN&E^bf8%S -zm(GT#*1Np>b74k(**v)9RGV?lI{5A%Qarg<@&kj+IBz2S_h%A}Z?VEyp^QuU)n66) -z>D~HsFa9h^b%luJOM*Z3ijoAjtQH#BsE{wrZ`*k&j+()`BEBYDJ0{O78>p{WF -zgpLDYQz$pIX2DO)S{EF6WxM2_XC$|-ima;ye&cx@+uv>iat!eQd9elnvu9NBub(=C -zmCMJ|+LDQ0QJKJ779CCVXx~k-cN3sWtcuTa^${LlpiGz+qV?Ur09l4WN);8Np{!y@ -zyJG7e$=a=oJD*VO?%DUvzVyU7OlVMaz4)g%ckYGMdzPzaC`4-xtaP7iS$UIDVmE${4}8W{bvJQ9_wF*Th^mQ)vYPMl|Ud -z3D`ZoA1Wyoz{uqUL&X3Rg#snm)g^g&wdC5nBM4aDgNMHXZ2DUlkSXX|?Q{L_I(kVh -z|N5yTSiWp5)gIj=PVorV*mcSE^pWdmBiFS7C5t6Vzmhn?(5S9a!3R-G666D9Xvh7{ -zoG-%8cFC(dB&*gbZg^0Y-E=1$V{!V)Y39#KGdLu~=^+Xm?=wF1UJQiV5D*y?64S~E5t=CFT}aP> -z;)!*VAKjrC2no~j`0+g>p48g2j~Z30gy{9xKAC#Fmr;%_!cW@BoWc@hGjs#b}C%N1Sn8OGKO}=BuoHOssLqctQDMf -zjLq@$6c4YF{P!OfMM=VARa}DZ3vm12nt+^V3J1W~zVjl(BSn@k8_TR2^&}F)d&r8y -z&@j1<4o3EF2B#;YvHX0454XCKvUGBP1G&-=npl8uZmP~c#rmz1KR+k=&7aFZ?#4Q} -z?BWzhEzU4~N{aeA%j-lUwCkX~0h$_ZPCmin&yPyhzuF55Y9>x4KhS}42P0ZGk%$Jd -z{`L5l&WE7=TadE6wvKPw?*8z)weUhsjm7*qX%@^)bJ2MewFLFQDgd#e$rGE>_}GA6vi`|2U5iexQqc?%u>#zQ38heQ@{v9o&6? -z2jd#yvwvrC@{u;RRl;A(FcBxgvZJExBSKPY?d^XC8AWt_41aHrV)aJJ?T<_Ddb+$& -zoP2`CnJX(;Fekg3HAj|H(MYe7qWZ}F<>|}zvN#m)T -zG@kt65ZUftvYl<@`?jGx=+hVUWHO|PIIdwG%D6S*Ug8F(3N@56wu(Z{7 -zsp0<2g=}Bk#H1sS#Qoq|)NI?yrnNiix$yzipe9jei}0h{72uMxT|Rh*VCig&8T$|x -zRSs-X(SSx7?sPn7;{U$>RhK&-SKRq(^!$rQ!Krg#W-C0uGZ2szn%Vv1zZDB|J@9^j -z$NzK&OBc5Qkn8DX`;&iS)jG+4|K8;#1Mi+a9{%-Gn-h-+YavXIl;4Ta5@BM>ks(FG -zjlqR`do&Dt=M$3Ko>2RYCr&;g!_4U^Mz4O%g)E%c#K2II!J#4p0|iF14*9%`<4SUU1MJz_M$dpo$?^rr=3&DgXspsi!^#ZQ -zRSBBwp`k|i?ro^iN@O?-j#S>-24KwXYs*rR7NPZ^6p2(y2kBCR -zay{W78l)q18>HJFm;Ca<=m}1m49jQ2Ks6eEu&h&qM#7I~=8Kz>@ -zcfPRry{o?dyUm2q7Yx9RbRf -zHek?LLqGO7CR!M$&Z>dnsoGLi~oHUCU -zrkOf9MRk>kK)j}vQb5AvS=pB7;sx=Bpy;RoDz;*rB>#GzeIdsOKR)of7A~EFR7#LZ -zLtPCtHwkL0A(<4U(*nm)6bj(F$_wfR^|gZLCX4zyi;9e(s?uWlvI=Udt-yl#g52%Q -z=9@#OvtDJ4RJLJS;=zt6O-~g%`xx1{i@vAVGkC|Ul6x3a4;P)HW0omnERu;b0^*r8 -z<#_-deTwVvmE7@c`23d5hI5V(jIRPWr}kOw_QV$WQFs}j^Qb9@w1E81^9OnSPiF+Z -zX_f2Hv+5QcM@FjF{J?wFI+v?|;B^mQg3akCrGhBPjNb5?t|1UY*R&@Rg5Ew!Wn~!G2vORj*9^4v-u7H0R|T-J -z|Ney6-C?h@g#UN&BzCD}X;#$qzf>$?qrxD*H#3QH;iff~6 -zkdqd`JCCuLH`$`LLMxm{*0_A(`p|Ru)H#Bci@o4ql~Rpd7kYNOaP?L5`23Yig0&smwvC}}Pif|>;KnO -zTh!KAC7sseoG`};K^YNO#45_~^4&1AG&WA*h!ZIL2NapK2!zZ0j49|50f{9P&Fg-p -za0*`@UQ8i=L#QY-(fbl5B_dK4WeQ73Z1bU66RZ;6Lse2z*xSSK=H2u>@*>%X*F@+n -zmn;`pz^}YOe8w2K>LQzIt>Q2D4e+{#vw&1DUyZHLZtU#JYU{*vBU@0j}f^%WT5< -zgXl{LKKaYw4Sxd8I8^f>!G+D4RUam?T!)dK9i_=2RcgI`g|>XLRrut4WXg{*zIt^f -z?>w!FbSh+}3QGi(1m9a&`*M-h>t0{wX5RqZ^hXD?Dq>8l;KK7#95Fw|v?(c?8|_l} -zFt%CaWWTspFPA$ImX0MXp#$)QC`~BFV~>5UCqnSR$oc#*KgkfX7_-q!I0zB@qBv#O -z>^?yV&jv|L<(=Csj8{?rG}Ty3@~FAg9X*%g`%b6->GkaW&hItUexgM~McDa1juV8< -zBUEr7=_)}*ogmw#6OSc -z7F4Vn%@RVHO%9Gfrh-&bgbOCX_AB6Aea@;%!IdAcC!6i%j{97!Dw~C$Jf3uY1)bYF -z$PHytQlVUlausggLFQeY;R1#JJcZpu$nIzq*w&%=?vL|m5-FVb&ID(ioMFM-G);|m -zgg_`=O(QY2xfyeqJ*-RuV1Sl+2~pPtl2P}|Ctmtqk>4#o78Zb&;g3V_<=4eAkxd?G -zeBlwfpv0XD6QClr7QTOI#R^5rNxNBHWqz+`I)x=j)>YAP`~up4@<-Hgfz_KN^C#I@ -zCa6X{Nva}TJrvZoSmXv=eJKu{I2C@c%c|1oE}C~Aj7@zoOK#5x-Uaa4PtIq-+^{iv -zwtX*7|L#b+YARXkkDGqHBS~C+okM#coOz1P`R7!Hpo$UL`!o$7RZ1lVOBSVBvo^<` -zU6PT3VMZ^VNZt4bT*t+gE_OPBU6CMJog!7AA=6St)r4AV=QdNbpoz*Eb)+U#VbvyZ -z`t!Qghj+ZPQF6z<1%CSLEX87x>MB7)y{%It2+jZiAOJ~3K~#}0qXI8ZMUN|RvqaTY -zzy&YYl1hbvdL)_V(`$^+`s`R&)N$kR1>96N;2YxSc`ZE -z$}orGFM?9a4!KMXkv};7VJ0V)^n?T5R>rc36xsL;-0gcMYxML0PFRCzFc0!Oy)KK8;z^QzdoJ%A5jg#*f}FlP4zm)|d5l -zbU(419S>|kAZVR3icD3-{@<7-NY!Vkncm2lGo~^6?`Bee@>r~vFkSrEQ<8uBmq9N7 -zWET%TK0>jmB38rPgRbiX3el2NrAo_Hr7CTLP#Tj6hTO?~d+Mk%B1yoyHJ6_Z8>|6aXGR~t$Dmuy-LaY3YZ?w_&tJyH1YRfxmZ)trI38!;z^u;?$n?pw9r35u68I4r7)=*Jf$xzQ= -zghjgF3zoJ?H&swGtBLfaYFu04dNkAaPPp^F0_$GMF=3odYjYwnu8dfQh#TZ1S_W(z&4GBE-wT|= -z>sQ)^GSDyO@q|PfRKm)n7~Ii@v!jFFL3r0YtZ;95N>kXORf)J=W|A~180pgrX`}#a -z+k;a)25dZ3EJ#2SJ8{{Vh~g;@^aT%7%COi;2uLTr#9Yh`+1e&q?J;UDyD$~_MqfOG$|a2v -zi*m__`}yV%dTDES%cE9hnk87CTLGo6my7{(Qo`>160Yt$jSVv8Ww$9Ag%IR7O1?-$ -z-7t(Ani!8>nZBN3)`TaFK_y@ezYp9vVeary$m))s3&7S+Xz%sQa+Sx`3Y&zxMensT -ziZGFcRHc67#OOS*;}0bl%cwPvS~jPzJ?JOpYfnprbNXyMiYN*Jn|6gOv2b2GqA}x% -zyCC2-HibzKZ>Y2Qw@+zTOAa_}yZ04Pipu&bs$U}>+212sm!|2cv5dZW2AO%GGyIDi -zioECj-8}f%NRTKrxmu+O>HiKQa(LIpER%w~;szVucR{FLw%zv%N-C1+B(=?T9PA@As*2HPO{Zqr -zsE9TBD<|TX=D*jEY47I6XU-w{eU^TNzH_V -zDxn-0Zj#}8slYmwF>kIcxfUg(XqbvgyIql{>J&{!y7g(rP}W$7c>5vK8u^Hs(eEr( -zrTZ11G&Q)gDq!BBARr6;gyY#~Obj%#5Fm#Kg8FgaN;@8kQz#M;7tI#@eS?ZeUs7ID -zE*Y?E<8WyN4kXTs5Mep4w~wYxPIBo58hPq_ww=LUx&>kFsCwRr!%A4x&ugLey;HH8 -zw2(jhqU3!a>E(r&@+A!s0vD5LaPGe*mBsxd@8z4hSz&%bP-+1USl7&U@1qzznp}v$ -zx?!;H`>`TsX_S;9&|!&)LvVm=pWOJBiQB8oct^l|^jceJa(U!OlG6~X*X%7$%gcg^QJ -z2@eX?!V#Kw|GT7ucb#4tK8)vgX}2hyq^ho(H|j_?S2FtS>7-_B3)Vjfm;G};4?a2) -zxgX0Gx@yu65u~6Yo2uZ}p^LdLHz9}v{JaCPI7UVNq!LQIuq}k&WH*9vnV&N+d+ypqaafnG)il@gMjm!1LF=*!R2>znw~znZ5Dz{!65NlU>=XvfsT34cJ-->g -zklz(s4GGZi3bWoK%E0xb|42q!m(^lh(L{KV57`HGL_~R9!FeKntcoytg_igjmrF&h -zllNd>Ps4a88mwD3*hyWkY#g%>1p%4i|6}avN+Z9da0^8}7q1wl -z@x)v5`&0o1tlbj+aom_h2|3S?3#ByjAdw`zh~nwSGs&a`7o8i%NCP``u%4-{#Ime6 -zR7iwv(Xel;SL9WDP3M&*jIfkDMp3hyyh7uS^%Y_w{DqlI+c9hRz -zHq@1>B>!V7ljy=3h55!tRi2s`ev^O_p%PKI0ZL7Rcgkc#4WeErZXaK-B5hGi8b3tk -zHh7Qnvhaztpe6(3st!Q`S$1p#^>yjUV{|>DOu#piQ660I%sij6P=GtV1`E?B3z{12 -z$eIVw!-xxoh|z_J(lyLy6x@TnFk~yI>$2=7J)l;zVgjmv}&Lc`1VHYfPK$DPgB`%mXZS%L5& -zKovtJ{Nkn(wQ4r*6-MXDuxC*egi?VE7IopwJcbbw$AAH0@T`QHgHbVrOhw-x3W}g= -zTDW(*2R(F3mcbQNY`lVsS{N&#uWNjLWPeY5D+Qzx&An&#%qSY9To>sKN1mNY4e>3o -z&rK@2(B2cS#;h5sC}QIM$3zN)xfVu}G1B+8OsA4W0?s*8D-}8HlIzh{E?u4B%{=O6 -zH&J<{1~qoIDZcvMK5}_Qn|mZ*9a_#7l`K=M5yk=W7$A~KER%6IX(+-Dg+auJ7pmCU -zstArA-}F(Mu`*#fL9~9^bcrHJ7o^8F8%S2E5SR=a)7y#*kRSFmN1cHQZ>4|)Up{es -zb;LTm`9h>OfM3HM(0)APV!jai-ll+zADf8!$duNQ5W~oQ#7xB8VIL{;d3)2Rgu#EV -zdpJO|Z2L_dxFrOQM~o&pO*_mFJ|_9$%`IF#a6FwV5oKVSH|VwEiDb5AxSIsgI9(W< -zSCu&PF$gvuxA-uwr_Pn{(nYL7GzJMNFJ%a4-u=YkfMjC`lI-kIf7wzPMlBxJSl*Ut -zs62E8WW4{6mgb7cW|sMUuy+2)WRvUfx=|)B=y3r4F}gJo!$(T%M^v1?Kr~AoX#!{D -z1je+6!Z*@26hg99Z>|*)35(|A#v{BIJ=g#EW!hfZ6-zjTE|b{T4aJ>wBhD=?Y>LuB -zlq#jjn!GCC4N_$nzD$zQ%9ell66%GuXozZJNJV?s>*|IzG1CSNB%td -ztrU>yp@3v!79=0?r(*7r-}o)A={9&AtWnL-++;@xdl3ewRocqQj75Yo{V3iFQwV5o -z4lTv--f%2zx-!k1eIzQAG_44g-0q*>iJL8y#8$#@H>qMf#a{@^sJrmAd{BQ81iT`O -zV8p2)!N!eQ2QR(|A>6Pc(SJxHMmZ62;+$dfMGP4e$plr)j{soRCOt%FpMtTEoTpzq -z0+3F?{4l*T?X47$i2#ciR8w6Ut=^US9G1|{(0oPbx_Ww(8>15VuF<2b^b{EdTaJUKL!LPq?G5=giRmyIR;iV=VE6P=M#S%-xDxF!N -z;&hhyl+;*)rDQ|P*!>8|7=e2K@P37G+G3ca^b+B>7=e2ITPYx;0P5>gCGMv?qK8!! -z9j|iGqqy&DaL&MREI?N!mNin_W5#|#=RtqyifP?t)E)Mp>D*bi;SM?;MEurG#ZJ|v -zNzKtuRplM}o_;yh;ASRInp}9laEVgxd?X$h(ar6(Nk8Be0I-moAA_bs;| -z0I9kR$te|q6&YB)(TI~(i2lSnl|(l;rLZf8KdOjix)r4`tcnNSQE4;U^~NkgoNgaL -z!=@#S=1lyIyj_(cFKQWa;S4 -z(zSPhTp@~gi&)FdSPefzUi+4Lvjnx(R*Ao9E`nKg7ugdgEy-Z1T4mh2s!C&Mr3agc -z5@ze0jA&J)NH%5yE7E!EqbScmjc9tqPgUjI8ewEkV>EUZc>t7_FA8BiCnIiAvFSbW -zGEjr58&o4w=0Q`&CGyOF^%0uZ*WOp^Mh8fh$Ac8MXE|haF9gaa)O81>^$s*D-3yGn -z{Nt<2{;{DFj-4l%J4GpivX*aUHJy4=ik%cG$PqqCys -zb(tflqNtboe9fi^evlqfly8NXWeHMs6%;0ADZZM;-LjXFEqkb*GudF8h!TfeMFN3+ -z2)HovBF2IWzo)j8T -zFr|}sI8=^gb(&;Dnxe>pg8t`UrF#BUggMJYNkl@|qWgWRf?a2sialE39&w$}(6L{$ -z;lD{KvrN=6?FHAmAR1*B`vmY?BMaIyIHeEm8|2& -zJ@D<{ha-qDSrKklfAEXn3{!|mGs?)O4=1ULXv2orumDOyO;zZ|$)a1^uigyF)(S~z;eOTwg!2s0*#owx+vEt6mITree~ -zKCqGsfg3>#f|6a+tQi^6L|w>Jf9NI2^P3fqys{s$n+@~E!_0AlJDyeyhx%?1uN~D} -zB_IXhY~X)@zn2moeWr)+ef@aGk3ACQy7ad9vFVA&=;$7ytxK}KUGd0^if4_EMK>7p -z=sx%5AtsDVFmHAm%`FldiBd7^L0D*ICyeQ~vMh>N(&98>+_^6xs$46>H~FyB350Et -zXiVeo&^5^;Tid9aKP9?>BaMFJMcYKn@=7L;5>ywKFaXVt(WYN242aouLoHF7uQCNn -zSO`1TvC-_&<+*0=aE{J9pA0_xojXgPLwyETEP$zF1f%K&^;J+?0o4`Sd${{KX$r?K -z;N8IUZ>4~M?&|y@bU)P3-}68Rmwf1cetq3aCXKJAacmO{S1zahxd&M^UDsm&Qm-q48pEfXSMl$H|5g9K)`8u4kec;N`RDfjCfO$Ou -zaf|LD;$~$~j--$gsGMTxkmbAPPPd09xAL+_g$@hb=5ZFkHAWp -zO_ZfV7F^tcVG<3sVJp+f1A={;X9Wm_%of>k-5(jg_qh<8O~5;k6wICoqw56CHF}__ -zAKEAx2JNnb8y}Wj|4?xLb?8Y0yAD`k9mMDQXAc!Ssja=hvoEx9`Y98rsY#N|WJpvs -zG2Fg2KpQhjL1V38%2 -zW0R$PH&99#9#;JN_d0&7o7qg=)FzyQ!$4R6TP`5daVZYvkw|2(OTMj>=64>4unq0+ -zm%hd<{qG6cuBmLf6^p-g1&J+L6wF>@pZhaK1ck-gvjJ+&t-B2irt2Hk#c -z#%xL_;z7PZ69XZ!i=7oTKkNH^fE8r4G0q@`ib!t$omdR9J_fVq<` -z{_`UV5|$o2@P)7R(LW#~9z=XPlgZ(WcUCkpop?8lw82Ys@_Jm6Q+WNsx^fjA4{T@P -z<*oydLoynuuxq`#mCiv5U44e%PFS(054+m9{V^D8|x9{QmKUs_P=6N?vn?kZ?e01)) -z6$K`zjr?B=x^@-;{VuBK8*h3f1byd*o7s5=sWxxLAP(?|8 -z^C10?wNvQM9++A8sNZ%)BDksCu8wG}wx6HyiHs^rLGd{@zU2^QMi#^^a;*Kk;iD4N -zEGWliV9h2rUws{ecZAcTihYCLN22xX(Oica{KLQt8|b?3E&$G63}+r`1u{%*Adx~N -zm3A_`?w5BdzV*l8qDO#pJXfDXSwM>DQP7Zozmd7d>^1JC78_efwiTDOLx!;&&u4czW6%7kinG!y;bXF>| -zJNB~e2RF0xi$BBN))Bep+@7vTt4QUzW$E-jBcRaP%dT(U0Knu%xO7E0GMZRFEQCKD -zSLqJ$3fkHv-?=41;r(Y|&B5NxZxs2c4fv@4%fDUo6n*`=#vxr-OR{+$MJH@#Ee-1} -zJzB~oD-+D|%CWAzdYIj9PINX11|7ldtSD7U<*A^wb!kOL1V~n{`@jVRpmLg~tmj`D -zAlET`KZB8yI-jfDtD0+`(xOVWq3bk;{eTQSj%GQ>t7CNB02u;<46 -z*z$?*G4kgZLrXUv#%*D-ktjw{06yhal_e{pK7 -z1fMuxYtKRvuD@Y0(r_*^N`cqztY|{`e&4K_)AR|lJ9W{Nb%0!~bZc1a+4uZj-3{b* -zyIIM=G6Bf`5uDz^Fm^CdEZ@fuyY+;$Wf34(F>6!SbcrxeVF_feK=+@YyVN}Na -z!rpet<~@qrUJmooz$f0QP5egFSO3M!mGJ3*e};}O?VBenE2(Im6BP~_j!O2A#WQT) -zv&?g~ep_VCx_q#3L1#sKKRYXWOlvb9bPt4e7&1n6FN0i#!Mrjm3N54Kp+NyLlXy}wxOx*CzIZKd-~1hTWKOFg -zLDN|i8MSf>>E_C4ET40<`$kwO6$F}o!U};qoMX=~?$qmL!#PKbp!*E*8Z2X`ijpwY -zE6MgL9*8CnzXY`ZtqRB{;O7AOg5usk?+VtmX8eRmXH2)uU|P$93s!_${b#=!3IhIk -zZ#1);yCp;{nDr8hMjIf@7EBx;W%LRm4#l0v+$HSf&o$Ybq9$?s}R+#X275+q&8Qqg&YiZ`b0i-|3k%LDM@YG3LCPR8FXk -zDiRq*w|q23*miU*f@jkEo?3_8sePkQoUNh$;GQf>==$dDm%&cSu0D7;49B*4NoxL9 -z1q9&hzHa!|f3Id_#6bZS4Rs_kO{L9*VDo4btjBw>J^Krnbr^y))2ij@$|67(=6Q$zGFB? -z$MqVuYN~*D%(7xZB_&9mZ$*ZCCCY_ow@1GI8@`9~w=5uA(4ZX1p?fB1`?6=S&*S4OEQEluHhoovwy)DJKYX^PH2?0dfbb;Tk+ -z@+545@OWeSz1`7tg`WqBG)#zE5+OvS5q6LyG~BA8^;_Ba#h=jr{ab?XPtB}m;y*25 -z)QZWtc_&aHf$;nEoPt+~A*;j -zVlW4{t`C-l+vpafFPg!Wi|3PS$dKz8j+O%i3Pme!HKPBPoINq* -zWtHjdCW{W8w>=iD{nD9HGp~&J(DJ5BDNnw#Lz*75Ihy|aUtsv{A|Uqw-2mVG?^oy_ -z(2JX{twD;{o;WLnrpNooQ_pHG^m;lgn($#mT__BNK~F#u2S!g5mY{M@bXZ>hOC5i8 -zjY*_MrzarAZF?jAu}bnE=4^6GI|P~T&cF*B*?8sm>HFQo!E3cAjArT;OQ@gQLUFi2 -zz9(B|xDLpI8xH0f)B=*3JUZ4~!sy@#WVi3d*{~acOHUBgSBVf;h&9`gUYW13^>t_a -z^moMEtKYmC8~4o;kRouG|I3C=eZeNEXqvoVCzvzIqQWZ`x$zG<3SK?3(R*OuofTyW -z1W4n@j6t%U!$C6hK#$DmXb*m8dzO69UzuGuEP|Ex(6)gr%5lTKSJI%H#7kaFf(4%< -zGQ#fv{S!OB@Ka=)eh!IoX(s%`JjR|nl|)5?Y}YWwp?$mdu1C$0h0wC3TN=Wdab||k -z(^7+LHV5xLW|kH2}{YKx=1fjWIJ -zv?CpPz(G1_4wc_?*FQ#{@4?OewPeV6;{#~X1=>)~WJh|?X{i4V?BLz=b!~03KG#Joqw1Z>5tsB*^E$CTC -z32ejT3n(R$2>Uv4Jv_s^t1og1_rF=2_RSQKy}(w0Ki=II#vwKPKXzc!Xd@1JE+2GO -z)O$q*JS%B*Ry2oY`kfWc9Lh0Ey&k}hqA-{{V7f_Q@utMuF)7Hl{k6e*X-$Q4!#WQQ -z>DoczQ_%6yc)vTGW!KN|V(+(qAB{CWu!zd>wJ52`b&pUO$nW13Nk!2U5O**XkYsaR -zq%UmHIK#HdZf^@+~@2ALs+^=T)eZQS&0~%XQ_SSF-E8N_Q8YJ8!J(p -z!fJ>jV$SY7g}&T=3Wp)hGTynum`A>kj)&Q;ZEU{gI`U6%@LZ}ClRvhIx;ZTfA#k!q -zvYq82-2HN|a&ABksb9Xhw8fB8%(V;rTgBb%xL*?-XOAX8uMnX{k1GZL@2)4egZYSF -zS@&jc*f(21f=cu*Q$XtWe^&XVQQ=1D=yJl&iZL`Z=&rbr&Wer;2#Z~H?+nh@ySWoP -znFvcq4+QQNg34J9C9m%8+KO2bF(n0@92O$!sGLxVOM3ib?{<- -zmYPR$frgs9pV*BoIAkgh&YY0UsH##l>%}e|N4%DRnAvyZ-&QhFz7WYnc?Z{SVcS(d -zLV0de?eU|SaLz0e)hSSld`~vmVKUVf2jynV!M$o&lHZSt!$>Qlq9GuuWaLK8 -zMBdQaE$sOGPXd>$VdXf+tek?Cvb}p72_V|nbNFMkWkDi)^z~(y%_G@V8(h+viC+Gx -z_GU7o4I!YnFT9V&DxnLW3`=1}Yr7&A#eeTeG$pg=?JOVxSl8E|kGLcIdzi|-r%#4i -za=$*^in`;LF(DTLSv8uU3|z?V#m2yQshSp!kQms}d(b9LS!tWp^inG_vTN|QgJH8i -z-m@U~lu?LO!sz`U#w#P6cd`BR*9G^~bml}_mrX?27P2UHyiqu?t^kTab-yh|Z$5=H -z5boH4?LU7J)C@G9F@fe|#vv?$ -zn|H}|4eys*_ge67VL)3xr#)0|)wA>v*$<`n@ZOpmu^5ij-t_f{-&<2@bS1I%JP*s( -zKXyWBYKe&QEdhq3F4o}NSwQlB%$YN?uzDl!-=!pMsPjCR4VyJ;74PsJQ0I+IbB{ZR -zZw{Wti*APKIAcMgu8OKt^{npx7dt5o<`0^im1-*EW);+HQcrv`Ab=XsH!5n|v#UORDaqzKK31`V -zGpc`wEu6rWRZ=Ui-o8*kQb|$bPQ{w6#Jwzik5Spqy`2Rlc(kVPY$Yu0i -z4`|zyutO*}URNR&v^h(-rvEfvktw6`nE}8ns6TdI=w@y2p{lOxpxkV-HeGgO{w0R5 -zEVw$~fbN#!!>Os}x(LTf6&!Z`@@|~~Vpp8!<&K1H7(2%Z(#20>`?m8-3N-fI7CZ2J9I}1n0&U7R=e1$Z{#Hs+H8mV&zvqcKW7`o?~0LmS`Vlu+EDD>wj^yl`Wn*RDD+c|`ET$H15 -zwrc@tn$gVH7Iv^Cc^8hWa2$m((=*a%ARZ6;^&UY>FGqJP@na4pJr^t)1zC(e^tKg{ -z3SU5)n=(-W5&NH@D-=WX?6{>J7JcotuCS6X3?0P)R#-G-8gLbM7)&-ULu=;IDaM^S9V=;* -z@5%l}ChlK*Xg5t;yJBxHux6jVc!W7skH?1GsK`*OqN7R}y8*;YXf>>az)Bbay5)7Z -z@pfk_x-}}_&H@rl`x(_z5ew4y-$Cy2a&0wLLc3R1batUquqyjbzC64D*XS%547v1p -z@hXNbHk`01_^s{P9S7~EQw^E2&UL=4G!Du4Wg}zE-0l#TO*Pg60%u@^o!`GXIN$j9 -z&cUuolIuP&7`JpID~9*<1rWHiOT!Ft%cV* -zIB>gMH*~)e-iV6I=MiV4^yF!onEbGqSV41S!gOg|UfpB+5g9 -zDoJu3n8*DG`(6oBXigifwmfM^KS#Ss%zXfiXKX}y+r-6w8fX)*GTQ$~ -zYfBW}kl3viQuv)xcQX7XNF-Bn^hjhZ<-H~v^*Dju+n-^@{74)d8KDLFL>5XJN -zMn&of0Q8_% -zE809D4pw)VN) -zF*Fjs&u8N1`@en8t&*;Kv*a#! -zV~laZI2eON3y@G!NC>HuHYt#qWRgs#CHW>pdQWCDFoD#8K~rWx3-ddL3QWWzIg_A)(RPibR_AvL5|+E*EbFk -z7u3FOCUtA39hY$cWP3;b(8|tOSO?YSb>`^?>(`cOlso}>o!8NTlsI1aD#FY$BV%p~ -zXy~!^M0Cw@Q7q{|Bqk^e8_2XbvVqL>zNym+XocMIqb`G^!QGtN6k&`OzCUs)PdO1FC!PRSti3f5=E*@-T;p;IwSnN!>_1o -zp;n|UNz+H(8lYw`bpE$^b^*+i0F;m!8?!+fOyOWgQR@_GlUQ0aXZg~(jP5>!wMVgn -zR4r=^wd9X?rs=wMABEO13r@|2(}~v|KPu{24r50K{riwRIOS-;KltQ4>}+ht`mIBN~VR76H8X -zozscOHOif_u{L`;}Ncntf$S1YBc+z$U_jK>Gaih+&ONwTM3`5R)|2BxP1A1 -zO3qTSZ(;v9>9&FYcB1ZgsSeqg<$=MB6%AZVM`9gOUNw2<65>s@^gZkr1W&2*VPok? -zhIaJQfA=9DVe*Y?Z387!%l{lqm$8l^1rkWewvS?Wsxa$=?}_r(^Gp3Yt6JC|#4faH -z&Om9{WA2Y91m~|;&-%rEQln&2=$9E0zOndSG)}PBMdRxE&8-X7L1w%W4P-V@25{Pn -zhERfD7#}}wi1(3~)Lkq)Zv~Ft`WZ6CSD;o530}G_rG^L_mmx4>QJUU+p8vbUj~yjH -z@Lw0k5vIUwR9-`lI~a)|@wbZ#dseytZi`0Ud8^3x43c?rn_BquYy925|AkJ{Pfz4+ -zjxQ>wd_nD>b$;XBX$qs+z&H-8b6UB~;4eQ^;m_50x6PaD*KfBjc;h(W*eVxUxlCPm -zTc6UV)LViaN8-5N*+cq6!bpZ7mJ~FHNBoz(5e;OS?<40{Y6+Q5Vf^?SH2a1moo)n> -zTC7AZWr)rMFpb~_8zNl)&}jLE?rC%YUfWUQQ)+1X!n^&qdLL{5FEEp6iF$oF+!0mE -z!0nNu@am|`g1=-YWs7DpzF&<%#21zmt4!eJZF-+-C$o7Xm5@Vi87n -zDs7e2+-jV>P0tgD$nTxJ*|B=vv_A`$&i0Kl-ZhN09I|^y{ICk(XWuGg&aCJJMoK18 -z7}gVR=~FMMKb$@-xbF5|t={2lo4Cl9C!T9dpLSTmfXSp#tK`Hj@o -z1_)MmbR5S%zUuCtcJ)Mzx)ia7YM-qL0NV#``6U(y1$!{{^HK&Z~(-lq>! -z*snrTkurQV44`yn4avr`<4ZYghtb1>jCT)XXDl+?Mts8r_@}=~a^{+nV7A|DL@bI@ -zbw+&;qD6+K*{iEeEZ-d&otKNEsn$4z2kyTfc@+5G5PFfLEaVM#jc&#TPL-8ix -zN)pWY$=1DlTi**b(mr!|!_w9`9T8#`lRcc{%`$`x-$L?hUl98Uizky*72 -zY&uGQpYj}{%plSf_n}~;(xh^6{qf~;*#aZ``^b-EC=6uDzC3~)3%uf&|0=;dFG+uNTtt@V%lOC&MnDKJm8U-voyj_tn2qWaERo$l`T`j_*^ie`IA($7G24&*dL0Uosm{Q9jV`F2c(~V`(B3CkvN}&>Pb7J&d03 -zi{N*J5X7p>ne{hU5?j`ylG;rJ^grMEXN6lnW4r4?M8xo!;O&e>zFm2Sinp(&bl!9y -zWdpGG_mSJFY9*rFAh9ro)fGU&Rc~s>i2v!1=-kja!~6TN#`9zkq{;6b4=FqS%iovq -z{wvBSs1FMb!u6XAHIfBA()E}tb*|k-^Mg9jpmNvL$8AnH{u(WQRw{jT}9$18i+och8(wOLBH|kYJle(RSvBM{Zo8>wqh$ -z*9^qjL!<|RF$qsT+0Y7#rb)D_oLQfH4<+kQQJ!SWAU#hXKJLU_OmeP<%P?;p$l>%_ -zMCLZpaLHQj+`=sBqRb$%upE2b@*5drb4n>`e&r@t=}5*phZ*Y_!Wzzzd3o6PRsc0s -zaKn$wx%}d?P(I-$;-1`{P6)2+ehOgco;=t7V32EnFi6|Mg8z3?N}3uYoOhPG)|d7v -zLTaCO)UA66J&$q1Lc5?CZPvEX_W*qSLyL*U++ABb3?4cXUci(52WtM~ -z=10}ttb5mbjCj-^)AbWQHxL$jJm9xH1j%3!0BbOd9x$ULU>?Jn@V!o?qLdk*yqxOy -zoukfePnxc~Th)Z%pNP07Bc~8ach|QiA{k}IU%y+i6uL#YOna9zAM7X7lO}sGO>XOGsBUuQ+auh1Lp7%@PlS?eQ6x(cO2(bARP(OA -zdEWc+As&9Rl)D~)tG_hF*qGycY{P&{-lB5Pn>R>CGFrjcBBa*KB!h1rRq2_FgziC> -zzU~d={Ikt}_QI>P);4R!!3@KPcfP`130}Jo*|fTjregX0;I~5%Z2;v8ZE?%uh3V%b -z#Q{W79YuRO{@=TwW5lCOdFOhj{?i8#wPiR17JYXfr03~&a(%Br04*kdhN1Ox&%E~I -zBxf`#p-rGLn5O-Qx2PXR1&KxF7%>xTFo$$|(h?_EPEfV-7oP2q8ysh(t(Wn`BV=A0 -z#y(QepAEnISp{FZrkaNONa(ViB0Uu^{0X{qG-)+k@^3e$S-#>lwr$_dO*h}lfp*EE -zBQ7#&!e6sMt19eevB>Fc3;4U2j!d`J&SL(LXW6=w-+gW|Q=3ZtD;;d_3I02Lz4RExINhw%NJ1ky{qYeVl#a=+)r-j2t7MTFe*&qGgBC` -z2u9REn1V=Y3`;Kvdgr9+{>AF6{OfTXi=($ZigUOR3`m@mQj*Y)q;M$c4XapqjDnz) -z?y -z9rg7Ml$Tezo?rURm$oe^D>eAb4<-4^w=&%Fv}DCxFl9hCu6q$-dNOkg*N{B^;kNW9hgtuqu>5{jb_x9QR__|^4 -zdcb1+T9db)pJerlB%MbsOf$+Ur>NX)#|}lGTU})ai8pE;tb0=lv1o=}M`7Cmhb2=r -zGCAS3naEI1;&~M_s(!w*MUZ%0lC^y=@*s-T`t@NTPuyKqa^0`ex83!iodWpIKQCv- -z^pw9F4R>^77e+&2|76DENcjC@Ztn51i-|Q>hw}%4{!Q?k0?Zo5M5^nE&q`ZX6l?$m{u>kpjw_v5mv4%&nM#hy_h?ry!bkg(ld)yT$d=Dbx -z0-2N8>2YYR#!ipZdHvn0IJl-BkrckFlhqltyOhtbo!~XHeHn&#^pM{Z6cQ`T;cq^Z -zNtLPa&9W!lzRA$C#kA5lsKjv770%W&16T6 -zd4KDEo3qY3i|>8!d*t(Z?!W(jKJ>v4kj@H=%VgnS?@)_j>L)KJ -zQeLWR&MKrbLb}|xT7*JtQ1o|vpNY^6=0T*Et9XmwmoyWhm|SREth61s^Vdrt98Epe -zt>Q;aR|QIh(J_P2IBlY~6x%9bjps4SBG?qLMwQp;`T1QcL^-XQ!f4J97wy5I?qNg? -z`d{oMdvFA2APh5?uV2b{E*oOyl5yfOq17#9$TL{BBw`9biPnw8>#K^G0d>#nl~KO_ -zy~o+JXAcV&Ea1{hFJ;DKk8}Cumyt@9asBnzbM3X)0`TZl`e?63BA(^;U)M5yszF1Y -z$=`o2$ydLf;rd4;a~lN}Nf9Ek)<<;&Zq39|xrk{9Vus}77a6?tGsh#8ycXEvhFd2r -zinZqVcjUj~%|G4n(>JkXakYQ%3)w8aySE0-P+m)c4R%3c;f_1lfB$nfn-4(6JI++d -zl|qmV1jYo2mcUrTVy+YU^>yYSA;RtPe!IIUs?58sDWbST*pU;CFDE4Yn!#yoB}UXB -zQKM=OhMR|2>2Zc%+y$0H>P-zqE8^sb$JOULN?*h;`0Y+JzG(nwz{03aQTfhwO#O%V -zv*d;^@XLRg&l$@zBokV}PTPHLw?G#{QN7~aB%79Zjc1=xN@cm^>Z`BjzyY;&pK{76 -zTzc8txc9!>`OMXyrn0h<>#nB8BsQFHY5iB8)TFbZ8vsW+K7vY+RbYv)2k*)_32?G%^h?d0>5yP*5kGFO( -zzNHnBGAW-|jXhrQA!8?NAzeAL`cGcsZW;z=GLD&ufniW39KKxk9MfYPbw?Q#{ECWy -z9s|BC8uXKswUD3)7=HS#3O@1qhgq>=1>g9_H)v{V;+Mbt319iTd4z9&`#T5$b6aBmajPl}zHoIZ*L-=D`?f=KmE^pWbr2({!b=&DTMME3 -zwG{E3WJQbM>I>jU4@kx{Q~-Aarve=(nt{x5dt?;E`};%u=9YF=E-R;HRyoZL2{MP< -zC`~95<3tQ%rXXrcHGL-30M6hj{O}KIAvJyRN(JjW@)gBi!f?4R1R}NkLk9VTt>-+_ -z_h$b0dYr$cB;9Lk -zKl!9MxBQ}tTkag=um0+4>g(&sWF%|O6xg=p+OPban{N6~a=9F%=@D#4a^X29AG)%V -z*)yUcBV4;W$+_z?JoJRkbx%PeDp@gGC@x;1kgtNRxOsC0Nj48T3oO)p`&b^vvXb^N -zZ9qM6E^y;K7BDdY03ZNKL_t)EW+17FP`u>%O~X9DY531RSmhOGQGLeA$H4d}hAbfj -zN?+sznqFc;#8nic6{A}|WryP*Pa5H1T?nD-FER+zBt@+N?y7TKBr2*AIK-<<$@GmP -zN(|(fgGd^bOjGSR1&`KT;wRr_=Pf5zR~di^2<94j{yOz2mBuc`Q>BVZfiZYE177YC -zoO^L^m4E4aPZ~0`AH?H=gY6cXjLqQS5GBb9{^Q?<86JYSzvJDcQYn7&lb^6=rQq*B -zSH+Y@6H~iyUMd)i2|oJ%6c0V2An_kR3OxF%s5{r3h#}S#@0;s>csf!_4z{P+-!{O@ -zFLtq~L?4?k&h(@i&V!37u4 -z+S_AiSYd5I{H}u?2DwZz@L8~|ugR3AXDC)6tpMbP%#@jkbG}jVIm4@d+iiIbOD(j-S -zPC{TzYG2g>f^eQAT?R)qq|9+ih0T)iZI4%%Vw4OZN({`1LIXKL7d8^R9Qj -z3n2va=g()xjF}7%k07Na7K`!8PkxfGeeG-9cF!2APECYvlb!;arr?})Np8DGO_jdm -zRF}vhqJEZ$Ls=B!F%_1}5lLxGF`bmggWBtOc%&$PA{vOlL^4?`)EF2qO%jhn)D%>e -zsD~c-I?uzh`E$LOxZK)t+!mwkQ$4m2Y6PhA}(9IfB#k*oH_DC{HysnI7 -zV}+lv>l|73uzLCxm#o1oQ?-u^qQhKOb_Y@VgOtioz{Q08!Es#OAKmYST0a&$a72p2$w^^}b1@q?3W5Wx3eWC`TrFy~b -zlI-5ALdl94T((ju^vx_{fp@Q?|FE32`Kn+Yv+M1IfqDH?Os5N>l^RLJR11`*N9Wi< -z&p%E8`>tQ={zBgJXR(Di)>N#V#5lBtX*=}Z@|c1}pWDND>ygRLIutU=NoPqzBfFBK -zLZcS13o(hVh5Cbn%ep-oNnUwN4P~=}S$*51B-QlD%THAz@t4N>`9SLT#Et&&Lf0~H -zUn$m^7)E)lA^zVw;Z!W}&KmsfF7k#tlX)$IYp%J5`Sa&<^2sN2&t1Ra+g~kZ`BH;) -zI?X3O@d;L}Sizn>d-&jcVt)QJ8P+l~D*3k?RVaDRNsvtFu(+GA7{MIRv0g>A#LkK6 -zL44)~U4IZD>WXw4Zb%+_C`E15Elt5q7Z#x`Ljl -zfhRXpws5AFOK97tw!p((b7%>1Q4X(d)4~uT$XK|4C$+X%d+^xg6h;w4v*SK-I~VAY -zC#N;={zMlSmiz&OyatrHpW}L1N852HAX9n*?tPY&s<XWBBmpAf3*P9=-rhWj_qDM~u*w~Z8TjoZ -z6b8~0m!`*SWoi&iNdLp#g-614Lc_N`O}>A)$ZJf3j%hKwNBZD>j?bS}oY=e963}r9 -z%}~@q9nV0HV^p``$}KxC*>rTtEIu`5kPDMHBV^vs*}}C>Z7Ndp7>*NMvZv$dEk2)> -zop7sa -z1B4+akSL%ThR%2x!XsojdDqKE9(9;^9RG6M1Y7@{x>}Q!rx-{H2M*?gD!zcN+jCs~ -zw|$&`K`+0#WdsQvY%g%{L+bi2I0 -zovYb_c(zMcu%|=uLQS?c$|9Im=um86 -zC}!N?r1gq3rm*!OnS))ypBbv=aOB4O7=7p^x^80EM(g^MZg9XK>^8P&-NHKquK}cPbe3@hxE@>0?di8bvJe -z`gUD(VM2(IPWhiwdI))tQJ0t@Dki1(^h2y;FdphH;!@KR^Z_q-ZoimHR0lqE2YU1E -zBYfd2WBl|NIX?FfV_bN}0N?xRAO{W=5F(JI*wZF?>e&om{^xOGi&9K|_adzE0&>*h -z;~$Li(w3}$+{;%BqFP6>VW=T0+X_NF>8OU*W4#Uygx2By6VX5b_WAXP{;KpA1i+~$C-~NnRX$c8gHvV*zuw_-`Z`YFMZDbgSSo#%4KD@c -zI6c6~i3sxo?7*Gu>g*b$WoEgSL>iPe%p`qupF3I^Kqj8#mMjX2&tE3E?RoV^=dT~6 -zY|$)?*hCdzzyFDlj5uaIXz8$W7E9K)u=nXBASLM?2dFyzB%EBHftw$pdU_cH?V~QV -znkP!Jdt<_gonKV+EYgu7h*&yu(vsDmNI`Ji0Suk|Vb8uinXE%TuOycX1$EzIF*VN- -zF$IZ)ARbqRws>3+j~VK{nEF{PD*VfEWZ0N|L`>^W@I^PJ2U)|}XT*8td8MRVwXA{E -z!Wyzi#~9ey!L>geWXp~MEi(kI2PK&-)Lk-@XnBnOXOCbX&2#lfl -z_8Ee8z4O67re1o0PKNj5ov-GCezgtcW$&A|10$?GeM-nnlsDIr?%L4KX#Nb)bYF|=_9)n}ek+`c<$?N16t(c>4A#tTfDTZ<79IF_XEkIzxHdNG;9 -zJ;<><%iptvhkvn2iAs*=Caz|2j3TYu-r={e6!#VjfpnZui1nu|#HTgYT*0?~^4}Nn -zX>Jspy40Yt-lU<C6g}O=UD)I*+j>gFJA18#3*lchsPCRwbitgACqxghlfNtClCY>JzGYwV@PN%oeU5 -zVUhPTwOiojPS)fPd?2izvH3(ckQcpgp5Azr4_-Mxw4TcAE9r1U9_fU~%KZXXQStD? -z6@ptfDqV?=AKgM~Nej{H)T9ZoKKm?$l2a3@I5M4MWN4i7x>8oZV=>R(w4LlTJIQwS -z`_=U+^XpXeqa$6SHZ?{ow3(0zD3sp4D;=znF$#le@&h9j`iIFK?I+heNcQDcoPp8f -z_8`)6cr9KXU6PJ2TW!n7c+H+JSi2^|^yUclbtd(-CbiWjl@%uOxS+n)h5M%Nr$9y7!`Iz0IrJP{4#h>IXhzxD18zWe|3RFnr{PHA-+h&a;9 -z9T)E_KtrYA(-#PSbiYInjL~)b6HNQ?#cn*HH4C9fKdPHo7zU{~uVCbkXBap-!qj$* -z9p7F0Qx-C@FQ0e(-C5L4t8~4uB%3cF9L0TQ+YXK`u`QeYcmbTtzxKk3~4*`+|)`#t>6b=FK2kf<~O&fI-l?zENofE1_h)DrTNS!o`kvpE@$nI{IuA4*6)JmqGQb+sdUV86&2CMBTD=%nq -zV}A*zLA1PdBBh4_dvu)f{hf^NI>^ACPvP{8yy6;Puyz{F^XsW=t|XR-^2;whFlm%l -zd;<(aD5WyZNTVfDqUCY7T}Kijj_I?j2plOfMIeth0U2`~q%A4rEUdgmb~H~monv%x -zoPo{}`VI|oWKSRYvB}%cZ5tkZ)aJoQCvM|*SApK&@25{dd_f93qmChaa$NXklh1s# -zf|3%!$37cCO;@fJM2g1tkpW_*yhYIV>l}kke=HBr9`^rv7&vgE8_2_+fo$F0A2JYt -zs_FF%?B8*W}W>_LF4QiGVX9v>Mg4<5;6ZUR(hQA*24^L*un50o;oHPRoPs^ -z;xlH^FteJfhH}bkN-$%l3u`;%^nUDP6&(EC(`{=pgX_pU4z}a?!I2PxyzRJQWtcDz -zDNz8JBx)D|lZh#mp_N1_sSK;`dXBe{vv3Lyg-n6*ku1Y~qYQPWIlQNb_AR}y92!c< -z?o#bEkqG?lH6>jB)-oa{{N(x}_Oz+WVj=PFd$JHV{{;+W~JY>1X-{c -zYwKWW;|>OX`|zZ_Q>8UAmcDr|Q|HxF*_fiDrW7eWrPp9)-AisG@d$<~lq}hwP=E5t -zs)Zt}mTAX7mbaj7H&5{Z4#P#$48WEON;fsZAjgpyz59Ic0ArbX~Bh+8Mj?RDi -zEv+xKGjnkx@kErh?^?z^-+vZ_V7Pk>GnU0DNsv9%P3MjG`HHgoYwF?}mYmr_)0|qW -z8q2{{3A!yE9Iw!cmJewcBn_yXUdF(I^q({kL(>s4QYLmYnlkGyUo>2&Qe%nWz -zq&g=dP+^#lLMciZ)9={|?w6DjTS{yomnrbj&sDB_!PTo-c=`;b{u_@_(NIQZLyGB( -z8d-!R!_O6}n#vhC -zkPfcXaqJ)WI-aw)Gxnq=XRiR@(B46iwAzRk!ajx<|)lCa%&JVRL&y= -zL}L*u8dFqFDW~PsX3n^5Dd~YR`j3uqU|T28-WC*LKe|rPQm@U_IABE7=HXSzr7p+j -z*RbTIk!{B?bZ0~1)!?hWkj>Y~K#l;{0HUWi&ATt38w#^xB{7a}-~Hz|vIwXu6HKp# -zr`-EKvaOZMHA~c_otT7wR|w2x9HXw1(Py@k8P8HTy^50Z1a&j2IJm8oolhL1@8D1f -zv3k=x7xU)#FXyzkokZj88WLr3RnU~df(wf862tA{lM)P6vMhw6)wHC<&f9eF@27j; -zAQl#*d;1xB{3xT_`WfFnM7C{&+@Vnlof(`VOR=}-f=c@E(J{LB4bZWzheIzNW#7~7 -z?0jTDTkqS;uBY0_3}?xW<&loWjGLGd)n#D2p2HLZ(=b9jSK1tuTYm^T0QPM>NLfvi -zni=K1c*hdZ9<(L?i(ZF2(G6r6I18B7*_GqM -zbDNpcP~ztlX2fK4&?Y<77iuz`fNB*p>A02F>2)er-PR6rXpGUWJ}Or(#E3`363|+6 -zV{*n63YJC3{aZ=ZCK>7-<&N(@#dv>E6s(?6#@Qb@mGeHlirLGiQd*e|SLwA~*4B1q -zL*vx)e&4cehPu7jvX89pQy&0;^!N=b3|y4UJPXrGn>g-$AlG&YM55k}VIl -zGB!HS>{F-m@D0zi`-yf2x`&x{auXtA_>3j`VAjiz?B%iFYyn_aHC%m>L8>IU9y0=w -zsBpDIf+H1>)&XvT^LYG+lGsw<_WGD%5UoMv@sg -z&mZFcpTFRL)@Lsk)Rb$?j+!?xBSF4qm@+`LTpO{DvE=vlKrT4WZSJPb>&ZZFMN!k& -ze*a(h@E2DtqrhFvlSA3fioXV_s!C#3J$$l;O% -z(>`)BMm!dp&qjbOSoGYtf$s0$?jLW?X;WBv;Ub#n)?u0kw(AZ2+M`r-n8ECXbYt(J -z7fU7Pkj)l&@|Q2N>xqe-)=f)lXj<4n<&+fVHKmkPB#4#8h(;qg-Z9-B-gITGEyuwS -z22wccTw(?#@q|x6ZA%5=+ETLOilt;na*XwjF?eK{u6=#9zubkLb?9#!;pw)`2q9Sa -zu~TU|eFk<28JA>-vpoB&ElTTSYcD-+YivVHEjim^;hI@&x^ovBZdD#(<=Yn1)z;63 -z-|yh0wX;dpl={bO+tSJH-+9`<_J6!gFuPGqfby+EFa#wX)yh5@VRj)iG5K(0C^-lC -z`D?X^UrPhY0@ne5D}e_eJX?6a3#NojI!7T> -zAeU8Q8&&mXYJ62nB5r*oA`E&D3?d!L>F+z4jlbQ-ru)?DYhF-K)DXl|aaO(kB%Z!u -zGr|zmHdW9#tA@?@?4#%K5Xq_}5yPN;XBW4A{c(Q*{PkM|r?!X*lL=lcz9S`u6j=Gd -zbC?ljG-edC>B(zOhx%c2kb7(ao_ehovB_)u+68J -za?#bNv-TZJsjN@Au{r)i_bcWyO!#a|shwBwv^{jnmXc^JLd&XY%sp*7Q|8uE(U>Bc -zN?=Az3bsPHB8EZEb^^m95CC#qL-EKB^m>ZtxlExDG0)f{ZqgkwCepr`5rb$VLP>do -zSb3aORgy?Fg6Se{xDc=qf`gkn7)xhZ_x|Pd9U0{CrXE&Zv6xw>Hv8lgkywPCkM3vD -zIkT9%W(LW!IE74}R6`k64JkTycXRXCf;!z_o+CJSnaj;(iqPD@rSXRO9a`k$8mhv}C-$H`Mdv$Dr;k -zveydj#ju9Z3`#&{nZb&AuyLnkEDxEj`^k=sl3FyAj$b`M`mPPkUDM3vpIgV&d3Amg -zD2hMOMZXFf%r5xDY$?exZ8Nj(`2`)HAaV-mtOv5W`+Af2?KPw**{(Igm -zh?Sc>|2RAVzj!g!TJlj|MVg<s=Aai)9IY`gPb-z%7r -zpg8DQfe{#nPz%8h3()$*e1_mqm&4co)A6UvjJgy~Z<?5uSm@^%GYlL@ -zvg64%9{Kl|0?)BtaQ-rv_)TaABET+4-w>oDF-(COb@>SpC2NF=?|WuHfJ58zAc)J -z6JaSq%1Z>xXA5?X;Td2jU3@TXgru!L6I8(J`#Lb90 -zri+%@GN3+{Zk@$nz#=dXTS^>9`k|N%EqZmHHjpTbk*G}iVW3y^^ZC{vQ;**I~DLuRQX_I(GIf)TwxF{kK3BnBr%94VW -zErRX=iK|@3&PVssFtdWXrpoXG6Gg`1Edq}=$VI4pyVaTkJ!msu6oPr7PSjM3du(8w -zd%yn#y?Yc287+yh^sNh27(_s9Q4)S -z0316>L_t)-1L4z -zKi)rFCRp7fLeC9%Q}MMvJjzi=U`CXeQ642c>yb-OEDYKLez^gT1`X7ob=MVd1OrLC -zh}qcy>Cp`5oju)8k`rZd(t{S`gS|d&zlv2A2{Ufo8k#P1!ik%0gOyh|I}wFbXRG;v -zU7hL|c0SXN#AeFuTB1?YU!0ClD;hjdsWFlmlN1UIu9pdtd_wg8p220u3p{e&M*8=T -zu>4&M>DfC#X?=o|*3b3nbtDQIGdzPqc`*;d^}43Kh3kb;j(cvNN3dN;+75+k5Oo>w -zJwx)0&O4UW>N%drGKJO&pwX>5QqsAnm%G3B1U-9HmOP~lzIKIR@l;LC%Dq{J>G5^B -z&(aE_18_w-?QmVhv7nHdWQXm5I|FC6$qldM8^u5Xo(J9yRPWe5!jgp*%%2l*(Uw%D -zIJ#qRFaxc-WQkULa9y;oP9@xN%wT3fN{B^Z$xOkN3fSm!&$aLDrG0M~Q)bsvQl9V| -z{Q@~b;cMx53&e69-?QL{Gag*47P87Gq#xpVi)qV)d)W6_JM+$(&dKM`XY0LtscWgC -zW%YC-E^I8NbVE0_P(7A*!~40PDS1i13az4sf#s+j-}82U!Ob;l6(*_Ah!`qgDLA$( -zXApQAuUM##Yx)3#9wz4V7F!?Q%OgK|p2C>g?$^wQ&t52Kt_sMeh0DF=^LM!t5`JQC -z5F&>y$=BZAz>#J;P69DMVSe$`w8@8nga_Bl}u#B!7Ms{rxv;~iXn@k}Z!6mM@V -z8N;#@q>py`M8%<5^`g0TT_IOGZacIL(c@wWm{}({Z4R_`DDI?@-VB@mxQ|qAlA7iU -zBBtr*6%j+I+`pP>k0lL0kEXh-+XDIyHFIa2sJ -zR?IZXJGSdN6uj$&N=8u|i|}(ILb--SGSE4~)4zO)9S;VxNFP2^aOGNqR4kC*_K>L% -zsf!Fat-Sjq43}oeLjg_ozLf*3X!PE8;O0%x*6+V{J@B*tsYUxgX&?Y?z;s|)z98xA -zALZP2Q;9~^gDG#QVDLzq{Mc|vOD{xxHVNrBjtqk6w9=hqjxKNDZmVXA9i@ttU9NrIX6$a*`DZKU~}M%t1P~ -z^>Eh5R#H2wip*%9oquejwxyEhlN)J!?l6!1U?bU~JoDGiAW<4~*#iybm3(j@$UP!P -z03%Dc4&u`k3&T(1z3Z?Xg~&x*T0}3LGerP46nFfZ!XRo0zrk|PGY5I#+s`oEsoG{{ -zR>2o95uCA55OqT+GvLpq15Y2IjxK8H@_kvk$qR$ew!t5^hniq7do6md -zP80(HcpSI_sM@tRO;tsNm8aCXa$p8kQ|sv7a~Nd7PZIsPWX+p|kS&L>ykJq~-LWBN -z!bwvFC(nR`M`17ngPo(i{KtL7$|BS@R}hIs6k_A`UAf2c!zZ^mDBOh@i<(q6rFikS -z-Ryew0IB*CYNu6FC|Er5uNx_ADB<*XF2#%(IF`e<`}a{bqnt!4!NcDRMyD5_KZpG< -zcd+Nl{nRh0!!hvN$%Wg6>n&=_t+Evh_;}}JXvl*Qp0T+AgL{uGCm^}@iiHusja~h2 -z-=RSsyWx3u+#hhTUAac^$qNmpR0!2*=z0pr&HwZbOc*Nck~(tb_Y(;}M{#WB{j(zy -zS%gO&=!fq<8A>(Z$*WB3b0Qi@4%i5M05BhWx|^koDw*3-fdC@$C?&OZ^zLo*7kDTq -zDK4urxku621f|x&+E6JtV}YO|4x8O5_Tc6&+O`~~0fH8N>AF#k$_m4UZe8zDa8$j* -zc0G!t?S!e?QU<$+89bck;7dm_5(bH~INR=NW%=ccXqa8&0|Hy_-9tPTrE^ygV|^KB -zt)9YA$0&<0n9HU+wsZKU9!hJI)Xu0NCpCm=z0LS2;lbn+BtV!6H^*X)Es$v -z5+dac9X=dlALkf)Imd!Bba>d$OAN(MI)94bjCqjH!+}1?4CUGR}?B3RhJ-yAR09}+Sbd_ZT*b( -zW?262MWkxW=-l2*^U`{@-_?pR1w9A)S+u@I@ofcaaIRs78zrHr>)9oA@M;)dO-9A? -z($7PphC;F;hH6zeRXLyin~reb_nx9-v+8V!8Strd1XsSvpuR%*G6WuUtJB9yJ1|Nw -z5to|UZZX-UFa)Lx^Ja=#N-_nwVFT<5#-E-9KKNQz%uh4}0X3G}1S|)5@Xsdvjt10LfG@!wUA(7)eT$nHraHJGp<<1-j@zx=Ol|Snu{4TiJ7KiDU6!5J=@NlwbPh= -z+H}T;vh3f`!Ei^K^`BZzb#n!~9^TK?r43Xxq*Pv^6)n{)c~HRg>J?GL^y?q0Q^4`% -z2qLZyf<7%MT`0Nl&>%0|x|NN;+0JOM3a8$(7_L5FuzH?BTo(ZKG=y9Y6whOT2&DC7 -znA=KC3kn~l3K@q1V*^fzkh);Q?JvV00~+RG;2d6MDxcSrfjGdOz7>=a(zyL4av7HS!Ze_4t(e#|N06wu^wThG{f{jHXYud!1Es>50 -zRJUCfP){+;UszEQlA|`M}SiR -znj541?&ojjq=nUhAl;Yd>A> -z*BAWB$rsIG&g$vZPp?84hTk3A)!NT!-xxDjO~bNm3OS3?(zuU+8Ez6R9f{*O;4TnoO7~ZdUfDw{lcRY2)4B((gr+{=B(+eYPi?7N~LM -z#$+%ECBTjde)qKGp}=$Gfp-9R|8FnM6U9IPYEZN-%K=J~f}5{9n>DK%0l`4WAX{($ -zBU0Kbeim9)UC%uPI(!pKWRFFk6_QLKXs<^=E(g0iCHHNTJa;hoyQ$0SSn}q1Oqo|p -zEE&ZqD16C`nmAJW$-M+(rr|e2dMzP>fS1Z~VOQx$y7%=_GpmYdEaHYsUc+FJYmsZjb-%hK=78XFj=b4NE@?%G9eAc$w)xdPTL7Bp1~A8wWYc@))`2o}6_WSDSL -zxCD1@YmjjHjD1ZHONM&q3YqYfU?C>>)svDZ_J>f;cL8^u2#fMWG7x|Ych^|!z47ng -zUCpHz&B8PUJqP;OanHjl`uAuzClh}vvY28X2VHnZpL6%#Qw1y+S}jPdg8G=l1CovV -zBsXmgJ}+JwVdbTZnSOE;soGM1)*@{X;LDEEX74SMz4;@!XX3VmMX*@I!d -z0%qQoM~InbSi-=o*Eo{C_96B^-_G6#1FLSXfXh!4ENOz8l-3?1)CjDO`U!XU*YgRl -zyTRX>G}$-Lc)ZaBP`{&hUgyUN@mmeqg8z70vL&D(8%N1!JaD2c$P>*#0FuD3-5UkK -z-(Itbzx?1yl$J*5+SkqQ2Osm}-OwC+NKmurXN21y{Kepndd6ICrm(c2+Ff0}3d7X| -z9Lm79gOa;mknHIR4!`i6naq3BOloITk&H#iyWCi+Fc+TR@M2aMohMyeWcY+|%DsJz$>lp&7(o3*00HE*OVWVp#iA;>ND*2wrj19|0_0elnq -zy!Xc2&Tr%^Us%bEX(_r|d)WQJqb{ieL5!;#N)gmptkYL~6FlmDuk!2n3mL9PpB12E -z-onUap{-l;@K(vAd$fdVPC3gjSU~-}I+7LfU}y^I!?yalnO-Z4KTR0)etAE$i*gIU -zrNn`e?lecXcCqOXJ8=r?pb-IAogr8;3#L@Kb%zK(ji+t9t?)(whg$_XLGHmv4Siix -zbrXeKr*Yhgu`qz58WOxc<4&BiIXE=(Zy9e+F{=ulKpt(EsJ#M+2nnDUElLJO~S%fTfvi)d4fC+~8Y -zv!gkB+WOh|)ImBn1#WC^4P1OGoYG=YRi@5AbUl`;Wq2(jh7sft-h!8oW&m1;w0>WG -zLvm!%#-xqdI*=K5d@ntef!kh&#}7_``riW#ornwYL^lvzWa}1Sj`zlAKR%yNe)uHB -zc!nMKJdUHafJ(_Eu~it&LdppVyJ3ouHn;weg-~S7UT7vYQU^T*5dwzCBs-75Lt7=A -zf?^l3$_UFYUdXgX4Wt^&Fto(o3zbw(LWqb?N2siv#lYbq+BbKy`~Ll*UHdJIm6YD*Jg&K-)6G23$A|# -z`tu=(|Lee4{x>S*ZzKZ&C6!A8B?-|8<@9qps=YV8a2Ryt@vR7jvubfrJ;z{q&oOjtV~<~9nd%O;1l4O0+_sdI`Z -zwCj;USFOKdov=u#4`MjM&(T1G2{QF=$d=DYe`Izz0}t$kd-sHHa~JS_;Gq+J;k{lA -z#CyFL_zB=oT7C4Y*?j07EsXDNWvu6rpHNFTX2%VQ983BtQNdWN2XO`vsS!~N%F3(Q -z+%5!*&5U{jKM2*GSro(Yi}<*9%>62#k#q0+C0I`8mO-z)Qe^qYJu8z@TM6RM54j<_@2YN9?etQ -z?mUNS2AhF*9sXAtc;ShTT96x6WDAx9+dANejW84ztGXNb2uh8X|1*$R|JCezlZ*8o -z^P68jnMGyeDQx@@}Oew?H-r{Fob(QY?h8--ZNHmy_mbm}cih&*k>NV?y -znj@WH%F(ANGFAQ}ZMW#=QrQ@Wz;r*$D!93jhW2>7f3^U(y$JIg;iTyz+)(MYdqf3N -zs^ftO&ACKkZmYTJd5ypb^y|@c6`hVp5(Xm-Q}|xc`_DVRv{ajVcaP+$R`~Ygu%&B4 -zIQ93a8IC=#=LHtwjq%zITmqZ{{4=l);QzOGwy{;7WgP$A_c^BpHwI&6!UALBT-O0{ -zY$C|i5sZn$#J3M*Y=$_delR8`E`Bt|WQmFTWtkaBVxoSKt-6>+vY{?5F2q5~%O^Hf9T7mJ5SID%50dL>ZPpZQ -z#pN0A!MO`U-zn(+M^GB^7)J#aeu56fO?%7~1M%38F7Dar-e8{tI6e%=pM#FM!j|=L -z*9z#EU)l=6SlBzN0UKu6PoF$RkiM<4O -zp_3Hj(qs&ij8*mb0uwn|51$qcydbnUx~vJdD&(07d6MKHMhY}^-_xid!9&#A)x%BJ -z)pa%M!o;|6>O35H1NOA~gfZ99{h2G_&KS%z1M%4BK6e3+pu_&PH!r~xy+E(9Wv#IO -zHp4A9s>rgRn*bqeNC;0PS9Wa0CLLk}wKk_1==e*`h6L^4kdQYWt;EJgn{|sn)4{Dg -ziyi*aOGN{+#GGYH5*4W*#GC`0D&VVCHyuUYKaV(8fk~+Tm6|CiSvDqw$#LP`cZ9)n -z&^rKqLoMe#f@8Lqol -zlFoX1QDY9$Y-%1+t!clcG2xQ-{4y)lMM;p&Mp9x<-ukJEhc}S1dQ8Io+_$yGP1HeK -zs%nZ{GaLUcpKr*N?^3pa_ne^^;hraJ2xo?cqbG!Cj>3g{%efwKM$ygxQG%y5kSm8F -z;KwMn;fv@#yUjr5@M$=FTChfVaD!p(ZHDEGTj&37BRmKqk# -zqaa4tn2^AX)g?Y|_QP?Enhi~k^QMF`Q|}F?GKteS`REutv@2)X0(gA84V9}f<>&Ge -z$%>1Hrv9A|qkKQaR$Ud&`pR3}eS!$}It*PDj-7!g_Y3b9*P7?R^T2O`Ke{A*R-rnJ -z4P+SATKYM#3U~l*KCU=^4vz0p_psrkuyK{)V@s6p6lWcr1gU$Q*V?s99;qC$jC?s! -z34fX6%(kmyHDkhEpmrqQAys%WNwP0VsAkY)+jsAcxb+Nh7sbPT@n%bZ0Yf}P*AVdU3SMcz-z#do%?HEzbE*qiZ1gFJ_ki^A(8N^v=S -zs^!`Hou~Lc@J4wRN)K{5h)e8`xSZvFQ~`1wV0s3iXFzZ2rcU8gx2tElz9Iz))Sw)g -zM+R)5m8ZEy9`l!}iYvAfy@8$59cN01+*X{Y$Xv4RLcBbKk+;#jqF*@Fs)s%aJc|lK -z@8t?FqbUt!W?>X1MeYPvxbSN$uo|Fe5PAmnwtjvkZ0J;m?fkh~*41%ZPpvnhVikH4 -zQY8I(3VztpXk){$IT0rr4M~?jkBPaKko6aw9~B192)+Ll`cAeyR}TEmg;0N(spZ)+ -z#QNZHhx063Nrt!psusSy2G(^NKGI -zrvGd)kMVzgXIu%7`(6?D4P4eU9&}ZxZl)n=ur!eAiFK|Dc0bTju%g9q-<^il%T(et -zMW{6S(rqS8G~t0ALg$U}(`}ZvIVSX0!ius)mBn+&hA#?zC*bK9h0)fI#H*+P#_!6! -zq71P<2pn{uN6`6{hk*NlO8+qQ?-drb!N$FgQ>fZ`;+Vs1uAxc$o -zn_<({(0LC38qpAHPwR&8w_W)3YqX&!<$qJ@L9Qm;=0d!%zBQ;kC2Eb4P`qftC>J1>je})6BwtMQI?@4;ED=|E}{Y -z7F2O``@M$GbQ$K&i4`iz;o%)QOK*TjAGA8VQFZ0xOviQqbV%4Y*y1gI1MEN<%_aWF -zsFX)=#UQ}zF8<%`3}mH1+mVyddrVk#9o%$-p{-5dQ!ftchTe@UP1q1S^cL*ipYw~q -z!pT@~IsyF1d8%iCH_PKL4P-jwEwtaT6L=3;RnNHQ@2|m$Az^uk4tBkCQsqZK-DPOx -z@Ryf_A3i0#8VTeFfbTi4bP(-hlqfOdFc%#YKIJ@(e1Ef%uYLl#w-ed*Z7XYUDQsli -z3w*Xbwi2@q?amvV2c&9|o3BR}vLF;);w$B`lqgZeCg3~3 -eobo8H4*VC(Unzh*$|>Fe0000O - -literal 16900 -zcmaicV|1Ng^k&Q(Hn!T>_Kj`Zc4OO48rwD-Gw*(Xv_UIGaL4*?7e3`t5-R2lSh^xqd84Cs4}W^FDQn9zijsF13M{zVR~<`0dB -z;hww3Rk_uLO*yyZ^N(arMN#SjFcHEi60E_fZug`IjtJ^LVtno=lKj+Jze{_WszRIN1X*HUTCH>C_wc;+D)6YYT -z*RWmTUi`Puu_Uwkj6-qwu_Ue*kO&$%=o%J?6*rej_Ock3znkGIb6 -zWm&yS2Z9LS7slFgUx+?ilDgQBdj7`ruw|IVzJ@wV{&tD)G@SPTMW@9Wl5lcsuU~6` -z7raw|%Or|@Pnlh`7!!rA1H$`p;zz}+92Tp2bFmKDAL`nrC>)<{qBHso -zvJ6|o^vMxL?frh4XZ`3WdH7s_NI0p@{EElbnX*!yp;Vtx&K&w$&to`sW -z79>enm;xWhu;ZKKIN}-h!eBKZM6j$9~*Q(SlE*i_bHS0o#tPY -z5-j+ww|x>h9%`RLUixM!e%f0qVAe5GH83X6?!#^_j-M@lO@*-aD%NMF2;Hg^Wgh@}elrPA3o_&(- -zeNyws4es~%;K1o+pfG(Z!G-nFWzl7)ejRNxY?M~uI=I&MYuz@4>GLH*ptjlQJ`LYr -z*KIIVzBhKHIDwe`X2hc@gsdjzXxX%b<_#kc$vIHFi2)-XM1=fs(`g?0)M{lcJXwp< -zBgIdDXM&n-=+_%;1a?sE$oeN{r%w=8tFfAlQopAk -z%wrVN=r>)oZ0w7^M~Xi~qp6lEaABgF(ck7V3Un;@cg|ODuD7@fw~OZ;^TQV -z$&4AiUj}-4;o`6JV$Y4C2G -z8hVweUdzl78hWzD|&J_)oRr2JdJP -zA&lca);^P(q@hQb9-kqNXVo9An7Q3NoAtyRQw-@JUDD$oluryjE -z3{zzbZhStP-K;xw@Yxf-B=4h(p=4f`k8p2DH$>qQLPR!szD!2|vJ}J`C6=EoRwG^+ -z;`ZDv1SGVO+?IqSxpxSM^_V~@2E+~dZQdl+oz;TP1MX+XXwugMy?Z5AoZ7#R33Y@T -zM)w4;9L0szO3>6i#4fV3q49@wu&`zcvQ!d8!m*dpn&7pp0Y=;QbiyOzhC7)Ki7tDt -zXaIqysWqx53ZgHlO)|YRDG**$7&F{0a8VEECY`3;yx)F>2;4Xr&gC;Iqiqx;orWkF -z8xk0Ty-mK&z`^~Fbs#S;;Qd@1ZFJh4R`+H>Wx$xgn>^oka;w9~QfR>rS7lYHG?D#o -z6Jo`Qg_-DP -zX@kdURs~L5?afF*73QF!=HQ?vIysP;FNCMBfA*}*&%$eDHh5L|y~D=C^v8(wdtcYZ -z)8Q|56BuZ~3~KpF-oKg|5Uf@Ac15Z>sP<9hpm(E>^cgr8dMxGhn7mnWA+JPK+EGR; -zCfK+V1&Xi1M6CUFIA+oJqr(aF3W_=ph7h;IVlqq&xJ=d(CqczQwL>f*A$gJW_|iZw -z&>!^cGyI)UH(_%jFMta0ci8K;?^D#C4_`@%@wP6R4qvs8y@ecdj|*ia7Exg3*BpG4 -z%Dqav(-_hWolzv04-3Ygs)Z~U$`R?hQq2Is2`RWS%z4?!GF2CryzMjCEFg_Y%K+yz -zG8tm;0X{;XG5?BBT|pMZ296(fGUtoF_$Ryrso&s;Cc!g3a;pYOn-tjPvW+1)iAQ)I -zaPyG(wl0MZUqz_Z!4+oEh$t>QIaiZ+J1|fQdfugliOCAg+6D!~3<-k#gA8N#Rk3@5 -z&u3Yevetsi3m`sm2Ntt>FV(PfME~wR=LFu+2@Noy&wr###hgP3mjy&H03re#97OQ% -zsZ;NtktNoC?s@G44Num-@G1zw*?jMf)dA`SWJHyI-Lp=m -zyv8V97L8$~?>Sf(&Ee27TQvEf=-_%~EL56_n`*ZRVS`=4Ka4&HGjr9P8e3rf;8BK& -z&0s~H!Z|V-mPt9vUj?5&%Sa@;XK~`TS$ylgW4|1h&I!<9c6_zoDdR2)FLErHw%Sow -zwc_2ZKizcAMchMvZ^6OY8)uiUt&RwA(`3@dzgihQ1MSrNi;ruq-C+?oVa@U0x -z(>^4ei3Bedg+!LX52G(u@W4P&3sdv45%OawU(*aQat~OuEf?Hi6Zi>__qCd)nw0_j -zvUwA_6WQ5tnFsl_AZNz8L8L*=L4?0A>inj9l&C`AC71u=H -z?bu{Q_=al@1+|F&El|te2eQB@?#+g(D(LjFx>w=0X;CJ|CQc@tuin_)Rd$KH$Y9P9 -z${MAq+Ns2`>_SLAfKm9~%?U2bK6>hiDEbdUD#NMd$hR*wFx8TxWVY3Za -zM&tRPhR$htT-*KlZT-SGBy4YD;6aZfAz^Jt1`=ABifztn#D_;u)2WTa-Bo^EKL;=o -zDc6Ov2x3ybU1B6gkFjv-UvyFl^(EFkIb4ht2Z(*io4 -zW(6^Rp7OMxVh73mYH?bkbxgXB=+TL>U^8OY>=P$oXPkGAmF?6#80T -z+e?24uzuJC8?nCu`7)ef&Nu8x+`0%wOB9wmZ^(+|&$!T80~3uj?NRH)aNhf~#vN9e -zem1VW#bKd$SZ4ufS0-pzoJ%P7UWdT@8yg`1+kpYLV153t;UJy~P8@7sO+#{ePIXcSgw}v2XayA<>Jxh}D)tMOGRgJY0QEJs` -z{>aB;ssVeqKi-6L#(PnBpPuOu<4Rf*GWVk8BdMCd} -zc^_!LU3n2YWBEk1?0<%f@MkB;t#h0%&cixNCZn@Lft$eDVl6z=l@Ga}k<7cF5n!!o -zXet^Q3;AyG!j)+$=3U>7D5cEf)=YMZ)jSZ?)!6EoSa3kU!3W2Xn`K`PqR|ML`Ju!A)|K2`l1>ErJG>o*qIC72B&jHYe36od@P! -zi)qQ9Y7g*>N;Y4;sSLlPxvM;q-Tzw2m;Zx=x>{mk0;Ed5zA?Hb1FrDGc6-;m+iSFU -zc22aC&R^-iyw5vE$D?GWWo7A5o@@>d3_uD92sGM_-tlsdQ?ZbAnF4LsSxDj&0TFgO -zFbB*@;0<;Y0es>tB&~M12_up)gRS(Ce{seFR$9$~MC8~S%gCTV+2AIiH`gndEW2~H -z`z|RK5KuxIccy|!;Bkm8puw0EcWFE{ij71G*o4( -z0~y!3%z_nq1kdh3x<;XVQS{_v?Q3|H1so1Z#CL|Zm2Z&7-mTO?&1?U-oogOAE4Cm{ -z`d4o(XCnWH-J^hx&?7X^xHns&B`u2*skUy`s~w=0252bVaZy(}U?e5?u>fG!UbYaS -z4Gz$YBX|~|U$??YUR+zxw2g5F_OJB7viI^}qx|ouEswnc0o{D4T~~|912EVr9)4P& -zS=*@uBmgy>GC)sz_8A$Iga2y-R#LKP$zyVe7P=4Vrn@Q)Fp6mG;Nall=^07<{OPT~ -zPDD~5M}Py>^H&ikOMCrXaXjFMyNuyNg$gXaPOE4z3=$o3Jt(guFuvAQbA?*MR;Dx}r~+zsgJ -zzCtQ*$r?UAKNl$E39K|(pdcV17*;zU{VtG7{)QDicnC&XAit07AxkJs2xbNxkEh-l -ztI=-hZ#0{5e0{huHk5pMKFXUdk-_HT=8j~#**>ze%L-Vq--ELbc7OqlEqqgfDL$7| -z^zia3^m~7il#>&4bK{s6W!C%o9eQ_nw_LRXoq&)qk2e`~Carh!_+@C+^?4E@nB?8v -zrP(B~aF_-3_5wx4#3EgX2f|T2iDX6dBot9e+}zxz-+7y;fop?^#LWumnJ%(ER<|F> -z44(0)x_-m7iZI17bV#w5<;|{V>IZ-R+z|XI2d!L0M$z{_~PzI|b} -z_>I9TkwT-USfkDEyuoB7YJe7^SUeW*JCd>d31w)Viag>w -zE)Hcnu_U(A@CEh^w;UM0IVsDf+yNUB)lCpiM=a>2dMSVx95URpuHBLGh>h8fgM&77%eeba~6*@>lA8=;7iEw2QP4d^IvP -z8fpiWc?lq5kxp*C)nS|HY^i2ov(x?A!{1u(mk%xyJ_nmAsx{Zt=LV=Ta0-O}2|y4O -z5yIAhMw5|xp3lvw|Ps$0W*KZd^Wlj=W@{AaG=^es3_){Y~Jis`IYYiWN~ho|DLil1qRD5 -zN6xAlvXG=U-8`VKVHr!k-;5Bi)EfnJRTtvY$;jR$#e%~lxMV?xboY;JA{IT_^y}D0 -zw1mJ8tVoSO-(}absB6M8b$Zqe)Ok0$OkaA#I -z48@e8TAlv;PmB6dbP|{7<%qt@Ea>I;PRL4)=M`_G!A40Y$Xy1Mum)I0#!3<77H4)u -zI6c{)TUsy&o^*@2H9Bp>QJA#S8$`zN?+@z^IIQL|VxYEQfVw~Oc}Wq!FS`G2T=aDu -z-DMYe(1$x=331oN(i#yV%?Q)lcY`}FpGRp*74@@$fX%pE+dAGOh5QRhJ&mcaXOhk4 -zLi_pirw^Zws;d9n^#IE8T1ypZDX|crNABquU?iL2;Ql%4Vg5cNBt}OJdbLKnEi|`g2q%v70%eM&7 -z5gdFefu8Ix3n54MC -zW40SGT11ajrrm5AI24T?-2$|VMsU%VX}AMmt>Pr~B}#An{>%QG>_1FQYV^)CExzx2 -z&7E_9c!fpiCLci|F3H*eM2DQQRtQp4>V2RP=KX3ZVw#OXuFxj$VDmM&HQD{*dc7301976VQyI69%EFvxxn>qC&Lo-`%ImvM -zCv>AXKPcD26Z_;m`1pw)uF6Mp=RnShU^yM81!?jbl!v#-kSa#RLhSOG0?yp1YB6Jr -zW=GrO|0zIRSHiH?DYiO+$EpdMkwz#4I6V(J12-W0+dAo4J*?nDQrFI<*}a92Y%1bU -z`RC_4tyg7>R(8{ -zA8*g?PWv##WoF+p0bJe>whg#+(1_+A+)9HS$|n?k;(r=Le*vR;57rn)2& -zEkD8KBSZm#3Drt?t!*#s#>0+yUNysIKRg=t`KSOcSHieiUP0z8F_$tZ(ciPnq_o~@ -z%-{zhbs{i7 -zt~8q8%WO|MF(FE_ye*bl_-@NcA!S9$IMb6x0`e_oNF!hy5a)H^H)5)t(}ek4a1Nc~FF4@f;5aO%aB&3O%B8NuMWWCzYb`d> -zQ-&3)G|5M|pzcLy>pA(p=?3&XKn+v0^`HNsS?M0eb+60BxF|&Y{?>MI^x``)Vp}1V -z;<0N$BUc(0=p=y>zD3k_I~ -zMC>T|rn!T!wN%lqT@ -z&Afsj|04$m&CH2M?F|6yeqb+e`&JWTP^~~z(;c>5;z6RuFKe)%3j|YzeZB9c)5E08 -zvX9?L9%?PT7Vu(RAIXR}s*=I*@Qp<*vA{&7B2uwdBH$_I`33U5di9weG|3 -zx-Iy`1L`R>G-q<+w-{f5qc<7ls}^cT4Y^Qi+meHXFIDgqkt0wpdBZGY?LB+q9&o`T -zd18L5%R+44Ml^UNbEw58BXP#{+I#J1$;VGO`#6Grd<=RWgP+T+ktE6H^>C;%(}szj -zK;wt^oW!yG4Fz=zm4zKw@$Wdo`VJm=879kp$F&$uMP_qiKSB4L@SV)g55F9Rb=3ocrK>iqIRR9n!X0Do*Ldi{9M&^sg&T_TZz~>`tbXc$p%%BI% -z#MahUA?U0t#2ZA4_41*w&52#TXU^_G4)$#uGOnpIb{Gs?Bge_xP|beH;cUSBec^gk -zu;a`And#3j5LZ)LALL9lQ0{$A?tzx&K6M(;#M))7n&`7KTkT>KvjI7O4?mTa;X`81yn7WAir6 -z^Dv#2{~#3{X=5gyP*2v`3yoLJl)--n2rC2}*3n8(L~4ohHzT6QbyEu{!K3q#&p9Lp -z?3#RrZR0JWoh5V%Au%m2?uSB&RO!i99khjDd#7P;NaxJ<_f>mYXQOtXqBZifoWn1d5WC&hmG;&Gv(>!l)|)selJ-m-pz9Og@*rA -z%Xl~n+gHI_Rjy513U_dEaq-~ZLm%H7RpVbREoW=Zu*D?n%JFyy6(v}{RCOy -z>_wu--o5bv-4rRuWG0oN3a2+(f)C6nR0%>9HdI1mB`d{jE6Q4vSf>>{@~N-bGMc6~ -zn=1MB2?XIjZuOC!s@-pN5{60UUw-L4f1L-3Ohud?4)I$4Y&#w^A*ij(1$$3|Vskv} -z#YKCOBnHKh5QN8fd|k)wI{^HZj_1!`{L&>R(m@P^tYk*J)5>eCrio9{j>kWLDCGrM -z*O<)utCbjQiH>aHzD!~>SNyzV|B?uyizaR*!v`(g6N5ks=aSqWHk#wzbQOx2Ehc(>s -zfl`oSK+EzLOKDeK?n#pu;5qF1g-8bXyN##%K`x2R14CxOh8w&P-kz4U}>3Q=A& -zwAa>sCXe?|fR^Y+S9_jW;=!_GK`1Bc2HY6Y)*s}A##+#}239~LV&Q~wL&4n_6^@vW -z;nGUYJ$5-C#kJr2EtD&Ty$t-H)#GyT->}39LWB1gdo%LwqR8{YbRBL*-FCEc5iY{; -z#TpZ~y8yolNKuWi&enqz%<*)Y)j#ff)9q1ezkI|N7|zr3b=T|b>+m?)d% -zKJ;1@L~w8ZQn0MxZS*{ew-;Ohn^Jl!+U{m|QvgB~tai**t#d>0E=CMjN*SZ+36QnO -z4NrSN!Cd>9SLf?=!Hjh+ek}c}ND_U`vvi9(MS>7nGZ*lPm%4(7(bhfuTHod8y%;N{YO_KMV}N<7D)x5snD;XG -zzCOH#WK2$4mAvQWFCCZW#F8TRInJ+=$6eR`V~dES6+!6-=6lkVCHyCW^Bb-$@=b%3 -zi%hxQwAp^EOp|zR61~UikJsM89qE@P3@X5J>+K)hO6K`Z$80UqhLV&|mVt3wQ#G4H -zi4>T}s*jr9pkN+B@=LbuMW8^kzEFQde*yOdnXiUws9u#OD8dYzm?0F`qCm7pBCNNz -zOJB@PR!5?2&9Zw_Jg~i=TwmStKiYq1_@$ -zZKB*^u}y2o({7rV#Nl+8$2T5 -zthMF3X`+*;4Q-~&-*4NzrU=7>#}h=jB}<^tsAch7Ac~Vq;V7 -ziknpCHOP}_P8F&VE%6e`WG~EVa?$ra`knKZrYWbIZ_w@4vO+{B!(Pb&!YhY8pCfe= -zjxF8x>Zh3;#gw`fu})grVJcf=Ohg_Xc9m?(57$!NXQ#N%;Q{V}EjtmA$m<@Ie2(h2j9T2Xq=0<2R#daW&$ -z85=lCIqjn+?h$SF4u|?#DOOKg9>2c{9GSdlh{<(WR;Mb+bxH>u95roevUiqSmcdG* -zEL`{Qv+mA#hjLxuC*l?ROBgDsPYkDNU%;m09$2^ni=SVA=kS_) -z_h->URCbhQr89T-a-Gg9Dk?P`CT8-=f%@A28AYMmma&Ks#DNDsr^|eI%nHBQ0Nps* -z<{@u^G-9krSD|^{Vm?_nRkW_T!;E*n95To#4sxn;9FH2W%&T043S^Vg_Bk^^&J9*H -z=-^Zd6GYUG(CMkA?hy<&4Tc5fn4$3ys+ZiGw!07qHH1zPDzAJY;{8Oj#B1-LTAZ>D -zKqX)c%j0#o|H%z2zdkxYKaV6<&nEMgP`q%2&v+2dsa++rFeWoOnf$VkCAY6|8|kw{ -zdwe(maC?oeGlx#HVClH?)W&QZ`+=l3PIeQ%9cb~nWxJ9)YD|MPt`v?0-3bMcbZ<2Z -zG7xSnH{QoOr#C@?R{C$168|JMfCxcPAVuEhewgQpYO@AfbP3Fw+|Vi7h~L@$6ydj5 -zyf7_h9Rp$0Gii0mkT9xddqw>hIVCXV203~$D~swIj_)TV=zX)@-tK6Hb66mM;EywH -zsMV;{!i^8fvae3b)iz7_f6$4yU2i-b%Bh|o@eU2$RD^G(AtWlyl0^8dxd<9 -zCi_xU0%&wFugtmc%-uOk=xMY?lR%{7BQRZ~b8}1<=DQI)v2*#3|70VNVV*?SK4O}0 -z-HEICfCoyTwy@{F=Ac>4KISQEgQLDcj|>j}hzn(*RSn -zZw&u6!^Z2~7ae&u`+{IHYm_vxJJ@RRZ!LoCjQ2ecK6E;AqeyJZxfuAC -zaFBgBIQO4DawgA~vN)BCS%`;S38kn@9kWOTMq)$V$+z&4nDQvH*{(1#N58$C)v2#; -zJW|ch#FaXRBNNj6mX)HNV{_ScADWB7#Jn(Th}B15lvrI|-2fj-=SL1AY -zQrI&y#`tyxRIyenc$G7)m}|d;5&h;8q8?ap1~7v{vEXIAhojO|^XI$6=K!f+>;5yx -zJJXiq*Z?mW;Ak{?4<=)9$$a@6Q*=1_%}Nx&bGA3oqS%{I)k3y{#DALAzrPw)h(FU -zj}8a8Xte($dBpT -z_ZLeg50aO#zhmy?M*+dS#c4NyP>CZSyS+OOi>@2;)lr;&A$)(OEO;kV+bz6O57by -zyW>9>Ij2^Du|A83(r~$46%S7?Ancv(6R -zJK?TL+k$9p$KMJgY}hdrTzyS}0it==hvU?8YM**7M}l@-W{&s26~NM6 -z#U8(RCX-=6Lw%{$D&=aKSfE%aJ<__RASP1DaZcJPva<-yi3NH#t$OuNk6wlp&CD~1 -zanJ|7AhF;l{a^)Qhr_9Bo;2ZG8=}0whx#r7zZ6W`Fs5 -zJEbvhZVJVsORu$w4Y1HyT1E4?Vka&kS*mSpBuKM>OAT~3W;g7KLGzfQWF~QJ1)H6S -zFCOXwP_auqzKSygLBPB}EH;Q1gXb@Wm*lZWfM<8NWGZM_*$8Ze)0+^IpqCyco5T+P -z>!edzc-RMsx%H6~4%a*u{&6!V2Xf)f8oOKEEtBAhvI#TkSv+Ago-TMSQ(2q}=S0FP -zL(1v}1vp6Ya1@zfO!}Dq3ke|~@mmFXu2dHEQWpO$6X$;c8V@V*w>NACSkmSKF-THX -zXc85Wu2(uhx0b@}vaeA-YhO(oJ!8ZlugSxzOn{tnI7h@dCB`UVE~EEY_ww_|qDlb| -zQh0>qvDy{uar91x0J$!N&ch{3*B*?y730`NAZJT0IXU?T1Oo1Zc+QnB&!+ZYLh%_v -zV;)6DQs1sEzvoxu0r{lou-yG%CgwotYzFK>vqr!e>KRehvaz@y)fTge`_wgV2*|2H -zVl|vbxEx$3ymn~uGqN65%FYqJ<_)*Uqs49;KY2h*(Xa?Tk7AFfl-xf>irJoUyL*;0 -z19&1GQV*5Ni~#kTnaq0ymCiLjk_=0q&=&|cG{r57n*6NwV6zJl5K*ED&DsZy8iEL_rr -zgsLXr6cN9-S7dCo0TeKI3ByoGNNBIG{4b4m4=LB^FstU0B?!6TBZ1v~zn%e*Xk=B) -z@_rySE6iHcIxSfbe^sRAkjZKFfR!7A5uNa|Q%HSV{);)`X_I$=Rz#g9)RV -zjIuDE+A6IDHt@Noy^%sCnU|?kL3tCMU12QN7688MFeYr;%^{CT)BqX<4rY8gFNo(^2<+x6~@> -z0Y;8%xJK3sk3si!JoTyNPRqf>i>%mkw_b{g-~}-aAljQww_S1L53kdn=uMDZM5$#ndk -z&22o*u=b&^trc3UMGkzzrL*~$;t?gd{w8WCC+z$)6{fY`v4CL%;?|JZtR3}&oLz8* -zT?G#HsX)xAYvWho@h=pJpzsjcWp0%LD4s08onG)Nb4)MY=8K^XfVvcKVvP||0{idF -zr>Wx=dX&);ID@-|u5Y#BAa0c8rW_t)Xfo4c@By|jKCCPsr7DjJ6t;eTIrmF;CpM`~(ysWB=S@seY-cC;IYp7eGp3%$l} -z)oc?3jDrN<0qs>+yfj#>o^%eHp8`K^wUK{qUM_Xl#K;;VHK+>&$DqLQV1~BoxLuBrt&0}DAhEKn_^ER` -zz-29QNvC|8F%an87xNYKcn*LCu89T8nVkc&?~&O83)5GbY)slt*#=)i7s;A_C=2r7N7+fk`X1KngTDCyUEafq@X5m_z1=DeiD@Q38P{+Ou8AdwgrjC5 -zajlbj!7Ae^jZ~9GGnmvF%|dV*Siz7~1$lG}zFHP5%BV8TD09lQN!w79WRZ;`=PM(z -z0;YT`0PcRb5SM~SQ_OKjwTc~?W_G_IPe||U$;Um2U%fe+7X>%Nvy!xcXUbbT1miw0 -z=$X7_W&m0ay!h~`ae>C68mu@al*ia7R0saqO=sn$tE@ww372nWLhU^>%{WE>Eoln8 -zaeH(5Zly+xlW1Z@B{Z2HqS52V*oh`BC}k&quf19RS}N6$l#0qGWzl9DQkZ@85(#UMH4E) -z!&hPrOmR$HRF*}2C{e3A#U3h9d)gN68^|>O9=TO4Ga~u#5kl0}_*QP9IxEl~Ce;Vj -zS3zvyQ+p-TKYiV8z>J$akDBH=i$W7}&)8|aN%_17$7$H|;eKWRKgAtrMwoyE;#kJp -z>iJ{R+d4p$2q2;Y5EBQ7>@E&mk*MzVW>!EDsQ9Pd1Icl|=0d^U2HU!hP6MLe0bwp2 -zA=U!|OQM?{{^8dU?o^&w|I~Y5fw~zw)IT&*mzBRUy1Ljo^-=Z`fvN|N_JgxG~k*Hc%03VftQZkoi*AD{-11-bt2%}_=-R;7ZY`jOzsFyAEWb! -zVJNLPL#@4|8iv-c@m4Lu!^Uc7?VOsDWty>@T6^QN67|~9P?w&boWVpR2)d)gI@s*$ -zT0uPct)H#x^_Y(_q2El&g2<(pF8niAzCde(;c)XAp3awn@Z)3{qMO$l1?#O_cXL+a -zB+yS96Q;w{xIBw9%-h2xp$%a(D0`Noi$$31BbukCM_lu$4sG_+rWsH9U`eD0eY3t3 -z@`vkyB5OW$_NhyNPE(&_JPvYO1XVd%SiaJPVza|ZguGogD*p`OzJ!Odk4wR7o=G7; -zQFEN*_9WQcO`Vliy5G@VCnZ;Qb~fJ44e1$o^Tw=L_lA;Z-8Dw0CC}X_m5Q_J*xP61 -z2tVQGAnU9PA@k;{9QL{c=-~c_joC`W*8qxTI)7}foE-)SU;g6SD;S1P5oGCta0DrC -zGXz?khB$Fn{Ycwuk%t&RTyJ!Mz8mnC0U+AYu}PkaA-t-gE*25%;RVKNKyWz!scpu6 -zZDKFBX5S4#lCQK!Ip%UxMsP%cC4T!8d`;mo#M{(B)h;Ilk3UVA`-O^+JuQDuUnt-K -z=jEH2NuzvVs7mGT0rJ;Nz54;;pVk-{O`o<8h5~yAG9cx)%sJ+#d0-B8j!9{+{>1@9 -zYiz-m^g@6wE8^*umZD0JhIN!|&Ok-?2XhJ@B|oI&FfS^$rs90JhlZBoJW`e5b9j^- -zWO>uD9oB-o4QKEBn$akVeT1MeUX-s%#m~lPXZR!_h7SU~%Y_rx{QlrO`$o+{oUb!PIS+x5N -z+{O+YLa6?IE1#&A?RMZ&J}!O!vj>Os^y>J_BMi^Cu8;>FP)!5eagStg`4k8`f<9)s -zLv>uniXJHc5tD}2a*xO+UycHT8lGykAS#tq7H&?$Q|yXO#aH{77;M;}%#Rn*u_i#Q#=kFoCjB -zxM)O)sW@_wx=K{lJ|iyESH0iv9Nr111eP3eEA!SenTb%U12{RS*7qj0=;%^Kd#QiJ -ziYTEU=jFY{zWsSqmqmw<7L@5T1o7NxWhht`9gu$(b|QZnjVAE)D;lyC=>~hv=8piE3T9#-QVKCSaq-q&xr*zuRbfKtru+;Kkp5Si5+<6{tz}rp -zigZWmiiYYR#xdxCbhhJz=wN$k9zPcR8H;AJErv2><3*Bm51h&CEJlpT9yo5`1`w{pnaAJ%0k=ISmg0E -zo$J6^H1-w0!^WV5w|yx36dtal`WN}DGpD-gqYjDTfjIaLtR}xxCDSo6v=}KHRM^9@ -z&T;nw5x5ee(K3%Z3QQF%sMId_cIRpr&3g$f><9ZoX7X_c7g4f{y)mf(?;`TLI@jLv -z?N)ryzDJ)LsBZU+VnRH0X1E}KJ!}%#n_-hEY9w -z`8(=7Fd9^wGY;{_ggJK@ZR?yW!1!^^d;F^x%}=DG(7K8XMm$L~K*Np|t>vZmA5%Y| -zINrWxnZFq_J7&ksTGEluekfNRCX$8u^xk+?w8Q1iII^7LA8Wc=uh=>E34C14fN(+~ -zjb&LKSzG|ur8^cG=n*d|U)DK;5`-D7c>o{;1qb8{cYdL5^ll*Y29ag^ZWs(}{Dq?& -z7Vt6fu%BVSoqvD;RYW!I!KS^e-kCz_2@FvAByt<`2mpvxlE{aWp)% -z7->KZs4&!M+Z9|_;(QrbPRGNC2zLU&;bq*v@zaDlNR7 -zR!OB(0w7?XvMI3w1tc_A&fY$=RO&K>9q)K{?KeL9#X2nl`k!ouFF)XFC@Tui*%L4~ -zwNvTu3}=K5TH;uDS!^k3d+!l_hx$f?(hkYU(6NBYx@mz*Y6dZ7D@JF^5^p{aiT5zv -z;Xjc--#|sw407DGZz<4^FBXBq5F)zwTQ|65$~FTfyft2wOiY&QG(ydKoz#wa?YKny -z)9C@EX0c#XN}}K5dNFdMNo^+Os>0sS^c;E5Ky4zm)q;>J{J+z3sdUj)7tN@@gZSf7 -zJ|wiD$oI`e{Xe-gDV9P_(x}i7AaPVJn&m~NMi(84-RGbXy6@{lY?h66ze7!6Ee=i! -zInre-6PCHrI9+8v4+)Zge*esLVEy0*)t)o|)801Zf98hgQ=EZH2bpZ=)5NN_2yjw# -zP8Ewr(5WN{8DJpt*e!|G(gvZ5Pxywag$Agdns%%4+IH>|FMw9b -zKb<-v)*Cb*Ao~hb;B*`Ee&trZYBi`{$ru%gmKbuXcPNb3lD3H3Jimki7;BEFp{bxX -zFJ7Rk<~$d5(AGs1%w=$DDrj&3=?C4wX`U{m8^^=Z8R3YTB_A>ZAOkmldWl -zwo0ZyTNCB`dfUZA+chm*()HWtA2!JQ3>g${8%Vr% -zasf==&095e)fG}M%iIsk{PaQ>2|D59ppz^2pExvb9Ou9EI^`kN!0aXr*u3p0ex0b4 -z=AnHH#@v>`#o*LjN-yB0^^l)H2Nm=yD3|>1aNigv$f`s680kxF8B%d>SUG)YF0R~W -z$TI5rvll2~&q4RSwu3})*@1!~z4l}@NsY#MwV(2Y=hbLZh-ce*Eq3<#rZ -zxra}au9h@`-JaCDeW|)St?N40z`g~4rjZ?xu=?#W;cJyHNPXCV2DuxD%N1A2hAlFH -zwTJm(6XPn#dA&{dq>&yd{5Lp=pa<%$*em=~TdQ%rn_v#5`>I!IS>M^uNpl#N|wC@HMBcRTMT#SL;d7 -z<(&BuA6dLkkx|8fWw@PXzCeCBgDx@HJs@)L+j8y~gZ)7)${p-|O7{G? -z&|M6FI|A*^d_U+Of-3`+w(c~-YsQby|NH)g|G7xv|Nek^|Jex)g~z+)I0xPC0460S -LFIp>X81%mY^Bg|U - diff --git a/patches/server/0002-Temporary-Access-Transformers.patch b/patches/server/0002-Temporary-Access-Transformers.patch index 6a73748..157f6f4 100644 --- a/patches/server/0002-Temporary-Access-Transformers.patch +++ b/patches/server/0002-Temporary-Access-Transformers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Temporary Access Transformers diff --git a/src/main/java/net/minecraft/core/Holder.java b/src/main/java/net/minecraft/core/Holder.java -index 996e1a8485ae3c6a698d846f8cbe9add51a4be03..312ccb54046fbf7b5f7a0103721cf7878700e895 100644 +index 245f09b771fb1e8fab3bc4c03b1afe34ef505f1b..8dbef407de5c48543ca7f97d8c22301aa54da7d8 100644 --- a/src/main/java/net/minecraft/core/Holder.java +++ b/src/main/java/net/minecraft/core/Holder.java @@ -126,6 +126,12 @@ public interface Holder { @@ -22,10 +22,10 @@ index 996e1a8485ae3c6a698d846f8cbe9add51a4be03..312ccb54046fbf7b5f7a0103721cf787 if (this.key == null) { throw new IllegalStateException("Trying to access unbound value '" + this.value + "' from registry " + this.owner); diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java -index ebee8de2ed831755b6fd154f6cc77ac993839bb9..0bf4ef77bd61f6d28faf497f5bd0ceecd8663daf 100644 +index efdf56044396b4ce486948d2c993971f99174a5e..4238b65cc86b0c49a34b50c4dac00cd89e3900e1 100644 --- a/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java -@@ -207,7 +207,7 @@ public class BlockItem extends Item { +@@ -206,7 +206,7 @@ public class BlockItem extends Item { }).orElse(state); } diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch index 493e0bb..aed25be 100644 --- a/patches/server/0003-Add-SoundEvent.patch +++ b/patches/server/0003-Add-SoundEvent.patch @@ -4,11 +4,11 @@ Date: Sat, 19 Jun 2021 16:30:39 -0400 Subject: [PATCH] Add SoundEvent -diff --git a/src/main/java/gg/projecteden/parchment/event/sound/ParchmentSoundEvent.java b/src/main/java/gg/projecteden/parchment/event/sound/ParchmentSoundEvent.java +diff --git a/src/main/java/gg/projecteden/gg/parchment/event/sound/ParchmentSoundEvent.java b/src/main/java/gg/projecteden/gg/parchment/event/sound/ParchmentSoundEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..44245b61f64e4e2eb21ac4f5e540aa9a583bfcfe --- /dev/null -+++ b/src/main/java/gg/projecteden/parchment/event/sound/ParchmentSoundEvent.java ++++ b/src/main/java/gg/projecteden/gg/parchment/event/sound/ParchmentSoundEvent.java @@ -0,0 +1,28 @@ +package gg.projecteden.parchment.event.sound; + @@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..44245b61f64e4e2eb21ac4f5e540aa9a + } +} diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -index db54a9c32578defa02fa58dc694c96684a4885ac..6c2477f066f887557e89456994a49ddaf1f8aa27 100644 +index 99871023c54e387c6ef72a4307d945047aee87fe..4ce043faf03caf8858a86876b9125e274eb75c43 100644 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java -@@ -339,6 +339,40 @@ public final class PaperAdventure { +@@ -344,6 +344,41 @@ public final class PaperAdventure { return asVanilla(source); } @@ -79,22 +79,23 @@ index db54a9c32578defa02fa58dc694c96684a4885ac..6c2477f066f887557e89456994a49dda + return Key.key(key.getNamespace(), key.getPath()); + } + // Parchment end ++ + public static Packet asSoundPacket(final Sound sound, final double x, final double y, final double z, final long seed, @Nullable BiConsumer, Float> packetConsumer) { final ResourceLocation name = asVanilla(sound.name()); final Optional soundEvent = BuiltInRegistries.SOUND_EVENT.getOptional(name); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 584a768f2ce1c98a1de7749060c47f21721f9055..c900dcd24fbbabf2bfc0e42015478b8af61c6b9d 100644 +index b78a9628a88f2a495ef6de74446a02a14d41a1f6..abd5300282563a804290eb2e9333e59a0e8ac708 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1787,12 +1787,46 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1811,12 +1811,46 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override - public void playSeededSound(@Nullable Player except, double x, double y, double z, Holder sound, SoundSource category, float volume, float pitch, long seed) { -- this.server.getPlayerList().broadcast(except, x, y, z, (double) ((SoundEvent) sound.value()).getRange(volume), this.dimension(), new ClientboundSoundPacket(sound, category, x, y, z, volume, pitch, seed)); + public void playSeededSound(@Nullable Player source, double x, double y, double z, Holder sound, SoundSource category, float volume, float pitch, long seed) { +- this.server.getPlayerList().broadcast(source, x, y, z, (double) ((SoundEvent) sound.value()).getRange(volume), this.dimension(), new ClientboundSoundPacket(sound, category, x, y, z, volume, pitch, seed)); + // Parchment start - sound event + CraftEventFactory.playSoundEvent(new gg.projecteden.parchment.event.sound.SoundEvent( -+ except == null ? null : except.getBukkitEntity(), ++ source == null ? null : source.getBukkitEntity(), + net.kyori.adventure.sound.Sound.sound() + .type(sound.unwrap().map( + key -> io.papermc.paper.adventure.PaperAdventure.asAdventure(key.location()), @@ -113,11 +114,11 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..c900dcd24fbbabf2bfc0e42015478b8a } @Override - public void playSeededSound(@Nullable Player except, Entity entity, Holder sound, SoundSource category, float volume, float pitch, long seed) { -- this.server.getPlayerList().broadcast(except, entity.getX(), entity.getY(), entity.getZ(), (double) ((SoundEvent) sound.value()).getRange(volume), this.dimension(), new ClientboundSoundEntityPacket(sound, category, entity, volume, pitch, seed)); + public void playSeededSound(@Nullable Player source, Entity entity, Holder sound, SoundSource category, float volume, float pitch, long seed) { +- this.server.getPlayerList().broadcast(source, entity.getX(), entity.getY(), entity.getZ(), (double) ((SoundEvent) sound.value()).getRange(volume), this.dimension(), new ClientboundSoundEntityPacket(sound, category, entity, volume, pitch, seed)); + // Parchment start - sound event + CraftEventFactory.playSoundEvent(new gg.projecteden.parchment.event.sound.SoundEvent( -+ except == null ? null : except.getBukkitEntity(), ++ source == null ? null : source.getBukkitEntity(), + net.kyori.adventure.sound.Sound.sound() + .type(sound.unwrap().map( + key -> io.papermc.paper.adventure.PaperAdventure.asAdventure(key.location()), @@ -137,10 +138,10 @@ index 584a768f2ce1c98a1de7749060c47f21721f9055..c900dcd24fbbabf2bfc0e42015478b8a @Override diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f71a4a8307fb092d33545e12d253e0b80c884168..50dc222a2ebd08fe6ef2d45a6b16801a096f8681 100644 +index 8efbbd379244e3ed54d4aba199037cc20ccd096a..823bc659f7421c3752e4cf1333e1568e1308464d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2336,7 +2336,20 @@ public class ServerPlayer extends Player { +@@ -2435,7 +2435,20 @@ public class ServerPlayer extends Player { @Override public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) { @@ -163,10 +164,10 @@ index f71a4a8307fb092d33545e12d253e0b80c884168..50dc222a2ebd08fe6ef2d45a6b16801a @Override diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 33abcf12b4426572b74ca4c813e4392c823494bc..f1627a528d703b87225573c400bdee8288254e36 100644 +index a35638a92479b90afa89cf201fc45b49c9e767f3..70aa55d04875338b92d29faba18aee08a926e518 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -970,7 +970,7 @@ public abstract class PlayerList { +@@ -968,7 +968,7 @@ public abstract class PlayerList { BlockState data = worldserver1.getBlockState(blockposition); worldserver1.setBlock(blockposition, data.setValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE, data.getValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE) - 1), 3); } @@ -176,10 +177,10 @@ index 33abcf12b4426572b74ca4c813e4392c823494bc..f1627a528d703b87225573c400bdee82 } // Added from changeDimension diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 481c3e321cfc0f20bb1c4c6942b8bdbd23c06339..2a9b0ba338f3bc8f3750deb6b93bd2099c867f28 100644 +index 7f3466340891b4409d1399ebeb2ca865d77841cd..f459202c3a79128df936be4a1a2cd51bbc9143b8 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1924,7 +1924,21 @@ public abstract class Player extends LivingEntity { +@@ -1839,7 +1839,21 @@ public abstract class Player extends LivingEntity { private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself if (fromEntity instanceof ServerPlayer) { @@ -216,10 +217,10 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..df03f4867742cd194db260dfb81398b1 } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c 100644 +index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..dfd54e3f9016635c986afdb613c94be9bec91237 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2166,4 +2166,42 @@ public class CraftEventFactory { +@@ -2177,4 +2177,42 @@ public class CraftEventFactory { return event; } // Paper end - add EntityFertilizeEggEvent diff --git a/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch b/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch index be63752..10bf645 100644 --- a/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch +++ b/patches/server/0004-Add-PlayerUseRespawnAnchorEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerUseRespawnAnchorEvent diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java -index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..e9f80170f85906c70898c7a04b9a16497a7d2994 100644 +index 797ece59c10bdb60a86f71ca3b7bb95dbe0f1078..e560312bacc25ef3c2f26122fa68228bdf9e42a5 100644 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java -@@ -58,23 +58,45 @@ public class RespawnAnchorBlock extends Block { +@@ -65,23 +65,45 @@ public class RespawnAnchorBlock extends Block { public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ItemStack itemstack = player.getItemInHand(hand); diff --git a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch index 21bb57f..d1abb2d 100644 --- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch +++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c..fdbff121810d46cd6896558863cc6317586abca5 100644 +index dfd54e3f9016635c986afdb613c94be9bec91237..c7056a714cecb4c2190bc5e85bf4ac3812640f6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1051,7 +1051,7 @@ public class CraftEventFactory { +@@ -1063,7 +1063,7 @@ public class CraftEventFactory { CraftEventFactory.entityDamage = null; EntityDamageEvent event; if (damager == null) { @@ -17,7 +17,7 @@ index 7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c..fdbff121810d46cd6896558863cc6317 } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) { event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions); } else { -@@ -1099,7 +1099,7 @@ public class CraftEventFactory { +@@ -1111,7 +1111,7 @@ public class CraftEventFactory { return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) { @@ -26,7 +26,7 @@ index 7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c..fdbff121810d46cd6896558863cc6317 event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -1109,7 +1109,7 @@ public class CraftEventFactory { +@@ -1121,7 +1121,7 @@ public class CraftEventFactory { } return event; } else if (source.is(DamageTypes.LAVA)) { diff --git a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch index e511d56..f039594 100644 --- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 548c77592a3520e8053483644eba805079a14f1a..4ea241f475e89b29e27a425fb4c64644ad5e8727 100644 +index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..ad1cc677ed7f04c9b6629050e1900e85299bac67 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -645,6 +645,55 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -642,6 +642,55 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end diff --git a/patches/server/0007-Add-Player-setGameProfile.patch b/patches/server/0007-Add-Player-setGameProfile.patch index f83f6be..d8f6143 100644 --- a/patches/server/0007-Add-Player-setGameProfile.patch +++ b/patches/server/0007-Add-Player-setGameProfile.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2a9b0ba338f3bc8f3750deb6b93bd2099c867f28..70bb9c9052ed52308ea42542f50939c23d0311e1 100644 +index f459202c3a79128df936be4a1a2cd51bbc9143b8..31f533ae280f147cbc183430a6209beedf4e96b3 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1516,6 +1516,12 @@ public abstract class Player extends LivingEntity { +@@ -1511,6 +1511,12 @@ public abstract class Player extends LivingEntity { return this.gameProfile; } diff --git a/patches/server/0008-Expose-MCUtil-Executors.patch b/patches/server/0008-Expose-MCUtil-Executors.patch index 0b96a15..ddf5608 100644 --- a/patches/server/0008-Expose-MCUtil-Executors.patch +++ b/patches/server/0008-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2d4b1ea8a3fd11f7b7cfb204d0c5c08ca4b784cb..afdb48692ba8ae632146e595e31928a73f1a4bc3 100644 +index f8925b5f581fac113de89b9fca24d35e39a6fa3d..7aa1ee8ec0ddcbac85102c67394c757a438f95e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3196,4 +3196,16 @@ public final class CraftServer implements Server { +@@ -3228,4 +3228,16 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0009-Add-BlockDropResourcesEvent.patch b/patches/server/0009-Add-BlockDropResourcesEvent.patch index 79545e5..298bb04 100644 --- a/patches/server/0009-Add-BlockDropResourcesEvent.patch +++ b/patches/server/0009-Add-BlockDropResourcesEvent.patch @@ -8,10 +8,10 @@ to easily get the items being dropped by any block instead of only blocks broken by players. diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index d4cbff18adb62073a1dceb189043789620af6877..059954dd8cf9958c32b9310d93c4f958db9bd72e 100644 +index 4d50dd92a7f3187ee1d8edb926e7c273c8156549..c4c27fb5b92833eca243e1ba718c8dcaa676a310 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java -@@ -302,7 +302,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -309,7 +309,7 @@ public class Block extends BlockBehaviour implements ItemLike { public static void dropResources(BlockState state, Level world, BlockPos pos) { if (world instanceof ServerLevel) { @@ -20,7 +20,7 @@ index d4cbff18adb62073a1dceb189043789620af6877..059954dd8cf9958c32b9310d93c4f958 Block.popResource(world, pos, itemstack); }); state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true); -@@ -312,7 +312,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -319,7 +319,7 @@ public class Block extends BlockBehaviour implements ItemLike { public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) { if (world instanceof ServerLevel) { @@ -29,7 +29,7 @@ index d4cbff18adb62073a1dceb189043789620af6877..059954dd8cf9958c32b9310d93c4f958 Block.popResource((ServerLevel) world, pos, itemstack); }); state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true); -@@ -339,7 +339,7 @@ public class Block extends BlockBehaviour implements ItemLike { +@@ -346,7 +346,7 @@ public class Block extends BlockBehaviour implements ItemLike { public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) { if (world instanceof ServerLevel) { @@ -39,10 +39,10 @@ index d4cbff18adb62073a1dceb189043789620af6877..059954dd8cf9958c32b9310d93c4f958 }); state.spawnAfterBreak((ServerLevel) world, pos, tool, true); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fdbff121810d46cd6896558863cc6317586abca5..7ab04307f15e980627d023fe83f36358d8b883b1 100644 +index c7056a714cecb4c2190bc5e85bf4ac3812640f6c..6c1f74e3dbbf421e6ff496aee58297e6a9d36308 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2203,5 +2203,19 @@ public class CraftEventFactory { +@@ -2214,5 +2214,19 @@ public class CraftEventFactory { } }); } diff --git a/patches/server/0010-Add-Furnace-Recipe-API.patch b/patches/server/0010-Add-Furnace-Recipe-API.patch index d620161..f051d0d 100644 --- a/patches/server/0010-Add-Furnace-Recipe-API.patch +++ b/patches/server/0010-Add-Furnace-Recipe-API.patch @@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c3060d1d4d0caf369c6ab516cb424f45eb851019..96468013783c2a2f3178bdbbe0884f855dbd72ec 100644 +index e1fad381b861471a17529c246bb8a4a9c7646420..3a0fa7f7085607f44a52095c29647f6fbe641764 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2466,4 +2466,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2505,4 +2505,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { return this.adventure$pointers; } // Paper end diff --git a/patches/server/0011-Disable-sleep-status-announcements.patch b/patches/server/0011-Disable-sleep-status-announcements.patch index 4318c51..291c0f1 100644 --- a/patches/server/0011-Disable-sleep-status-announcements.patch +++ b/patches/server/0011-Disable-sleep-status-announcements.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c900dcd24fbbabf2bfc0e42015478b8af61c6b9d..2dbfff6a36591c9c8e9dbdb217da7e470a8e5bc5 100644 +index abd5300282563a804290eb2e9333e59a0e8ac708..bb6fcfe8c4fd42db3018b79853c11d598fac4b7b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1150,7 +1150,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1173,7 +1173,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } private void announceSleepStatus() { diff --git a/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch index 714dae4..3eeda8e 100644 --- a/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch +++ b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config for ticking TIME_SINCE_REST diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index ed79d30f33b2674863b2d73b1abdb48433c33412..ba37d877ca690b67223c0f1989b441301ce1047c 100644 +index 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..aa47cd0274db73cefb5feb062be53f1cd66d48cf 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -286,6 +286,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -287,6 +287,7 @@ public class WorldConfiguration extends ConfigurationPart { } public boolean disablePlayerCrits = false; @@ -17,10 +17,10 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..ba37d877ca690b67223c0f1989b44130 public PillagerPatrols pillagerPatrols; diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 70bb9c9052ed52308ea42542f50939c23d0311e1..5f310ffc47a30897494beb1c351509a182781e1d 100644 +index 31f533ae280f147cbc183430a6209beedf4e96b3..1016f8a15756756fa7e85878aa22dbab5ae74a55 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -293,7 +293,7 @@ public abstract class Player extends LivingEntity { +@@ -288,7 +288,7 @@ public abstract class Player extends LivingEntity { this.awardStat(Stats.CROUCH_TIME); } diff --git a/patches/server/0014-Add-Player-getHiddenEntities-API.patch b/patches/server/0014-Add-Player-getHiddenEntities-API.patch index f873dbc..799047f 100644 --- a/patches/server/0014-Add-Player-getHiddenEntities-API.patch +++ b/patches/server/0014-Add-Player-getHiddenEntities-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..1aa00378a3c6d62a110767e943e998e0ce47ab68 100644 +index fd84786f3e72875e79df46416f47f3403876cef3..c3d6e20a29ab392ce9c1be027fbf6c6e06720efe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1985,6 +1985,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2009,6 +2009,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity)); } // Paper start diff --git a/patches/server/0017-Expanded-Insomnia-API.patch b/patches/server/0017-Expanded-Insomnia-API.patch index 4c23d98..236656a 100644 --- a/patches/server/0017-Expanded-Insomnia-API.patch +++ b/patches/server/0017-Expanded-Insomnia-API.patch @@ -5,33 +5,27 @@ Subject: [PATCH] Expanded Insomnia API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1aa00378a3c6d62a110767e943e998e0ce47ab68..85687cf09b185c57b52578cc0d8967803d2c1b6c 100644 +index c3d6e20a29ab392ce9c1be027fbf6c6e06720efe..0070b39c9b4e6414c83d1863095af7ed93b55fc7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -83,6 +83,7 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl; - import net.minecraft.server.players.UserWhiteListEntry; - import net.minecraft.sounds.SoundEvent; - import net.minecraft.world.entity.Entity; -+import net.minecraft.world.entity.EntitySelector; - import net.minecraft.world.entity.ai.attributes.AttributeInstance; - import net.minecraft.world.entity.ai.attributes.AttributeMap; - import net.minecraft.world.entity.ai.attributes.Attributes; -@@ -198,6 +199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -197,6 +197,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit - private long lastSaveTime; - // Paper end -+ private boolean bypassesInsomnia = false; // Parchment - Insomnia api + private long lastSaveTime; // Paper - getLastPlayed replacement API ++ private boolean bypassesInsomnia = false; // Parchment - Insomnia api ++ public CraftPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); -@@ -2144,6 +2146,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - return this; - } +@@ -3304,4 +3306,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + return this.spigot; + } + // Spigot end ++ + // Parchment start + @Override + public boolean isInsomniac() { -+ return EntitySelector.IS_INSOMNIAC.test(this.getHandle()); ++ return net.minecraft.world.entity.EntitySelector.IS_INSOMNIAC.test(this.getHandle()); + } + + @Override @@ -55,6 +49,5 @@ index 1aa00378a3c6d62a110767e943e998e0ce47ab68..85687cf09b185c57b52578cc0d896780 + } + // Parchment end + - @Override - public ServerPlayer getHandle() { - return (ServerPlayer) this.entity; ++ + } diff --git a/patches/server/0018-Add-spam-bypass-permission.patch b/patches/server/0018-Add-spam-bypass-permission.patch index 4724293..bd792ad 100644 --- a/patches/server/0018-Add-spam-bypass-permission.patch +++ b/patches/server/0018-Add-spam-bypass-permission.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add spam bypass permission diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65bb221993147a558995b36fb835f7b82e0eb4bd..dc3f2da0977705c487132bef552cd74244e3fa8f 100644 +index 30ccbab1586a656e0ae41d7406525fb02d9e025b..4a5c5a0f4e4bf1f256bcf518955403995e2368a7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -770,6 +770,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -773,6 +773,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) { // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async // CraftBukkit start @@ -16,7 +16,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..dc3f2da0977705c487132bef552cd742 if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause return; -@@ -780,6 +781,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -783,6 +784,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper return; } @@ -24,7 +24,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..dc3f2da0977705c487132bef552cd742 // Paper end // CraftBukkit end // Paper start - Don't suggest if tab-complete is disabled -@@ -2448,6 +2450,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2450,6 +2452,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl // Spigot start - spam exclusions private void detectRateSpam(String s) { @@ -32,7 +32,7 @@ index 65bb221993147a558995b36fb835f7b82e0eb4bd..dc3f2da0977705c487132bef552cd742 // CraftBukkit start - replaced with thread safe throttle boolean counted = true; for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions ) -@@ -3197,10 +3200,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3199,10 +3202,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { diff --git a/patches/server/0019-Disable-set-respawn-message.patch b/patches/server/0019-Disable-set-respawn-message.patch index 4a60de3..f3a9322 100644 --- a/patches/server/0019-Disable-set-respawn-message.patch +++ b/patches/server/0019-Disable-set-respawn-message.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable set respawn message diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 50dc222a2ebd08fe6ef2d45a6b16801a096f8681..2659e767a55d1ac75baaa4b663a3949bf520251b 100644 +index 823bc659f7421c3752e4cf1333e1568e1308464d..b7cdefdbbdba46fdd9f39275474be356c2af8b40 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2300,9 +2300,11 @@ public class ServerPlayer extends Player { +@@ -2399,9 +2399,11 @@ public class ServerPlayer extends Player { forced = event.isForced(); // Paper end diff --git a/patches/server/0021-Remove-Hanging-Entity-Debug.patch b/patches/server/0021-Remove-Hanging-Entity-Debug.patch index a07aae5..a006ec6 100644 --- a/patches/server/0021-Remove-Hanging-Entity-Debug.patch +++ b/patches/server/0021-Remove-Hanging-Entity-Debug.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove Hanging Entity Debug diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java -index 360ca6458083fa4018f11fcdade3ce930835db72..94f105c829d196c1526c8251527fe519a5e0180e 100644 +index 374f73ac1dbfa27daef132373f7af4b9bb12daa0..015badafe28adc6ab121b24b7cb585a84bce12ff 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java +++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java -@@ -272,7 +272,7 @@ public abstract class HangingEntity extends Entity { +@@ -281,7 +281,7 @@ public abstract class HangingEntity extends Entity { BlockPos blockposition = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ")); if (!blockposition.closerThan(this.blockPosition(), 16.0D)) { diff --git a/patches/server/0022-Add-PreEntityShootBowEvent.patch b/patches/server/0022-Add-PreEntityShootBowEvent.patch index 3920dfa..e06a31d 100644 --- a/patches/server/0022-Add-PreEntityShootBowEvent.patch +++ b/patches/server/0022-Add-PreEntityShootBowEvent.patch @@ -51,10 +51,10 @@ index 63fce7e3d9f59f36e29bc827a46396d73143bb8b..9762a79c928d7235a7868b37858474e1 org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, target.getUsedItemHand(), 0.8F, true); if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 6c176933967f6ee98da3026f16a10efe4c3842fe..fa0608f40bb83694d2a6d413c4b66e760c9db985 100644 +index 42ebd91196ae420eee57f4380abc558555457163..593c9e840956efe0fcd723744eef389b01a140c4 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -129,8 +129,10 @@ public abstract class AbstractArrow extends Projectile { +@@ -136,8 +136,10 @@ public abstract class AbstractArrow extends Projectile { } @Override @@ -68,10 +68,10 @@ index 6c176933967f6ee98da3026f16a10efe4c3842fe..fa0608f40bb83694d2a6d413c4b66e76 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index a90317100d32974e481e14476843f66997a2cf3a..f65c29dd02b31431e085074dd6460eca17214471 100644 +index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..48f246351d75af18b72fe235b013de1c7290c8db 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -164,9 +164,17 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -172,9 +172,17 @@ public abstract class Projectile extends Entity implements TraceableEntity { } public void shoot(double x, double y, double z, float speed, float divergence) { @@ -89,7 +89,7 @@ index a90317100d32974e481e14476843f66997a2cf3a..f65c29dd02b31431e085074dd6460eca double d3 = vec3d.horizontalDistance(); this.setYRot((float) (Mth.atan2(vec3d.x, vec3d.z) * 57.2957763671875D)); -@@ -176,6 +184,12 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -184,6 +192,12 @@ public abstract class Projectile extends Entity implements TraceableEntity { } public void shootFromRotation(Entity shooter, float pitch, float yaw, float roll, float speed, float divergence) { @@ -102,7 +102,7 @@ index a90317100d32974e481e14476843f66997a2cf3a..f65c29dd02b31431e085074dd6460eca float f5 = -Mth.sin(yaw * 0.017453292F) * Mth.cos(pitch * 0.017453292F); float f6 = -Mth.sin((pitch + roll) * 0.017453292F); float f7 = Mth.cos(yaw * 0.017453292F) * Mth.cos(pitch * 0.017453292F); -@@ -183,7 +197,9 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -191,7 +205,9 @@ public abstract class Projectile extends Entity implements TraceableEntity { this.shoot((double) f5, (double) f6, (double) f7, speed, divergence); Vec3 vec3d = shooter.getDeltaMovement(); diff --git a/patches/server/0023-Return-Displays-in-getTargetEntity.patch b/patches/server/0023-Return-Displays-in-getTargetEntity.patch index 91c5577..989515f 100644 --- a/patches/server/0023-Return-Displays-in-getTargetEntity.patch +++ b/patches/server/0023-Return-Displays-in-getTargetEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Return Displays in getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a76eb3d051db0229ed088b71c92ff3f131449007..4fa9da4b9bdda2e826a73145cf8fd49e461518fd 100644 +index 45b1a182acf6b2aef40b714d31ca125d8f74619a..90da5817fd0e5dc332193944b68fc343915d5b39 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -4097,7 +4097,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4107,7 +4107,7 @@ public abstract class LivingEntity extends Entity implements Attackable { Vec3 direction = this.getLookAngle(); Vec3 end = start.add(direction.x * maxDistance, direction.y * maxDistance, direction.z * maxDistance);