From 8b5b43443283f9700db0014df6d8c0a53fdfeddf Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Thu, 15 Jun 2023 20:44:54 +0200 Subject: [PATCH] Initial update to 1.20 [build] [publish] --- build.gradle | 58 +++-- changelog.md | 2 +- gradle.properties | 16 +- gradle/curseforge.gradle | 1 + gradle/modrinth.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 12 +- gradlew.bat | 1 + settings.gradle | 9 +- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 2 +- .../3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6 | 4 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 234 +++++++++--------- .../5e9f99de52df90fff0eca2705b8d4af79b8c83be | 2 +- .../62888ce2b9547abf000d004b13c12bacb5ffaca1 | 2 +- .../735031f3addf80804addae5e3f53249900116f1e | 2 +- .../8fa013ccbf10434e23abe63f04d41f64f8518015 | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 2 +- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 2 +- .../d9ca59ae31ccf5a8a87a3f23307ff41b6ca77e97 | 2 +- .../f83529e499d02003904562a2f999b81582975f80 | 2 +- .../loot_tables/blocks/angry_bee_statue.json | 3 +- .../statues/loot_tables/blocks/azzaro.json | 3 +- .../blocks/baby_zombie_statue.json | 3 +- .../loot_tables/blocks/bee_statue.json | 3 +- .../loot_tables/blocks/blaze_statue.json | 3 +- .../blocks/brown_mooshroom_statue.json | 3 +- .../loot_tables/blocks/bumbo_statue.json | 3 +- .../loot_tables/blocks/campfire_statue.json | 3 +- .../loot_tables/blocks/cat_black_statue.json | 3 +- .../blocks/cat_british_shorthair_statue.json | 3 +- .../loot_tables/blocks/cat_calico_statue.json | 3 +- .../loot_tables/blocks/cat_jellie_statue.json | 3 +- .../blocks/cat_persian_statue.json | 3 +- .../blocks/cat_ragdoll_statue.json | 3 +- .../loot_tables/blocks/cat_red_statue.json | 3 +- .../blocks/cat_siamese_statue.json | 3 +- .../loot_tables/blocks/cat_tabby_statue.json | 3 +- .../loot_tables/blocks/cat_tuxedo_statue.json | 3 +- .../loot_tables/blocks/cat_white_statue.json | 3 +- .../blocks/chicken_jockey_statue.json | 3 +- .../loot_tables/blocks/chicken_statue.json | 3 +- .../loot_tables/blocks/cod_statue.json | 3 +- .../loot_tables/blocks/cow_statue.json | 3 +- .../loot_tables/blocks/creeper_statue.json | 3 +- .../blocks/detective_platypus_statue.json | 3 +- .../loot_tables/blocks/display_stand.json | 3 +- .../loot_tables/blocks/dolphin_statue.json | 3 +- .../loot_tables/blocks/drowned_statue.json | 3 +- .../statues/loot_tables/blocks/eagle_ray.json | 3 +- .../blocks/elder_guardian_statue.json | 3 +- .../loot_tables/blocks/enderman_statue.json | 3 +- .../loot_tables/blocks/endermite_statue.json | 3 +- .../loot_tables/blocks/evoker_statue.json | 3 +- .../loot_tables/blocks/flood_statue.json | 3 +- .../loot_tables/blocks/fox_snow_statue.json | 3 +- .../loot_tables/blocks/fox_statue.json | 3 +- .../loot_tables/blocks/ghast_statue.json | 3 +- .../loot_tables/blocks/guardian_statue.json | 3 +- .../loot_tables/blocks/husk_statue.json | 3 +- .../loot_tables/blocks/info_statue.json | 3 +- .../loot_tables/blocks/king_cluck_statue.json | 3 +- .../loot_tables/blocks/magma_statue.json | 3 +- .../loot_tables/blocks/mooshroom_statue.json | 3 +- .../blocks/panda_angry_statue.json | 3 +- .../blocks/panda_brown_statue.json | 3 +- .../loot_tables/blocks/panda_lazy_statue.json | 3 +- .../blocks/panda_normal_statue.json | 3 +- .../blocks/panda_playful_statue.json | 3 +- .../loot_tables/blocks/panda_weak_statue.json | 3 +- .../blocks/panda_worried_statue.json | 3 +- .../statues/loot_tables/blocks/pebble.json | 3 +- .../loot_tables/blocks/pig_statue.json | 3 +- .../loot_tables/blocks/pillager_statue.json | 3 +- .../loot_tables/blocks/player_statue.json | 3 +- .../blocks/pufferfish_medium_statue.json | 3 +- .../blocks/pufferfish_small_statue.json | 3 +- .../loot_tables/blocks/pufferfish_statue.json | 3 +- .../loot_tables/blocks/rabbit_br_statue.json | 3 +- .../loot_tables/blocks/rabbit_bs_statue.json | 3 +- .../loot_tables/blocks/rabbit_bw_statue.json | 3 +- .../loot_tables/blocks/rabbit_go_statue.json | 3 +- .../loot_tables/blocks/rabbit_wh_statue.json | 3 +- .../loot_tables/blocks/rabbit_ws_statue.json | 3 +- .../loot_tables/blocks/ravager_statue.json | 3 +- .../loot_tables/blocks/salmon_statue.json | 3 +- .../blocks/sheep_shaven_statue.json | 3 +- .../blocks/sheep_statue_black.json | 3 +- .../loot_tables/blocks/sheep_statue_blue.json | 3 +- .../blocks/sheep_statue_brown.json | 3 +- .../loot_tables/blocks/sheep_statue_cyan.json | 3 +- .../loot_tables/blocks/sheep_statue_gray.json | 3 +- .../blocks/sheep_statue_green.json | 3 +- .../blocks/sheep_statue_light_blue.json | 3 +- .../blocks/sheep_statue_light_gray.json | 3 +- .../loot_tables/blocks/sheep_statue_lime.json | 3 +- .../blocks/sheep_statue_magenta.json | 3 +- .../blocks/sheep_statue_orange.json | 3 +- .../loot_tables/blocks/sheep_statue_pink.json | 3 +- .../blocks/sheep_statue_purple.json | 3 +- .../loot_tables/blocks/sheep_statue_red.json | 3 +- .../blocks/sheep_statue_white.json | 3 +- .../blocks/sheep_statue_yellow.json | 3 +- .../loot_tables/blocks/shulker_statue.json | 3 +- .../statues/loot_tables/blocks/slabfish.json | 3 +- .../loot_tables/blocks/slime_statue.json | 3 +- .../loot_tables/blocks/snow_golem_statue.json | 3 +- .../statues/loot_tables/blocks/sombrero.json | 3 +- .../loot_tables/blocks/spider_statue.json | 3 +- .../loot_tables/blocks/squid_statue.json | 3 +- .../loot_tables/blocks/statue_table.json | 3 +- .../blocks/totem_of_undying_statue.json | 3 +- .../loot_tables/blocks/trans_bee_statue.json | 3 +- .../statues/loot_tables/blocks/tropibee.json | 3 +- .../loot_tables/blocks/tropical_fish_b.json | 3 +- .../loot_tables/blocks/tropical_fish_bb.json | 3 +- .../loot_tables/blocks/tropical_fish_be.json | 3 +- .../loot_tables/blocks/tropical_fish_bm.json | 3 +- .../loot_tables/blocks/tropical_fish_bmb.json | 3 +- .../loot_tables/blocks/tropical_fish_bms.json | 3 +- .../loot_tables/blocks/tropical_fish_e.json | 3 +- .../loot_tables/blocks/tropical_fish_es.json | 3 +- .../loot_tables/blocks/tropical_fish_hb.json | 3 +- .../loot_tables/blocks/tropical_fish_sb.json | 3 +- .../loot_tables/blocks/tropical_fish_sd.json | 3 +- .../loot_tables/blocks/tropical_fish_ss.json | 3 +- .../loot_tables/blocks/turtle_statue.json | 3 +- .../blocks/villager_br_statue.json | 3 +- .../blocks/villager_gr_statue.json | 3 +- .../blocks/villager_pu_statue.json | 3 +- .../blocks/villager_wh_statue.json | 3 +- .../loot_tables/blocks/vindicator_statue.json | 3 +- .../loot_tables/blocks/wasteland_statue.json | 3 +- .../loot_tables/blocks/witch_statue.json | 3 +- .../loot_tables/blocks/zombie_statue.json | 3 +- .../loot_tables/entities/player_statue.json | 3 +- .../loot_tables/entities/statue_bat.json | 3 +- .../worldgen/biome/can_spawn_statue_bat.json | 1 + .../java/com/shynieke/statues/Statues.java | 3 +- .../statues/blocks/AbstractStatueBase.java | 4 +- .../blocks/statues/PlayerStatueBlock.java | 6 +- .../blocks/statues/RabbitStatueBlock.java | 2 +- .../statues/client/ClientHandler.java | 4 +- .../client/render/PlayerStatueRenderer.java | 2 +- .../client/screen/PlayerPoseScreen.java | 27 +- .../client/screen/ShulkerStatueScreen.java | 16 +- .../client/screen/StatueTableScreen.java | 20 +- .../compat/jei/category/LootCategory.java | 12 +- .../compat/jei/category/UpgradeCategory.java | 6 +- .../compat/patchouli/PatchouliCompat.java | 2 +- .../statues/datagen/StatuesDataGenerator.java | 3 +- .../datagen/server/StatueLootProvider.java | 3 +- .../patchouli/StatuePatchouliProvider.java | 130 +++++----- .../shynieke/statues/entity/PlayerStatue.java | 26 +- .../statues/fakeplayer/StatueFakePlayer.java | 2 +- .../statues/handlers/DropHandler.java | 24 +- .../statues/handlers/FishHandler.java | 2 +- .../statues/handlers/SpecialHandler.java | 6 +- .../statues/handlers/StatueHandler.java | 2 +- .../statues/menu/ShulkerStatueMenu.java | 2 +- .../statues/menu/StatueTableMenu.java | 4 +- .../message/PlayerStatueSyncMessage.java | 2 +- .../statues/registry/StatueRegistry.java | 29 ++- .../shynieke/statues/registry/StatueTabs.java | 38 --- .../resources/META-INF/accesstransformer.cfg | 3 +- src/main/resources/META-INF/mods.toml | 12 +- src/main/resources/pack.mcmeta | 11 +- 167 files changed, 624 insertions(+), 488 deletions(-) delete mode 100644 src/main/java/com/shynieke/statues/registry/StatueTabs.java diff --git a/build.gradle b/build.gradle index 243f7c6b..956fbe05 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,26 @@ plugins { + id 'eclipse' + id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.1.+' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'com.matthewprenger.cursegradle' version '1.4.0' id 'com.modrinth.minotaur' version "2.+" } version = "${version}" -group = 'com.shynieke.statues' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "Statues-${mc_version}" +group = "${mod_group}" +base { + archivesName = "Statues-${mc_version}" +} // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - mappings channel: "${mcp_channel}", version: "${mcp_mappings}" + mappings channel: mapping_channel, version: mapping_version + + copyIdeResources = true accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -25,49 +31,61 @@ minecraft { property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" // Recommended logging data for a userdev environment + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'REGISTRIES' // Recommended logging level for the console property 'forge.logging.console.level', 'debug' + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', "${mod_id}" + mods { - statues { + "${mod_id}" { source sourceSets.main } } } + server { workingDirectory project.file('run') property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" // Recommended logging data for a userdev environment + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'REGISTRIES' // Recommended logging level for the console property 'forge.logging.console.level', 'debug' + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', "${mod_id}" + mods { - statues { + "${mod_id}" { source sourceSets.main } } } + data { workingDirectory project.file('run') property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" // Recommended logging data for a userdev environment + // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'REGISTRIES' // Recommended logging level for the console property 'forge.logging.console.level', 'debug' - args '--mod', 'statues', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', "${mod_id}", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') mods { - statues { + "${mod_id}" { source sourceSets.main } } @@ -104,30 +122,36 @@ dependencies { // implementation fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-${mc_version}:${crafttweaker_version}") - implementation fg.deobf("top.theillusivec4.curios:curios-forge:${mc_version}-${curios_version}") + implementation fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}") - implementation fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}-FORGE") - implementation fg.deobf("xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}") +// implementation fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}-FORGE") +// implementation fg.deobf("xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}") - implementation fg.deobf("curse.maven:jade-324717:4573063") //Jade (WAILA) - implementation fg.deobf("curse.maven:TheOneProbe-245211:4442439") //The One probe (TOP) + implementation fg.deobf("curse.maven:jade-324717:4586193") //Jade (WAILA) + implementation fg.deobf("curse.maven:TheOneProbe-245211:4579432") //The One probe (TOP) } // Example for how to get properties into the manifest for reading by the runtime.. jar { manifest { attributes([ - "Specification-Title" : "statues", + "Specification-Title" : "${mod_id}", "Specification-Vendor" : "ShyNieke", "Specification-Version" : "1", // We are version 1 of ourselves "Implementation-Title" : project.name, - "Implementation-Version" : "${version}", + "Implementation-Version" : project.jar.archiveVersion, "Implementation-Vendor" : "ShyNieke", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } } +// Example configuration to allow publishing using the maven-publish plugin +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +// publish.dependsOn('reobfJar') + def reobfFile = file("$buildDir/reobfJar/output.jar") def reobfArtifact = artifacts.add('default', reobfFile) { type 'jar' @@ -138,7 +162,7 @@ publishing { mavenJava(MavenPublication) { artifact(reobfArtifact) { builtBy reobfArtifact - artifactId = archivesBaseName + artifactId = base.archivesName.get() classifier null } } diff --git a/changelog.md b/changelog.md index 68fb59a0..8ec62714 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -* Initial update to 1.19.4 \ No newline at end of file +* Initial update to 1.20 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ca016613..92729e30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,12 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Base info -mc_version=1.19.4 -forge_version=45.1.0 -mcp_channel=official -mcp_mappings=1.19.4 +mc_version=1.20.1 +forge_version=47.0.1 +mapping_channel=official +mapping_version=1.20.1 +mod_group=com.shynieke.statues +mod_id=statues #Publishing mod_name=Statues @@ -15,12 +17,12 @@ curseforge_id=253172 modrinth_id=hsCeX7k7 # Version -version=0.3.5 +version=0.3.6 # Dependencies -jei_version=13.1.0.11 +jei_version=15.0.0.12 crafttweaker_version=10.0.21 -curios_version=5.1.5.3 +curios_version=5.2.0-beta.3+1.20.1 patchouli_version=1.19.4-79 patchouli_provider_version=1.19.4-1.0.9-Snapshot.4 diff --git a/gradle/curseforge.gradle b/gradle/curseforge.gradle index be8c0672..ef92ba52 100644 --- a/gradle/curseforge.gradle +++ b/gradle/curseforge.gradle @@ -7,6 +7,7 @@ if (System.getenv().CURSEFORGE_KEY) { id = project.curseforge_id releaseType = "beta" addGameVersion "Forge" + addGameVersion "1.20" addGameVersion "${mc_version}" addGameVersion "Java 17" mainArtifact(jar) diff --git a/gradle/modrinth.gradle b/gradle/modrinth.gradle index 913a0809..512ed2bb 100644 --- a/gradle/modrinth.gradle +++ b/gradle/modrinth.gradle @@ -10,7 +10,7 @@ if (System.getenv().MODRINTH_KEY) { versionNumber = project.version uploadFile = jar changelog = fileContents - gameVersions = ["${mc_version}"] + gameVersions = ["1.20", "${mc_version}"] loaders = ["forge"] dependencies { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 36524 zcmZ6yQ*&aJ*i+pKn$=zKxk7ICNNX(G9gnUwow3iT2Ov?s|4Q$^qH|&1~>6K_f6Q@z)!W6o~05E1}7HS1}Bv=ef%?3Rc##Sb1)XzucCDxr#(Nfxotv ze%V_W`66|_=BK{+dN$WOZ#V$@kI(=7e7*Y3BMEum`h#%BJi{7P9=hz5ij2k_KbUm( zhz-iBt4RTzAPma)PhcHhjxYjxR6q^N4p+V6h&tZxbs!p4m8noJ?|i)9ATc@)IUzb~ zw2p)KDi7toTFgE%JA2d_9aWv7{xD{EzTGPb{V6+C=+O-u@I~*@9Q;(P9sE>h-v@&g ztSnY;?gI0q;XWPTrOm!4!5|uwJYJVPNluyu5}^SCc1ns-U#GrGqZ1B#qCcJbqoMAc zF$xB#F!(F?RcUqZtueR`*#i7DQ2CF?hhYV&goK!o`U?+H{F-15he}`xQ!)+H>0!QM z`)D&7s@{0}iVkz$(t{mqBKP?~W4b@KcuDglktFy&<2_z)F8Q~73;QcP`+pO=L}4yjlzNuLzuvnVAO``skBd=rV%VWQTd0x6_%ddY*G(AJt06`GHq zJVxl`G*RiYAeT=`Cf(SUN$kUEju!>SqwEd8RWUIk$|8A& zAvW|Uo<=TWC~u}V?SNFv`Fq9OeF_VpfyXHPIIay@Pu5J6$$pg{;xE9D7CROVYV>5c zv^IYXPo_Z4)bg5h?JSUX!K`q_u{>F%FzrG>*!Db_^7*7(F@f%i34Ps`JBAH6{s=ygSr^CVO)voP`v=SO z7v;4cFM_D>iVl{&X*N7pe4_^YKV%`5J774`5!DC}g;D@50h?VA!;fU1?Hf%%`N8R1 zSg@hZ8%Dq^eYV1!g8;`6vCSJoK+V1Q6N8ImtfE3iXs!s~B>js)sLHB9w$r+6Q>Oh#Ig&awvm%OBLg!7alaf}9Cuf;M4%Ig9 zx4K}IQfPr&u?k8xWp!wI4{CP#GTs#qR0b+G{&+=vL}I{b-Pha43^%8=K3997~* z>A|oxYE%Vo4~DiOih`87u|{8!Ql5|9Y+(ZY2nRP+oLdGErjV&YeVKw>A$JyPPAL+C zA36S!dNVf z;xJ)YR;^VPE1?`h-5>{~gwY2pY8RqhrsiIBmJ}n3G@Zs!!fD6y&KWPq&i8HEm*ZAx`G} zjq2CD5U==ID^we8k?=geue4Y>_+%u3$-TzVS6QMlb4NoS%_V>;E2hQ)+1Q@v(reC5 zLeK*f%%{PNO-mtrBVl|-!WaiKAkZv-?wnOwmZ=Tv57k=4PX=C?=I4V*THRFRE8a_{ zb>5YwDf4o>>$o{XYlLN{PZ^Ff?0FJl4>A9C-q9A$$&44l122Qsc|6Fd6aTam{=JO3 zBFfFe9seUPSUeyXQc*RA>2{WoKIYVltA&@5spdIW;rzOOqoQo`CN;~UNgU{{m9^c1 zTrN|8w_7+Nws4}Z-4eS9WMpF3h<@81a)oK9njh;-TB74vR;u{vE?>6FDG7<%GVXFL zUR9l{z*eEND6pp)+hpNT$VVM^Pw*S;#NrbCmH{dhBm?%6D|k)0C@Z9H>T|kby1^)# zOPmJ8Hq`8waoEK(9}IfP_q4yr(s?ME+T%UV-ikxW!XFb^6w02t30j$n_VSwevg;{9 zx0OXK_uGBFej=gbG>G^pEv^`I8&_a@t9>Nr;#r?XNKquD&Ho|`)qK6C^-7SCdo=S& z)vUi;m5*qIePEIbL=wJ|WCBNY;zCm2F-+@N2i{I^uR9UVZm$o`I|@<&2}w)C`h)vV zW{)yGJ3?GCZNtFe53Kb#uzrC7v-{JygKZUiXDV5mR z5la_vAFOvoh#yn)B`$^ZN*Dxp5Uo~_k8G9skn2)Tb>Kw#Vgxi`bti)^(z--X9F~oR zZ6=^_x@mDT~=h_@GGVcgBtLzssB1|Xy(xc(lUYJ#_ zgwc&ajE%^cCYW7d;xAxi{#LN*1}s>{K79MZrq!tYMpRA{T!#^tgXP=J5FvkbZ@gx~ ztq-E&c$`|KX8GS2a_voZHf=y8C{6~f~`DpC- zjQfrt2OGi-WGx}Y4>vM`8<4frU*!bq*NJ*Tyn0cqk=zpDdYth-PJIfz5>pLF@qnai zzj2FEhuOa-7$JR=U!L{UWWJBA%~SW-6Nh&3;<}iQO)DvOI&VKi1L8rmICePWqoY^F z-dC8X8~1T}=C9m&yb1kZzbKd2;29_Pm*Cs=y{Z06QZDlT7Poci>1@hFa%t0<`1()UTxcQ}e`fAh6K`<5C_SG`dw$IqzwEYNKvIH3VWlhz z_#^(T53W}jeWF#WIhj^U7AdIB~3feC--5iUiiT4Qyu81 z;Xa^8#~M@p%6B`LCKWWTa7I+35BLP=EOa&Gp2pbTWw5HOIjrx;2J(KI$$HT|w8}R-8fbp9sot&LiLs7ILlyZc8 zWbss7=*Ah|X$LEt1O|T?ABkIn-0NN`I8+ipfoBZcW>(WiaASG_khBtKM{hfkm5VBS zy0Q`4*G6HRRa#9G)10Ik3$C3|nQbFzmU-dA`LjKQY8icnx?2OE40%z852{OJH=?mbvwr9 zhlx0RDo^D;p*xKx?yT(`s7wj7BHA~rHF2yxnL<1PcU7FM57;?g^ z&CyPh9W4KvZ;T8w;AuNMn|nQ-xJ~CvVT7gAPAGi7w8udw_LOp+p4eZiI`JEC@Mq9F z#dA2AM_};CnL=y0#tZALdB(P~Rz*KqGqjwec%Fy?K(PGoO0tfskWw-aGhd7$ zTi~x1G>4h5q>ek=tIoT(VBQxrq)&#`_0UHC(j*ZO%%}%C)|EzTWEpvYDqCYXLexR9 zlww1ESB+IiO}=oq)8WZj%cY_FTQcEJ`JdABa=_S;O|kLhX*|5|D>0c{12DoC?K95f ztNxm(sTU6cWWd$tv`5X(=x?yAo)IYQ3G*2+o#|EfXko6erF;M4Pc;G0)pUDY)t`H9 z76Z8V9HqbWA@!`BelAT&ErrGTz7}%M*605PEY@3{gv+`yEhr{=EVp_tU%`b54Pn4a zz8nN7`eNx=*`f1t#^7>7G07IEnbnn&`RWZ}4Cp8W_DFDs-5)GU`bw}uBmOQfKmi2@ z(cWWmvHFTUNInRH!0y_ZtuI9Eh@O3+64wy-_2DF~E@KF3abM`0gC%|kHi@&hP_#B$ zLN{Z?$V_;+h?%2zEC{2ITyWOup*w*K?~vpwB(DX1i6oY+F)??;nyHpzaPLIt6G$4; z6>iAsB+&&NN0;ObWVOL+-^ZwD?nHgY>0k>0I3iA7o)f# zN&aX$lM@r_Iu|nSdPjoF{#QD9M6>|JSNPLxX^T2!jCKjS5mwNaO+SmBfOY z;6ZdwfzhO6Vs|9u81f4e%7*mU%8K>A7QWO0;QcX7W@|NSUVl)_>7VEf#&N6E~ zn9Wv88@Suo9P+M_G2(f+JFf#Q^GV#7QQ`qH#$N1y{A*_t^`5H1=V^u?Ec|EF6W+6B z(@Q8ChIUyq;+I5CmjEa1*v%d5{WHyhcHSjQuwzQq?;^BmfV#okq3v8bp7dBdk z54B+%D3=JWd-2w$)puXxZyZH>-$O-?tbSIlGc{em9xHN!44iaCr}6uZ^FpN7IvNh8 zbp!%4xR9np`>AOEd1e2_y}xW#v@@h3wYc?WiwL6Q>fxPQA81V^J)XtGs|Z&er6w~M z!1Ph~85TMG>R&ixNUnevc(w>fgb%+X#Wds6Yl+wH29aE%;RuDeZz5dEt%#p&2VK1n zKkqgl&*_YwnO%9`0<6MVP=O3{02EcR7PvvZPbL2KMuoRsU|Y%zw38qeOL#!YFp#_~+rtNJVl>lJSh_*B0A6n3XkE5po z9RpE_h=pnmDJFX*n6wmsWJ9GLu2=L8y!_R;;Aa2Jl|)I}Qff&`Fy@iOhop8>Y2{F} zbVk3rNMi$XX(q1JrgcIhC08@d5Zc>wLUL3wYm}hzS^!5d&Mec$Sp^$DUS1lD1>KAt z|Efof3nJ4^k(WKL_t-u8ud4L(t>q#9ECj?v#W~W#2zTt>|MCh&*H8Wh1_I&^2Li&M zq9j0`(zk~P7}dB`+15b*j%VPGr$;@4MBQ5AT>-y?0Fxfr2nC1kM2D(y7qMN+p-0yo zOlND}ImY;a_K$HZCrD=P{byToyC7*@;Y$v6wL!c*DfeH#$QS6|3)pJe68d>R#{zNn zB0r*Es<6^ZWeH`M)Cdoyz`@Z&Fu_^pu8*089j{gbbd!jV@s7`eI5_X5J3|poVGlq` zDo9}G;CsjW!hgN2O9=1|GpE;RpQvrBc+&dF)L>V&>9kd6^YIL?+*WDmcQlvwnq`Lf z&N$gF>3+E*NcJojXXI^}B(B-;@ebpVY}l#EcDWles7s;Ft+KZ@m+6FWaD^oYPBXVw z3sq|aKIDh1x5Ff=tW$(LO|!e&G?Xvh^H!GfiA(emluL!LmD=EV@|u|8S7w6ibUePJ z>{sOC6L27R+b&}e?VH;KvV3a;O3G=gwG}YzrkSTV6(&=;o)EV~2OD(Eh4mu@K0G)i z3#44IZhqN6+Hb2h#3R8YwJW7LesDA9=n)75u#46_ZmSh@6Q-4oHvGxFPY8x;Q+)d@ z*-SDqhVeyPGkoD)iq;z0r*M)IhY5I>gMA@RS&EIYPq}Z{$Q4Jbfd76EVhSF-sR^TO z!=o?>V(^bx!pG$26J~Z>Tvu&Uu+0;>m+pg(fmbu(97^(OHBH4;J8WIfv-f5}VP#VS z$Y$}SHKdphDUHlbdIVW!k$L6T{LY)|H}MT=l$22kIl>|46FK9dt$?3Fjk2RA-~AX7 z1|Xe`n)%h~e-O_qLpoFXJ$%gmocq`v0%hRw1k_6nh|+3pvJDy}m)V|xjL&!Z6?%pU z+m)r2*pWjEl!etAYxdzWb0{mGc;#$>rE%)b z@Rnj78P;$lrzY!XCa0&x+8a^YF*G|Q|C}bGeczz(5m_gq08wJHIH`WqHH?A}!~_3{ zQEvMXmL<*nThl^pL58nbHgQ1n9cYmN{C8J^6AKS%?~>1DCt70Q2Vp0;E@`GF%Tzkc zSUt&LJ=wHI6@#8_%=2s=j^4VBd1-h_)3 zeozYua!|{x(qk#z;tavf28rj_5Oen-cYG%;R6I}Hz$yMXeg^)_$OUUXx1r^qrl!DG zYXkAXKBMrVM-rJwAo<5J{NW1XJhW;Nh*&`nFV-Z;Vd({KSkMxV#cn|bXJ z50GtvFE##sqGhV#lv2s6?^yeBShlhR%XaPIo)iXOue}jwZ;Zq#dgDn8H?74Y+$Z?C z2Y5mCC66>dp%sVMecUzCirWq99Ea(TDwClZxtEB~4N-2JmlH#>Z2jOcaNaw4tn?P->BBGNHxUHez7>C@TZNT5Z zHerlG0a4~06L%>tn!~$s^L5`~{ueLZ5?`$46nHvwKxM0V9VQ(k{A40xDVw{+Qt)RV zQ)T2Df)cp0nv!lUFt3D=i~k!V|7dUjpz?K2ZiynO)$d{2*YT$N^CQ{t=luZ>WcE!> zg25p}If9RTho%G@PZp;5zBwv`n+e9iO=6dx1V^|4Ty%`oE=f7O&QC^s!4MJ+lMG>^ za!mgpz*^SHT+M_zm;{H#E~SaU^Kn*y)nTAF*2@t5mF+l)bte+a+goaA*zXJ4P)H|y z{4OwbJnIPtMp4E~=64gM-Y{#o{x)+8YCg$C7Yy=;9hdyBgRFIY2_L9DL3*B@%$5#m z8P}+)glf*}UPD$C;_yntx}9VPmSSnY9`Thd09nfoR;3`kar*FRfS)`+as*t2l*USWgmaZ!qFubr1DegTGZspyYMgic{inI0dSt+rJR z((jjMrdq^?VSZ8FCO;0NW@>O_b67gDHP%W*^O?J z91NQ7ZFODMSvHj3cvT#6RJUF7x=-BJFQ^6<&mOd15Z&M!?b+3Tg!UcgldD9tOAt5K z3X>MlE-a=sj;K&}sSng48jQ7sp|&u3;@e>V4Cuf(!s@9lZ0Cg^DKWmki%>$<85tOG zU;e{%zHU~KREBUg?FbcseK{lmK-`*S1p9j_4hF=F$y)NB;HsHwuf_A0Zhy395eU7o8^A zi2t7Ch|KVprUn03N0T2XshT!g$HTErcQBBG=TWaHkYtaI2CJY7ajI%yr&9 zVC^zJ3WW03bjwGNx{l}#+D&Ml_uI4PQhV}qZPXOP7ffSv(O;hX{Ff1|HoA~v)V!4y{CdALyi2YPjrRVmRYilRv z5PSkj*Z_8Fa*sCqGN?7YTnkr9=i9X`qcw7nqz#{bj?B7NiV9fWF+%~Rb1X@MuS^Mw zC)d#K{(-9!?xStM2K5x%x~ogWxgIK>s5r_RT1jU_lxdTtIEFWvi4eJSAiGec&HXQ( z5t7!J1b#SL|8s4)u147PWQUq_e33!5Z#f$Ja&az)(Htl`Z0@Ez)0d74BzNHHfH|<-8q*ZMf?%eJzoGS!0S6Y zSU7y^1+;V$Je9F027>1eN#_tz+2t}Y^N zYfi9}J!N^SU1CYoNBDbD39@84xLroY@0f%%c^(5CE+}!b5-Mt3oXe2nBdyicgGIL+rzTTKv`}Pp%fG1f^s?sgNH8=Q}s4Z>0ZCZ8ZYF z4og8nK%OA~zZMJX01uFtrmwhcgg*XbiMP9kfkPYFASbp7*Bk^5ZBzV)dL)JhPwDkM zkgdHeKw)orJcj4^)a^wQC2|->G=OBzuc-SskRrrf+H-E%HQ==Ex}d*504#GbIUXIB zcZs@Oo0i61MG}&0bu%@2N?MMJMRXyTVb8@3wF5eY3G6-1NdT~{{~YFs8f&SNebdaq zKmP>XqCQ@iaamuvY2m%xJ~gdSLSj~DBhB`NCj_c}NbSjB{r(E`_-+6a#vx*|S>-GU zHsw^dxxu`e)q1HbH==rLFap?cebKumnTo=iJQ zJD1#=o>0%Y@&jP?^)Q5bTV!pzrf=FoHq2c_59pq@my{D4AW8VU*7LVp;LF-qESV;L zClRfyQ6CcD$sd84K@e@p_ALH%j(Pz@Em@QFyY`AG&(|!(cG8!oV#ejr`y(LolX}Iu zL$)G)8^y4sUAYCWprzVR?`#OJ%NU)9U^B!OGSj>Ly;<)<(nNh`?z*GvJ|ZBKfZ`0 z=q_yGHWPp~R+J+{{@APVwmp8`=%N!L7AT^l^oaM|JrCFu7J#@frf=z(vGq2>sQ^@u zk=^d#gDf}ME!~9PaLfw44~rsG!)T7h8~dY^VcZQa+ueWPGG$mWXB|H2$$0BT(QAIu|=DJXPQDNes3Q>-|Mh=Ih zy{WR)QmhL5rQbBYPBa+e7)8Vo;_aKrg`}izmN>#ATuSDu!QUFA zsgM|Kv@W(S}Ag^6e8)9pQc@JLj_2ZIkO=8)#ARm#mU=NncWbmd-SbO;ad=y|k`shy3b z*8o0@EJo3b$#zSgmnlT7KAp)U!qI2M`hiC@Gp0)pNGHYMe1$MBNE}Hd{Sv^`wI7>MzNwgVv1ZzL zttmyv!=TKuPH$b>r7$lgP5?vho;#Ks4+zLzaz-1b{p-Fn6dWy1Agg7O2{&VQ5@s3A zAqzC9QokRD59!@ex#k>xy61kq6h~O$lb;lB;Q|chv&wzR+N zgXdIo%?q1Y$TzsdCo+n$^NODN7yd}cAv+rkG|u-(wTp?zUSUxaA-W3dwqikdrokwz) z68)Gn$Nwc1zB$F9`#(af|C3v;|2$bo7fU8f7h^NK6h&@xi2m`)g4mW$?l@5JEc*VV z6d67@Fl2w6mO;MYUl2U>R996gQUX$d>$D>)TNGq*arz}f21yh^uvIM!3u$H{_CH5! zrjt9L^&J8UqEV_lLn&}nc|Q=MDei6t=vL_>X-i8B%f5FDi)|qQ;2V-T!qOi*uqq{U zElET6#2cb>Z_6p_vw44&mN!;T&~ubi&p`XGepCNAfa0-T zC84V@VN^R6%z({m=$%iXrbiggxvMiBpww~ktD&=9-JPK3kPCOGCJNQj8+l9k#!QeS zv3h$Ej>@j<-zBW0Qr`5tNQVRfYK_$3>nWUzf&c*tCpl@aYwa%b;JNeTX10OevcxY7 zqnLgKU-X9G8~&?Dr)`*7GryqhN#;9v`D_c=_xBcD{j-cLop~pSnM?&7HggX6gb++ftBq$idM1|>5t+68sWf{ixREbMkZesmpjJsAFPQ#2+8Uek z$BPbu3cQuNDQq+^M}&ZuSHjxUgxOjF<^%4 z*8lc$CgA<$n=DYg_DsrHB7zYM0Ro|gS8ZnUq$u3GQ+{owv9RdB$wG%d-;R+I>?i?b z+r_mu{IL6WTYftdz?0#pbHkmQP31LvXcMK6;mAP+;q^L@q}v~TD}Ni>f7@QYcbM!T zX5kShHv3X1U=>B!2*si9=AEJCBt~GIH7DL4^+gHj+q}tk0F_?Q-=z{JY%77nkw>$F zG}6ROaL_)3t$jX=ZtFG{Q=LZfNjNb2LK=m9l|7iaB++N|S$vAr1 z_gf3JpIB|?dptfQ{sOZGlhyj~D;T#hjaNh0X5(o&7)87^t@@Hteh{0DOM{tCu$l#& z&NhA&V4VR}nzZP{7i(5bGB17<7bu+RJ1}k}=ffSg%=+213Oy@Aj1vv2U>U>8tRhKM z=*e<21)u6SSb{CC&We%#6X@duqLWGJ>O)Ls`uM98``34g11;D}*7>c3+^c|Os&;t}`(BWMD zfbyr~$j%{6%DZ`kR-}s~p?0#&-5a}b?6tDqwtqY%ep0ypSRIB54G@|0J5E#LkxQk# z_&xE=d(U}q?*Rh7L7f8AM5{qdGpC<&t~9YI!%j2G@nUPoLPSiWHjCVP{JAe?cBjQ zTqI=R{nv5c@|R)8Oi3cTL{&6%XdTgDP4CNYT}q2f5|Xf_hID#;83kd+v0RRyNKYn} zyPahwd=4ncDORLvatBc~KzT+jiiD{tzd3d*T(f7ayS;J&I1X!xaL2~POrw2ST=Pr5 zu*c}fb@)0P6jv))kNl38C7gmnWGmlL@{PWOVYt9se*cS0w#@W=N+dY#V08ci=Zmg9 z+${f#Qfs5)hOPxC;q{(J{Kx4HF)2QMzlVtXz0-O&h2$VxtT;ROvZ13nN{IG>Asv{% zHuDqgZ{R2(X*hkO+!HYHHWvRYrvN9fl-1?x6b)oseZY)@dQ6O>9Y#8*23~%bzN~Nf zpHGMdS-G|%F^v3Gnlsc$s4Wl=ZEu+J6y~*Ih2tpmHfO56JXKjldm$BxDvW6ZH>JrU zdRo}=^466lAq6!qY_@nQ}5ETUEoF;`>7b8W910_Z17!r`D?QNvC z+WF%@IkPi43n4;0Ks`M{x*0-^GK7oCAp?pFK1`~RoMSe@jAlV8vQruCUNyQ_7wk?` zSKe*|!4ar@VSA}!ThlIB*Qa5){pu&HS!a)-{lWL2@o1486ZK_!!}FSZ>vyUPIOX#+ z5d3~J24Op?!f!oNytub~egnkB`}h?eh!QyX6&^LbNuA#9vH#N_7IL|#6kIDhLL=be zEg3Cwmw{A(cm{&T zPg>XIWX24$Mj_#^k2I91C@h;b$8WNVr&MLjEwgAUtSeJ2W0)6Fit}PF!K&1j=*+6g zL{XOUrqhNyPLemIF4C&hThR8fie9^fYg$yl$m!1|YgcPlO>TB-(X{lkN~X}R=GA!Q zou<9ZJV6*}SN_4WRsqzRGI&p$;9DxDFTlyPw6Q9rlo@E3tMN&Wo4eFs{1=RCUij$V z`8)kmh0fhTTiEyvRl90B%q2(Moh$jg7{NeQiy> ze!H{zbG7<3BcK}XE&V_1kFfGA7D^ODxn*@nqlp!{LhYb47zIUlV^m+7kZh^a7L1^D zvI?m^9PECMnnN$0hi^Ur0b-~QgEORanrv|`dd;ek$4rAgEEof3HyvuYoZ)H*;+TgO z8CJY~4YDI^7RD7O)m&2h2K`-4e-I$1zcZ*K>Cd7~sSxEXc{d7-;f z5Ykr56Nkie%=z4_LIA}H>c81e$%ey=2hjqzTxoO0MDe!J&PE@EmX49jQJJg?HNw;B zHRHr)3do7CGDa3lPAZ4LAnpT)spnk8(ZiFz$|F$1m*A@!qCPug>Isp|MPI24i>jp~ z((9EQ9W#Rz)0AYT&ZWOWKBNtdNYYm2QytK$o-_|W5j7Abr&73(MG+Ar4K!Ij=nKu# z;SNkveY?Oc!I|Vta2{rb@c50#p_byn|_tu>Pv}6YDydl|}X#4oZW2 zvq)Y@8iG5@6c3?uu4vdLSBq23P&qUSvtGcu_qgH*?KfaT)@QueLx6apA97FI7sXP=foe zmrEu7;%Z=yTTGUsHsjR(wU54xNPI$hLFZUOwh=uhZ&rLammOQ?w*)}?Ah#%&K~OZc zl#Owj1OCEeXt!ALV7LgJ=MVbCo}<%92WX$wCS~Ins}%5+sb*C{WoOT5*2%sgjya;~ z|A#;k?j~J9qB)Tku1BGX=MrZ}<%Z4}i$OvCHv_3vtH_NZoK zjJljjt(~Yh%aI@gFnM*e*@_*N190p^@w5?SjRMb66N_^3EZ#Yoh<8FM>Yx$+mTbp$ zjQQS7(rs2j^54CJXdkH|$1&$wPOGDvm^@1o1pl9~!5&B+I=U-f_M-M&r3zfp2%TH%Ib3lz-^t)+Z9E+>W1Bt1`B}rZ$hZ3{0n|nZKM9O z$?_1+y}fB2$zEzE$zC#46=0E_4x7-VXY5}<+d!g2+Kg$gvU-Xm-A9DBZz+bZ*zDTx z$Wfb93))oLQf;wKi5JBJ%$yq}m42lacy`bC9PjFg*}pCnqn@dv{k9WiwCC07;6n#e zJ499v3YGQ^WyYY=x*s`q*;@R_ai1NKNA}<6=F8IvJArr{-YbdY#{l1K{(4l$7^7We zo~>}l=+L8IJ`BhgR&b$J3hW!ljy5F`+4NA06g$&4oC-`oGb@e5aw-1dSDL}GOnUuy z)z1W)8W9t(7w%OCn_~#0;^F)xic6It5)3h);vuLAKFS4b)G;Z$n-R&{b6h@yGxGo> zT-cq0W7~n+qN10;1OS+*c>H$(GoKq4hGG% zL&XJG$PDQ6K^BD#s_MsnlGPE+$W^B`&a+Z+4;`*nyKil99^E(wW?t>#V_xYWHLl2} zIV`uiR-__g+<&m#Z*4E|wjKY1R2mCm%k2ayMSDw`Rz_KA!3P$uIbB`dl`3&A zmT@gMT@ZpAxBys8zRtgoH+ebSaVA)maP?G1=G4x^Nw3mV0?qehWL35vMI~p$y0hGL z6@vHf-50P~uoe6yY&*D)Ekmi06LF!Jqz9#7kMvWexYMbAn{}`{3ZBsd6$5jBCujDp z<0N?b*1%T<-_Nxh`lKtla|FFqs7RZMtjHAwZ0Ck&s{x`#^S?36BNQN1JU^0f&TRoC z$}c)LW7)-n$CmAg&n(96AycC4!4_*D(~HvXyLW>HORuI0;ny$f9h{!Ud0=X0x%{l6NH$ z?lttWn}DQL521;-r~Kf$N_YPo)7H>3gI@Ivt}GnR=8W~Nn7_PE_3{sRNn`R~bs`g1 zoTh`7o4H*TRp7VBp=%>&t&Cd*Ny~@;{C)P;62d^dipuJYUV3-Dh<#a&AIxtrmX42( zYEH-8F3|^nY-=yw(?^d!hTojNxr~A!n$Ao+2mq*kZ&>Zm+BDC*sul=~!LUtWiokIB zxc(dNwyk&5o;>WRt)Q-Wj;fvuvJO&DLPe%mt@t!Oq^VsoIN0iTh%fh#`-{Ha?a8gf zj^yA3`=_NEONO0Z?}YVP*dL{T}v|A&cE7$_0G=g;1s*WDQuRcq>cJ?z=8b5&i<)=3ELSW%Kff zs=my9Q%8?aMxZeDq=RBHg*&HnIeQ_}X@oh=f#?C^HSg?1dwLn#wu(o^uANrRZD;H; zYbOec$#wJB(u?w22{gV+zb~pv|Ag!q$N@^|6n+FV5-X=lR$jajjeRh$1tjht$URz1 zhw)(ksAr2;QBXH9T#A$6V4PsR7K)){JQb?79o6&*IwDPZknNqySIa6pwcs)~xN81I zKc-GmzZ$i(8RaU==$Dx{tD@4nph-V*=W{Ln97*VEN^F+u0!F<%$l=K`ikIp#<^Yt} z{rx1gk>;rVccPIo6hD=xPQ$PxVwl6Cl;YI6iLf3!aevhsyXXZovK#TOv0|*T+^ii5 z+YO`u(SO3@ybv-DG)w)E;@+ULoj_+<;mc#iW8{9Y!99vE`HdAK=Utac&Eq1uy!TLgOS-C1E90Am)B{Tiw z$>$Er{s{snLEaO5@u&zqxE@v;p6D&?u@40t{#VNA&7SZael};kGEwnHgD4V5RNM@g z(EL~B=A8&?pPPW-fTja0Oi6SVtI_(3ME!qWLg-uK2afWhBn(C2PAmUyu^2h?Y402i z9P03g5$1#etGdUUo?#skjQ|$*()ybRGMXM`-2?jjThnTcPV==7sg$k{GxYdF+S*zz z%dtBo(R9!7SW6Utq|wFpsKMSAH-x{WB|Cz62A8!p8!kHz1tM=9I=M&xqQG zz17xBW7t?Q?C%@4YC`p*za(>hOrK&ELyDQu{5ACOg9noZS1SGh{-FcLy_W;nf$N`N zGYxdIzy7mL3K@Kw65DmvPH0@&;T{y&jP^AsaYENi}q|A z3}l}5V?z_VvpHf%CkpN@IK`czOuLPY=yBUf8Q3b9$X|kEiYROV$`T8T7ZjFPvKhbK zDYxzz99JRNzsx0f1Y>IrIQq9o+W(TsB(ZtN@4*)DMGr3?4~Jt|37IBI|7oQknQI3X zAWs`45xiCHga9;8+W{|!Yy>tic?%SNq=3EX@z2Mk!P0dKG0NCHNz0*F-a z`7K?6d*D4ri*=>wyQyQt{_t=t95*gB1|tdTg45fR{KmKD|3ZuM$QlkX{-tUkq@3Qd z-6X|jEyZa@tuxB}qrdlJdc0{8``%3M$xl8$9pUzkFa$Ww{Jocp9>;5~oNC8o`3GK& zy7_X8YoQDCO1TU_a%#Q+rC?Rr`r)W8CdpEe=>uMYDx6^46V_1DthgX`6CnF*E+%bY z=GYih(DizXEVFDuQRPQY&dc2p;Pwo7L{I2r3;QV8IEPg1McP{PchEUDf} zbtSAoBMPt?&Q@{fG_3a7gzHl58O7e(h_F6^rKgU=a&(^WpgH3U%`tpj3CMVRA-uol z(hA)(VF{4@`k@PREUQJ_8w6CcMW4Pm06{fw^*>aMH%#ik6lD{{j~nT}Vw=wZ(;Ct& zi1nt}RmOGrVHP++5;Z@eE*lkdw~?>AJL_Yg!~p*adS_s1`_oT1B26S zt&1-4twO45pMl<5B9T;SLH9Q?E>dBXcy@5k-{YQ5K!A`=YMYMlLOYc(+LdC<@@UIZ zxq%vI<;6P)=W4nRb7nxQ9KGzXsOjWs_3V-2*V+r}?dAZA7{7f*>^PxEw|6+WS0wAs zen2zj2cFKIr`~Ai`YU|OR4%DQw8uM=|g2B{;1Ho`mx@??e)rX!p$MSlA70pKVcvZ@|fYLpEV~s7G z>#?88yv{ekJpeJL<-?FY7wf10XpS{B4}jy{uc)7esm&J1)ZYt5LI_{)0BkN8Nc}ep zg%SYD0Cub3?KXLY*-dYntrghE|}%?RY5i3yVcPFlheiJUMLIr=Xp=U-^siywr8MF^JAEwl2uQ$VIfuDFPisd}4W2ZxY$C`2`tBTA~ zG2P62@*~(9gYmO6#Ya<1TG#3rQd0BwVyNP@Ayt7B(h%z<@N>Iz;|2VkT8T3`anW@3 z03^F>TCLS9Y*sY)#=BX5!LYD9Z;z4QSOL2^Zw~0e;OutRfp)Xu83Yz~srLh8rR}fp z=#yHH{&=!mHgDg!b;9K@Ux99VmQ*K2Xn%gV6YWHHw(<_uA&($p}$2U2TIs7y+ zM7X5Yk#^wpDE4kQZmN3&VC{!nno7wD2`bEeAwS;W6>$oUt#~E57Imre?b54{c$`tHdB6GMC`IZWLL(%j20Bh zW@}9_@4EsYT$u1Q3ZPWkvYxUX{6AcsV{;{1w60^@wv!dJW7}rOw!LE8wrwXJr(>&Q z+xFe(e7mP=RLy@dYSfEoS{pC8KXH4kGf zd``z`=z(*mSdLiXj&Y{>&akI{IMzo@tD>a^<(r*Ssf6Nz;ZsaLra9mcD`MN8$2`!w zj#+BZCrV}b_c=qEqt7{oF$>wI5*0B0kP{DNQ5_-V9dZ<9u;vm!(L2I_#p*nprX%tU z!{;Gb7IuVBg7pdB2!{X!ZgHqp5+?drImJ(UE6~P2|C?+`E9th5QSv!}?=L}=tvcFMQuyE`=pek1zbRxBAFdgqqB#0~EkA_CpTe0`e$i(eyMD!C!D0SjSaixQMIl zQ>-Dj?K($9qMGwhRqIt28n$`*FH_6v*JjZRnIMxz-qVe_KzSGY5Ph0$(^e$r-hLD4T4m@eV#69bG7_fQ>o`!yu97p=$)>fb; z&!>)wS*Fj!ag#iKWRWiC735;`@XxXFT)nniSe~^1r0v?bQ6_Fokmx~(-O5D{7$d>R z#Us$PxL8^}t1rpnJ@#E}+O?`@a4wB;n{#!lX6WlOwo}C3TgP%?N=BT*FrxR=JR(g$ zJn3EhTI~xj_mVxhFImqt22JE`CI;B~Pb~*cFE>{uL*2mnfeKb_aYO6sDC{Khp%ba`v>+M4WqY2KK4@w{=P~Tzx42!1yHniJT#~*CHF5|TVC_n_ z&;r3b9d!f0;?+iQ8rT1N>MM-D(HQrU-WWU9=w|>nbeG#luD0;ayPj`4=&7Ik$Z{Z3~ z!oob~d$cMHx9;vjAfJ{XC6R@pzkLW4q1ak{?IimWUVBKithq`vKQD14&60gGKCCale{X}Ft0By269l*P6r zuTm0E33lN!&zezRh=5l@mQP_RAR5sr^}&4j;(eFAj2@K*7>|(4IdGb4yB%g88|TKZ z^M@nOtS|f?{!z}s#}S=w{R0`LbVP{k5xhlw?;F>N1tIByWsnp`Bg)hb4sZR>Y12=3 z!#Anh?EEZFm==f$1I@Zw1Y6-%6aE;!l&t#!4vB-%4AfB{X;!sT(jBKx*-5qZn|89Z zK%Is6JLf#w>eauBET9VUE&>aD*^+~!ilaiM?p&mM&kqY3D1*5QUGBbUOI)=eY1dMv zJ=ybPA_VaWPE1+MDhiYq4$DfAeVIv!IP-*#v53?V-c^a) zG6p$+O#_1{V`nNcS`{^%iBn8Oi4fO$#Q7x-$tp2dRs-etYmui-mt@P{hh?ldJJP!? z`!i88d>h`9rIRd6=^pZVuo5}3zUbAX>~uzA4C%servKlplCW0(Ta+B&Eey1CQ5DDV zf2Mk*YRAVjE>){hi_9poOCsx=BU4gQV)kovP|^v!npW_>^LFUzYHx;MKo!BEj7Xy9Xg-A6>kWs*$)aMAWh^_0Fnx;eR|2;L0ZjLl*+F1Moh4?D&8h6H6jJQ+OxgwJV51#)zSmqvRnQ5 zz~62JXPCCiwK9W;yo9-%7Xka%OtQeVDK5SGr51}$q@i)OE>BHgfOFiV%SZ5E(VC*q zYujoHFnnF^qs^WhZG}uBRIs4{4xGP&Tbtr=RJ?=4?;IaVA9Yzp!}H z9QDT#L{7Y?)r=m^ucWOjUuJh*FSmqL?!<1x{iOcP?l7BCorp91#(gUNGIQf@1)d1lXx(RAI zhm*TFNYgXZn_A}FPfh;WMHE%oCs8d+1emobQCt@YTjxcWoK81LeXY~+9)^+UOmeCk z)#LMg9G1`jWr;WZrrR$Gwve9&X+lKpB~*OkxAEnRpO&^BwsOm&TDeQBlvTv^nuju5 zyB8jH2{_Xtz=1n}8hD4nhhZvyxynbGz%2iKM-8|$N`wX8O-Toi=&@x087+joKHd4@ zsx+@?mPB(R?mMWCIeejm^dhs63ARzdm}jsA(O)QqT|m}QRWm-(Hzh#M1)wVV%1iJL zg(a=;b~-ZkGDk#mk1~G*z!7zGrRGL-8}=VILi|%;0knSAjJX1jZXYa@^cU6K|NAIP zkrpm_?r8?!`$D^>c>@hwX{b1l4f&cY;wwU&Q2vPM9oGB`Uj2&haf>bY84LFfn>4P} zUwt~VVTwui2oj$uGt#`OH>|MYjm8`R#n z{C%^u?$@fW&NV}iCuMF`&DU3gT0TNA(vM@&mV$M7yWD^p3 zN996Z8he29k4NFCg+9PbnZ$<&>5-W0fbtK7!ePTkfP37tvtUFQiW$|1%XoEZO`#0Q z2^XjxY40!DruxCn-p%m|j1RfInIaROco}Cf&3zhkkBHj&Rt=WZ_VkNJdliOb-H{>p z4n>c+XW~q#1M6<*boFS%=vdUE3ndU*iM+EFUvAM1=)%}A49e~^iF9Tr^(nqF(J^n~ z49*I<-WXCZ`1EG0hYOd%nsoM{LT8_q$a&QSBz;#S3YCwj?)0mjn_saa@O3c^sMqwF z!ZcWHQHCT~S|SVe5eVTt=z64&T=nI)wG<+4e2@}Gp9#uWEM+p-{L1PUC zM9N-bN73qWRRpT*YCLuK_D+uRgFcwsV}^odrD$A zI~cJDK#5qb8UPL(A_=P(=)Z0U`Aq`WLGuPhE^-isi?g-0`OZ?4kK^MyAsY+mxqt5G z-B14#h=^(sGv*CF8}cd}Xwl*_z1KEt!uP`_(wPBT8=FmK<+VOOk}fZ4Gj*{W-MSmu zygps+?d@%?tx#Fn|0(KF86C^QEgcz^1&!sUz|u||p8_`(gR(h#GELI8FrjSjfNCc zYJ9BHx9555<@$3ttNMYtIMa?NQe?V&_luijx2?!gBJ8tg}l4R@z5x73q4 zfZVtX0lZOzVV%@yTg!w5oMcYuMfGrD!RFwqChHhY`G22|vNLn!6a7VRi4gD!@Ae2K zT6A|%SwkYp{k$!ki4db&5nZ!Hg{8dj)h57Z<$r$9=s?;uzmx54DcKt)m0_ow(XjO@ z{}vbrW9)Fk2;8-9>tkzX!IEOW7lMb$gf~wwZgu2{whBB$YvW7BQSPQZQDy~)5Wh@8*P!VrB-YNi~zFb27ia7UtoAd`4C|JS~iU%&Qw1UMjN zC(CRqwMFj@{DT5Q%Z!g{RpCq?CpzVQqdKjxHQ1xa=u_EKr1ec5)TH;7hvWIn?hs@&K~48_$RK3+ zdu{2({Eh&7HD%B{)|+9CYaV^V1<$`JDFoj0UB!kwzCp*vlO(9kJe-Iv4aj7J^fJER zTEQS`H@RGhfs9w?M)S`;LliZ`Qvu3g2?r)nr?wT^cRJy(wBCr0MDqtRFHm$E%-!6g zMLRw$2+YPDN~0`{Vm}H&to@Nr&fF{~L0>m}Ghn>Vj81s`EIQnE@l@Jse`#}N0!!DL zkzs?x4I;fLH-LS+=E9Vl88}Td=@l&5&xyb1KaYf^1>c=cC+$#bcr7(`-gQsjD7Tws zxszZy^8Sv(2%nbY|4UVV<}>Y_l1lTjrKy;Y5${ej*V%OT0+D~Ec3-9;X zs?8%af6+X@s}jQO+NREG?W&1rhl(x1!Yfpt@?JLkH~UV_9l*DG6qvuakx_O+bAq=s z({A;t{jPMtJAA3|O@KE~J3M!)@g5`5KHrMBrNC_Vh4B|&pimlm=+i4!K-R<3m20bD zzS$Ki+QfH%hnUo)1S~{GWomug`!{WD(v+ zuvqIy(f7nrv3AgZ=8rf6?es-84@=OK6qbY0wJ-G zL(2?kPhb zZ{|(D3#69jUn8s@S7FY>F%&HMCc-%c24`6k2TkwB}T>7a66k$Rk>2x3dp&D-EP;6vCr%iE>GKFx;(izH3Le$SQsp0A%5 zm-Se9<@jb?{00JSx_;^KuDtmei!?oLZDoJ59(**b_6Y`2ZP$kvK4#2^Lk;B5oCirY zRlPg?{iEPr_J_ES2=O`sJ_qloEFsXBDQ+Z4sZubH45vc)72Y|~@)oVTzXL$U?w#*n zclYx8f%j*|f#eOo&_;}Am3`vA@XpB}-9L>H4kiQkO%r&~{%W@YWSeD_%B5+F67d*j z?Utu*W~cd#8x`Co76I~a0hZ}GzEOX;;hDT#z2m$G4zcHYIefxJIe3HizO!1pDziPE z*|lfM&rHZW`dhSY#7rpieqo!w>m&7!e)!(++5So5!vv0pL0Wxlkw z;_!rN(U5yR9=>CNO_J%S#)QEl@X^i< z$-v~-byW{BRXav4GT1VHt3jrFK9-@DZunt&iHnR->YIe?0!h%8oHlN&$VawG{+?<< zoY3lysffn`42Anr(od87p_%kBvtEl~1Jq51oU>0Cs?E%&n0t{t#)ExsgW$H{YuO*? z(`4X_deFhMU*%36&*Y&?o78sAOZl$&98gl@b9zEa>Ul`Eht&~4&@b1AzPD7{!Ati$ zwXVr7)>u0Sv&p#{4{|Qcx56H> zF?_X1-NV9Zi{jD!EQY!op(nLS=XU(DmJtXhf;wDL&4dvd`O>zAaBzN(?%law3sn1p z_#_Z!M+Gw0@Qk>REY&5+l&ECBG20Y4{6#618u0a_FxP38r-^@-!(PFvJl*UdjdBDn z11S4BYW3AgDE#Gc`TX_x<1XiTCER)+z?$_X z7n&6Ev$hKOggBsrg&CpBUpqPE1~%I*WKQW)@&B^`ZW5)SBHYAX27S#;6vo)8c5BcH z!iREPvmG%-xk%IahqAZVSke7KH%Rm!>V_tpH`>bSS4Y|tT-m!g!=Ni9VbK>Rx}WE8 z1ss1w(!|#dy?b|&w)Q0+&&lInD4O`WjJ{*tN3GHw8{8SD?rdB!ZRgxa1F<=81)1({ z2JvQ>m?i8VI<$}9MmtE)MyKN(H%%Ec)=3jmP)K#QS&7qL0o;%>!jhlVO3 z&jsJtdo5DnGgt&A^6{Y8a8ne9+lmC2B)oq7mWC?KoKbd`r)Uj|vMQx$o%)qPrk?b_ zW1Nh}Mw*Y_&LN|blw(R7 zFqMcuihIjBcSQDyLEoxd@%w52JEp%6+H?S#HPt_I1T@F@jW@935OmoG zE^SH~5V5=!n&E+yvOEFgM<8j%Fift}(j53d3V%1r9NT`}I%2p0$%QVx!#G2{NyO0x+|GF&XFcta601En$nx7I1 zQqAX}hG!*oND@sdrvXZQ=WU5MOE7QtKbgX45%?B?waqj`sNjDd- zUTH|{!iKvo{j~L-X=^?Us9D+2O!SG>$w%in^7zGGy+BMpnFr)#L4Zc0>7HJeEGS(u z(RiPD!>0L<(^-m_3%r!)MMdobk+T+6rOX^H>@PRjP^E3Fvx;U$0pz%a=(m-W6LZ}U zX2QnW7lPQm!-pgsRh$Rxq+tS|LfE_T9hZ*a3%%5EE8!rlmCi9s zC%T&Q39zQ(krY&I&{y3pYWA%5nHIL{j;9dmcaU{*@}l1i1fbF-HD&(6I+spEHr?l5 z6XUR+=CRY)I%wupKQI4-`6@A*Z2p1C5}Q+EOD4Yb@LB`10Ghl=YqM}RO`lWgijdXcY?-_PlpTe z5*pPp$8~kOI0r-}EJwDCeZBX!`~Vja_Xl`%VEZe$l0N#Q`pQFV5Kk9_nkJD}iNtEl z0C^Kr-ATPgZ(oeg!%ExcVXg|I_d=BoM=ZHAT`5PDZJr04Ur3RdN~zCSJui+P?cOm? zZ_4uvSbO6q9^3ohA?X&NT{--uRs)j1^n_QP0Q$3&rxFIzTz7O`nX?jRXhg1DeB#5) z(GfV1DF?0?JQ|Qk@MriD8NQBaWeKv2Q%Q{4hBkh-u_vne>zF%J~@`u;J25*=?$ zdhu8F1#*^Vel)g8@`n!4w}b9O5MZ9mGr6l(IoOWq9%{A1u0kLk75}< z&VTouJCQe<1WILdAsGA2MManwFz@+UBd8q0t~Z?>7i9wlMSc4rIngyRBL7^uYc7hA zBHUFVhg$Uoyx@ss=>vt^E5y7o;$7KRvv{t|CpAnB&qk`W5$c_mfC9N(b79uh8{1b@ z`%f{Lmb-*Z{$${zz}Myib@*kI7yMEizc6;Irq>h1)$KEnLBTf!E}{B15VVoV)p+aT z76}rh#zlkeIT-ez_6b@mR`!5_WT}T{kciOQ8yX_<@OT6_PmxrmJyWnWqxT>-Aho3b*pIl1(z(06k|pbILiK8h1e<%dkjsXB~8Vf{m4 z;ClZn{kzSkl4$w-j^Qx`(3BIce`g>_bgmJy8*cgJ=8Ty6LZs*o(tJ?TUi$1Et5WlE zPm1hE>IZ@-G>o3sf#8sEAr@8W4+aYgQTPkDDhUV$hNQpvpEmwC*qRWQY}4A92_0DZ zmPs>)&dZ8l5)X-zicS159QB4{Zwz=3=NVHv+vF*NB9 z1yz|msvE4PVio9vx4?D z{ZQdbB!aR@k>T3)149tjYac!k9CIDV$2WZDZLI0o-b>X4G9HSuePIX}6fDMrw_{k4w^WTJKctikHje-7u zn7gF^^f9vkrII_IBPZA9zyVn%O~I^a3h^!RY1?E;v_(46klc%M2I=TV%+aGbx1n_|{GwNit$QzspH)ZRKc+9Ky0a-Mj~~W; z9=1QW{@mQWZ0CL4h$4e)g#u@U;Tecj_=E}U`TnGM7>o{0dU4MT*|8>hhQ`?UB!zFB>>~9<{V@O>aC9U~Une3IWIR5R z_5_;sDvxI0ns0l_QeF?}X5QNM`1(*9drDI7dr~8llWtCKyo`HdZv%?+Yo+%2`Fb=5 zKSVr%FvKu>!KA)Y5&sPD zuJbS|=5`k){vruC`iTofuv9tp)kTGFd-$o@dfQ&XgVVImF;1#Xx#`I3vul#F$qWYb z%LOU(SbQDVH4RnT>9}Wa7hO`?yKvd%M<7B)^-9gvI0d9NpIMkS zRT00KAyowFDZ=SlDLo`s`r?978R0T>hJCU9`HXoWFBuyu7Ifhz-OU9hFUQuonGfWr zokmWPK)otgYn@!v?`Dtcubl8K1%*k2j$mrp>~SkW z=^_So$+T1|P2fC#QyVCNlVUHq?y@pBngYPoosbeTuE5F>N&Y)$kL=WDpkyH~cO!1J zMU8RHS*10ceS^H7l>?Ax-ySAEq;fFak>8M}foyYCs-;Rmzg$T;k1$Bi^ZQD=+=cv~ zbPGjC8@KD2%G>R7`kXxj(wO;v?YYy^+8h$cQIphb3NS8{p_AkYO+3 z@r-QEvcg|3shClf+$g=3b_M|nrQ|lu+E$yX&=MQ;_k3cF{6!0wx6Dg;;-oBc9EN>k zD#NH0R)&||qCZOZwIv9erOFWBUabK&8^iW^&#Oat0LxZ=F3cTrBau=&v4cK^>5k@gj#zWtyXj%YL_X!h>bYx@JNuVPpBwJE56w;HXl zZ1;k@d>8+2?a%T+rZv`KSlm|ckXJH62?JJAR z7ldHyEgPiZ7!yX$7!&3vTs-Y7hkx;Id(DrB6cEMyABU(*M((X7YWt-L#i`S$!5}fl zC#oXNEBbfMF4HSLYC0$tY1Q-u&Ykz7^Eumbt#?%(T*Y>yC7L`~p}oAkt~tH*7e4Q& z$EWB(at2C8c9em~sOw`1CvA#}IOF9Z2~%FBmb4G8IYeC!Dm&P!zH#Jna-NO;Qd{(7 zATVoYNg}*h`Jn02H$^WRu1L+psWjwYMr~!BZZ{afjMr|Rh^JQYjck*m8ZE0?)~vqw zSAykMDOKwNT}~IGR-3e435!bEmBPlvKn{**+>sru9y;ynv+RdQX`cNo_%uiQyM~gY zkNXTcZ~J38fc(I+Tg@T>ta#K|CyTKv73iu?Y3>J!+07C?lcTyZWvw|?(w33jJN{5- zynWxvFsqw231<32Aj^xVe zS{qBm^{P2re~|C%4rPHF|F>PqE#D4Gqy(PQqW(YSb36aV+ngr7;Z^rsa`1CFOVGl|5mBdB0*q*?%XBXPjPm^A~cwh}`D~ z?6gO&d^<6m>+l5?;>v6BSph|=1uthK(GEITC3RddQQ6I%I8e=$ZwLj#N5a1>8ivCg zc9PxY9k%zK80_2>^XcdCV4!Dqbplas_v^F62wKZCbfyb7Wbkyg+t5R?jVp_p=87)rAsVG;p?@}0DhfjF2KY=ur_sDRN5Z@ zBoczZ8+*l`4CNsWF7`5M9V-hSSKJz^0xO62%BvUldB37t{XX4Ba8~4nB7(_iRUV7C zZ;UVO848`?$wGFpL>#F1+QXS!7Eecu#h!577tuSg z6^-(>A_N+VK1MVMP=Fhb(cBTDWU#U9m4gz0I*3`Ekeu#d_-kiPg!qv3`67kym=Gc@ z4AmeEJ6{D5GT9l)0Nt?D)UZ!J6$_sfK%VCX&4dy{lH3oNgOFQ2La|}=(_+;?BPZhJ zbklwJ?_h@!#;1t8lY{2DbWMd63lRBe~A zUI018Hx{L;2 zP!4pmu_b}ynHxga0}8?m18nj=$kLnve9s^Ie^-H@{|7@7h%5N$^Is(t_dm!303><- zFJ^N8IbO0tDI&&}NbSz6da0ByoGx4z$_S2h1eJKQLn#puSq70^es*d-_l4(XJ#*_n zK*J}P(truL6NXuaq7uz`1IeN|p&1V&u2eyhN#=m1r|%dhlWusBQB&9Kj?1K#Hhvs^ z-dw2ubqArME!@rtqD~^LMn}(jgSFkP6{lq?QJpdKZ;mfckF6(uBjSn{+8(#`kG@;n zm3xcjQ0qycjaDG+MetaBT!=+z$|gzdx#dMIAswr_Th_kYiKDKk!&_UmUaRf(O6SR6 zzMcwVclitdu{K&Gt?B%0$DH%Ka)m`JL6Z#Jpcu<41@jFbBz1!FpuJbOJ)Z8kHKT}Q z_!}IRR?c>0&Nt&Qj;h!jwPEdQD`+lYT-#aWIWB5Cq~_MoaCWl~Jf%0pW3b z-Ku(nGC90fjj`rXh7Cc(Xf)$}yt?d+VM=r=6)FS@`OQ&6LV5%jY**8LDEo=q2-2;W zXLFz5Yj$C0KPF35%Za62bizyq5V&Un=D1ejqYy`jNUkEZx`7gG{jZU)SoHqE-`bUo zsxgy5URx|pOM9qlM|Bp2^+Otw#8?sx1ynFD)OACtwIT+Y1B}#snwfkd`ZNWUuZ1Dg z3J5J&JYAt6fN_#GTqdGv#wb8&nj)t%)0R_2(EHvf6Pta)r*dD@@=u{net~%WnTTt@ zjak199mId#cZ9@4m$bZo{wloNngnd}jm87j!n|hi9Gq)eq)1}J2NY6a=#-LWMACKc?Fn0eJgkvFVwzHPJSCda^P{jTCuDdIo7gYl<=sY)}+_Q3T%^*<8y46+?f*t zH^<~z8%7i-y{g&sZx`Wx(?%_9eB=1?F3Q=~ZWpcXS2{)%Z9?Cz?VlQHnd}xq*zI2y zC9dbVFHaskv)NGv?a~q}@_}vlro>|<@v`XmF4Xxq2O;^%wnr{e?a?y4zMGVO?J%x^ zqr6{Bq#9Sdib%!nZ>kG=6?f%d7)P_OZ)Dq)iWU>+(HwnZ2ea?AwD@Sgm6u&|?0uVx zHxW#~O1#4B=U!!E>x~yKjHM?d#H@c!rP-Zxm{VDkNw8W`WrERLYXUVKYIYoFqPj*A zFD}v?HkI1j_Hx{o@ika5m+~!ax#-9xYI>XIWkO7@)a8b3_C=V??O4fZ7soW&yvXmK z-Ps1%D+Tf_>unWrYEhe=B?nJ0+0j#f@%V`N7WrAJ=nVTZJE zu||VpNVe*I9}B7xo>6jqrpD3elbe=GMt4c$PzD=N*o1C^{TEqP{ol-`R~MW*V!kQ% zn+%OSPE%}dn?Wye?nKP0-xm5TJ80J_9&2daEWBpADhIPefDBt{al>tbKt)<2snTIu zZ=8K+!iMD>YoHCf*0G)b%;7n6H#1R~!v@As4^5D1lst)5TM3#`b+OnbI8 ze2bnPSnwdjYL}M91Q_*VgiH&E$IwTZ8S_za4*+yAgj5BfnG{is4=6UmO(6JZKUR5SgyC~B8+P%s38NFVIE@Q6rfXPzmilun?o|)VM7f+` zBdcF#M3FbOR$Q@j4_G#;NQenj3gRkK>d0ZD3{BN3G>@?AF2^t#o1j%e<=&-KcS+6# zm6Eq30rjfpO$--s?Bj7Y=s=H~<(V?^04ns*QVD^CIxlO0hb~rThyP*JH%;Os3o-J4%j@DjkQ* zLeNu35%fvejsqOEvSa^M)%+~Sb>V1HspK+y1Fw_zI1{Y*=POV}KhLx<6ibQ~4s47T z9GzXb!%Psmx}s#;glavT22gg7+Otqq7wiTH1hgtBRnI*GQ#>D9U4?Q(U=8Ef&r_)N z0=gyY`$sC*AdM`2lT31sy!%Z?Ys5TOU?=+5bRrov=-JL8B#s+Yvyd!I7ej~T!?yqB z0G*_hL^v2o@bg96In$!D)){V8(7HmoIrS38vkt=Hk`(G)a-;#YyjiDcdB0a)e+l(c zZm;JipJkXo>r!!n|Drb)#WeSzW$q%|2m4c~$7Z)uqb+w8Cuw%9_w^&^?xo*ck_nj3 z@uxkG#F&A0mw=OGT>nKcYT1XP=j~}ze zn><9CpZC;te(7Psr&pm%h}d%@$tGvUmk74-*flv?d+qOAVh6;i))(ag1T^!K6{7w~ue z!|EGUtV7CwfxW&=hxs>+K1hz!@B+U!ly3QxjW>KHQcY2c$WirWOqv|mZz>>sCYc8( zb%Zcz*FDj9+sw}1&G{$)chro>?Mq@q&LmDOu;2mtO(FN?UjNt5^ovxp;t5fo@QHzU z;@Re6YR|x?3ORQ%4G;Mm9#`^!7H|`;Xumbak->7ftC1n_fQOOC(Y%4vPXoHvvjLG> zc8D~=@;n6U(W)GDu&xX|!V_A-YIzVVtZDOu0=ci9mBwRhz zFqbia8@GeR7L*&w&8f2`d^!*4v5n9uA^pY1j~onD8Uz=Xti(&Y5Vt=jP7-gF6G4=5qf>o$TuBF<{bDQW z0b?DoR%bxUoO?s<1AS5!>{}@}*5I}_zrca*l2lfIwAeWp8$3sC3 ztEe~-=&EHrxI++EdY}cv7fZKqiMa;iYSBl>2Oym1mZ4f5e0y;F2GSZMs^!hUS$x*a z2x9lgyVN0Mf+2;s^Orv`y{3ztYA$?w2dJ!1D4*;^h;JGzMmFu3ry}jIu)6VTR`}{ypXCA07t@KT>O#Gs%@vd7>me@^RA7eN=#Q>CzXb-L%&MZzWdOV}12D8!Qm# z!NxL)Cak9k8f)TR!7r3e|{Z$-S|MS9FN8DrR3$qkh}! z<`ucgSNcmAQP!FnVJ+dIMQmR>##46@b&ruT(WY`9yt%YXg3x?K^J#|)6Kj>n_;2)0 zm3y_Qk*;Ud)nT%?iqrJm(>i>`eX-3+%cjK$o3rJfDbTKEad5T1T|O7#9NrqHu~rmt zN#ozS^(SDrA zsv(RB8@C1~R?f8Zekms{TPVD5IM3Z5td7{^#dnE0>oo=gjzot0pc|W2-CS6Sq_xY2 zKMDYyz&m62bzH&UjDIx#Y3dY%4v<=hB-68UFkV`UdO2n=$ z#L&BUcq-2)V8}*ybjF?kFjFJjt1T<@KGe!$-^(q=N1LgKCHaX=4v=|7;o~<0rzSEhRMu+*`oOKW z5?SX<;N?sF@l6-Kc}=7kTvS>_d~#^UkwD#!5W!16`VLA}O#fomaSk+2EKlne)J(XWzpHxYn7?p-1nR=c# zTBjb)7n*)FYNEN|o3!YkmYQ&hI$^e|!bc*!!0>rekNz!DNYZ#$6A^S^LvoH_P$Rlp7@a zv#OyyvAiwaMX5Am9pv?V@u_5A0mA!KU|3&r8 zpROC7?dY#2mr0fJZOR46^c1;}+FVaQ9q~Ysb}-iX@Fj05!hZBw3NZdz=k&|W(w7ht zbW%mADXI^t)}f#^V80V&k3;4+rO}GH9b8#W9#VgsSAjF*maJdH`dPzgJo81_2Xj6B zJ?M*!zA#+fIE5N^f$!-N9dpW~a%ubr zd_d2GxJYsVk4Ts)vAZiCi+n{SDW=MO5zSQ=ui$AD&S~!p9(aku@VF^KE&Dp%D0f|I?$O6l|8FC5g+$-iz8m9mo|L&C8{W5`2ds*u}tmk?Njg-NH$ zuYOT^Z6+X4k3hP4;z6TETdvNR=lR#Nrl9yIl_xy=)8Zrf?T?DGarFi;1Ez}5*}eDF z*k0GJ++IymAM%H#tFlzTmafY98Ox-XcLSY8SwvFPht`ItUu$z4q86N?zTuX>LiAb= zlK=f#yCxc&orpOyjF0y`XPSLU#kcRfrbv8KNQJvbMg)Z051D(nq^I#O+N~k_rE3^b z7d~@V=<*_xEmBf5X;pk)FMi%&)Db#b=!dc5kMQgRc5;-gb;nNfstPyH)^Ix8@L!5{ zlF1VP3$6U7zVU~d<_qiWn#c2qxq?4l>5EY05pwrj9OV5a;9Pd1I5*(JJPX!(wjzNZ ztk+_oHW*koHw&sj%v}q8^&1R8`YYHU@|{TOdBLH70I};=UY@EUkS01XT#dOHO5)we zAg~vu^3FrMVKr&i1H#u2m-wJuqWB1}w_x5H(JExSxDp4Qq{9U}k>OtiWp+5U@H6vL zBilZ%XL1Ifs^Mk%ad$;&xX#5S+!T>@H@Oek$1*TUQ21Cg<@w+eVAbh%`sIUJ;&s28 z&b|j-P)*TP#fmBIGS^y9D=0=;SE@SUw34e=<)|rOh7_X)eQ7I@l7#=2=zL~?Q_zyY-NH*)p__8 zXl=T?l&$Mk;T~zeH{2`IHP5}e<7FBv*>4~b*qco{T4Fe{QmTwndm8vgt**DfC7CYj^x4(3e#4BnUZyCm>k zsypku(lIZ7|KRtdLkDg0(`D|@fP#}ehZPFpUFrPB%_3QBQU4Pv^DH7{W{U;8ceoPy zV~^F5{ZZp<93x z9h#!%4@8_||RJ`FEIb~EFW}a)A)E--&5iii? z%}-rwtJHPYM=>hb??##Q1)hIGlDOZ+-FDeHJ%>og3OCN~H?Z~H=Cn>dYeGTf&^G!HJ;=j{ObHef}gi_Ld zJJ5hmjNqRtez^0*hgfd>{R0Zxyw&rJ0*4)#u8s9yzg-C?d25;-n4+(`D1;FQ>!(sUC3!(_REC? zbP^_^zyPg9hK;2vAV8PR6|A__<*1qLq6$Eq8l4S6miweXq5?a-nHN^HdIY!f_-o@u zp>Y<5g14Q{Vq)T-cj+<(iSIn49(9+qkL2C3?9iuc1&4aE89IqL*f&6a^^zfQ!1XvI zfXQM>34_t9t82$vL;XRil9PbsK+TGPzDy#&S3cjbOdEm~NI6t9>84uAq4u_*#>l9q z>VI>bQwUr-2dEYXydv#&S)X**ktfYGV57CIm05Omhc}Jl(!cnjYr1cFV7GftkGncB z&Hn2ZS{d3RwD9IFW43<+gepDlSxb;sKMd4%92<=IMHrjqXOhMtmgBT~)AzY1_Q_Nj zw@j(JDHekRvv=jqG7SP@l9|N~)7YfFU*pUw<#ReCAH21<$J61cB~wM-4wnZuf?!x8 z&@&FDqPxuKW1#{Qs|nwITE(P<^g=KYP1JZt=8t1#dyQx~P)ChKLSV$ir527yem+}C z&!-)ct4_`<5j}3Z5e_5){UC0`%OIs5&V!TEOyxa5zGJiDegY_wdbk620d=Q*!#?^i z2(l5VjooD9Z%&w*U%NHIDy}RGVS6`mlYp4y-LVW1;yhH5ADCa|jvjb^77b)wd5-wz zEa)Y94>QRui~kZH!G|4I!~88=%0&5G0eO<-nmHrap#K1XR^grjSe|Z|icAjz75nrP zACVIcUvi7-|NNp!+-;Hwr2EQhS0&}q%-04`%he-MLZ%u)DE3(ue zxb}WfOasYLv|TI5YXcSpqy`fNgeG}+nlPF93JI91>1BvY--xvJTv2LSv#U(gM20pcy6m*!qT-REi98kj;igw`RKd( zC~Lj(W4oNOhm!qSdy9MN+v(nUxk~==dUOJzzjMH4O1xV@F(@m5V@h|b4a{J?WriGBkzCCt>v1AD;OO~ud zS+hiL*0B>p#vMeuS<-!EH+B=*GRP8IgoH@h#@K0WF;|rG%kOEr_vJO6f6jBx^PclP zbLRXpXXg8SK7qpH#M2sM(~zwCG;wtNyn?vMWGJEWiqBj0IAtfzk9VBXz_y~AHU6~9 zecjKYtN>+acdRx@uVVO?`NcJ&LhT1VM{@&HtRG3?=|2^Z60B~K*p@boc23}r-TbaD z!>XBP(u5m`S#SH_8J3gct?H5V^cvy_&#begx)Yl6h2xK*oRO@Z_Bk#4%g%EXE^a;b zkdlQ0F~ST`@j9*Ukp#&{yF1LU&!?+q4-voEIiw6U1cY^&#p3_)YP{yLY(Agqbw4*} z8(ZHtUQ70I_%0rD;mz}WmdC+0xKo3QFeYCmLt{d-lfmT;q-hFyBwF=F%k9>_`t!PruazqK8B3CmUW_dDa zB)FO$wiBn55}KS%KJ)C|1^w#z0|)Q6S9)z{ffONO7hcJN5)R|W9vdu zoyY?Fc{jh}d(4(E0)-LvT6x;Xw+t|wZ!NgmE6k&T#;PUpagBt@kH>C#&)1QC7t?o_ zAGL6{))=~`ebD+i!0lx%G|ZSqFsmA;M>fkEdtL1C89?>1IG+_kb(Cs5{gGC1!-(ON zM}(4=p|PQTfWwU^_usPnyyi7ADZw^bJ=~J+bw8SzTDySd=E@>hxg8&3{L`~}(y3Z% zTbEOv62Z1^`_1$_4C`-6(Z~G7_vh=SAG#x|65B2UCPq!?^i5{&D_Tm_eSWw1uIHig zn@TUk&u!KYG7rm4?ApX8yR0$1&ey!0O9w)5rKNLOWZR)+LC!X^mE!XjZypOQMFo== zmvnO_yf}T-26K4YI!MOfmLivK-8F#=<~6fxyZh< zDenbKj-#aen^9$u0nf~#{nX>NLw5e4-uETs@zK<|UKD6Yl2Ed0Icys!G>* z`dZe_AfCIqLx1P1+N6?X{7YMGtt7VEB{zz~#I=XoGkH}LvBRHap207-`iz$gn{&4{ zh&b+cohV1@otped*^G;Fg|p-3hRt5gX+$C`FV>nOxo6+yY`w>cwW2^NMP27@_Lw}y zeaVVqMbe^?%#osXsOgU-hFW-hvZ9_)GLOA;>wpBC`+#W8jq)h_D@5#SkY(|uF!^Be zvpDxpLH;k;0&3`IV|#nk1OM7EvmXh2`2Dis?iDd54f*uw}jI5THWNIpIqj#NNJ0^2-^Wl*XFz;=xU8n9fv&FLCRIMSj7Q{ZWQ@hZc50(s; z3m6Qr;uqSO66T^?IXs83+G)5t6Sk}PG{2s=Wk-sPcMR5+`7w%`ajV|Oy3(43TSu+C zM~-Zmxa(}^%;=3m237SDD%R~xy8}xO5~CNQrV)Ltrk&z;N6jZt9)3}| z@p0saOnkL#elg?UO_@Ig`wP$CW^}0K&8wf#eIy++_>C90jd2LruH+s%w`}ihw92os zil}cNBDANCIN?G$uC+&?1()6!CWQzL*!D=s5W4p6HKG=QYwh{gCf&{3AST zrcNN5Ph~ju9%GXq_H!sthKqWX%||#6QQ)I!eFR95MgKL%q5H-4IkR`d3zHeeKHiFy z(u>-81|;aIADIjbIk)%244uctVlG#1_LwwztihjJ%A5%KqOMyC2rvu|l#eN|91lN5 z=Nt%}c-$Ej=SrDJCxNO7n}28o!M0qw?(~+_vJ6vZYt6Tye z6T%7!VXP5SO7V$#{fL1jMC{}K@z(d_t)^>op*uwbQ*~aco^uJ0YYm$`n&-3CT0M4^ zFXv+7eDBVP03x6O-dE>vRE;nbk$iI7r0?Z}g>Ni#E!lJJj2W&fiz6x=Nh+D04r|@# zfX;@vAkD%`Z1>BilpnVOI0lkfdtaiv2ozv;#fqmZm`>4^9_7-NWrc7gB~{=VO0r|6 zi%rTpc9bR18A3{*7gMjq+3UOVpKWMM)QH+;&%Km}>K;^!mqB|X7TOYb9#>(mT>XWq4gBjFX0woPN(1n^o!XP zq~rFHG`l8OKHGr&=M^G~PMXO+(xsUFhg$FK8?}<)`m7;V2eyLo#pS zkX&aXT3)!$R%e?x&V7=z5>efncx|Ql+l*CJ5z3#j#p$}#Gqc4tP0QJgNXW1p`S}VFsL_g(d*5kcnN{R|e&8PrW zKTs&SOM>;#Ax#=6M1~6G&d35Z&T2GJkrEZ6pOpa)9IJjGsXzsSkdS{BB;hyeOv! zKFJJDEwaGMyunY48gwI|%#ti{pmXrs)Mit$ZQHhO+qP}J;Tzko*tRRSU9oMal2ljs=<)aX`hJabHP3$5o@<>0 z+y`6!4c0*S13}rfE2|m?1cU(-1cWwa-VZZH@dqxz8+{Dp8!E4*e5J^>D2lW|f-j0x zo<(~QnFNO1pI8`Gd=Dh1B^mL?ab$;(Lh-=8JXtcDpd5?J1y(UPr2%wU(aZOC<-9lL zfcxF*)xE2UIN)87z5VfIhVHN5;|_d+;QhP>h}{S&#GHB~#GGp3!G^1MJbr%lo)4`o zc_%nvPRltX1nccyRLGDVhDq}twP!iOEwD#^U`j(>W|X!^l(A2Bq}thVpjupbJb$tJs_GSbRy=NhT>;2vm1Jp_7P7}k!J11JV$6$a@ojwipW`qx8>vXJJ zJ?zdA<96Wd;j-7&y8wUZb`0vX<7W{%()c?7O2Z!-sp^ecl~$6a?0}R|mAP(@jFxjh zIhxOTBZ1C!Nb1X5dw}fW(aiP!kXA5QDScnJ7E8 zW{-~6^Pn2k&Fjj}2Ckjx{MvEXtEAXY>rYahfIyx>Hw5VZ;Rj7GOVwBeZnpy+Dv>P! zGjqds6s?W0{q=I8gany>eP?xNX%WZKX==PuvH9xy+WvMz8S6wDjx)_Zewge9Gq_0k zEAWR=HIJ|Z#=i8{dR{C6TMglt_Hv?R_Lr}FzoWzvzrxeTP*T{hrUn}X4n&;~;bm)n zhjTJA;7Z3(7NN6M_mgz4;=Ac5MkX47SN*K1*q|LqUH{umM_55_r&15}m{Drjev2>) zSD%5XQJ(QP3Kf{R!Uun#|9FREeI%^-Jz|lJy~g+~DJU z@}jhnz%n*4U3{jH#O4aLo;oZ~;-*?!?e`q^m&_*lUsR@Vuugr{mlw7#;AMPBJq!28 zFJVD=aoQsXXU9xeE7pV7LVn#q{p!VZ3%Y7}jE47Oc_kZjN{$2I_Ih`Hid_gb!z77k zLEPp?R;<|(jHShvV>3q;6{-VZbkCCwhse5}9x5_xyKM(xnjv^V-XBsASA(EHumh^r zu4uRPY+C7=BU8QW{OGSZAfm^B!Ait0-jY>*sG>$R-+;7@n-8id2AU2mHkJf0=Ox7L z3wA>N`?)k>o~;OBOg*l9-c&2Ax>sd#(g1YY--PWe-tT@R^ihOGFOUaF!s{7t|8@Ch z_a_pXzZ3hE9!TK$1W#azp-gEOQ-WuU#0`utpn2;A8trA^l6q$YQF51^@s+gh=n(ox zoxo50I#y^dUD+qqZWwdRChW+6_RmN-hX4{Bk=n^oC1Z8WWcqd|_FqA#1Txzjttspk z$qnVX*9wL95^mN zFaghCQlK}=ONlTTi^uzFqhx1MtD@5q52vJ+NFxQ!u7FgleEERVM{9Q0KxyV+k(#!U zjP{AHSQz$~(Idp)Q>buZc_HZTh*;6r2LVj?1C+I;u46gWXMuJCdyY<=&+h zm4(^0&>UeXB@WOkTUHnuLdRJ}V^~#YwH&^#l%E<;i*sXUO>N1{m4ma@FJx=_#Nw;< z>DuvrnXPe9bTKX@WWBobWN|7oK=)Lm*uH{jQz)jjk}-j>shi7zn|@FwV-hX@U0v25h!EE-T`2>;fbnoybY~s9BLR+`KF%Q zDzbQ>Qv(mtg1L{<#PeylU~f84G=c~OVgw9kph^bB%mbG$j0Gi*<7%^`biLCi$6A3Ua2o<@&WZB%x_Qab`4f8RYu2zo&RGMRxDj1!RG($dfM3s(BZguTy zLQ~Oa_37Ex6x&lHa@^$nGLNS@^H2-MXqXBgn+7g$+NPHtFwcLI4Xtep*>ku19Ga^p zp#I$0_;mELs}quj#0<%t{k44%{7sS|V3?G1-3ZXqJ$R|-W>adjIc-=-Eg~5@2km53 z@Xnl(UkDbZjcc2EDxRKDmzlg3g;+`NXn<32Cs&Gr8M9>iNKNBkYED;3NV$c>%@2(7 zGuZSz;-4HW^C9IKoKie9{tDcJelMU3LgIin!vgno;{>zF^|F}Zn0+;$q2u1o;iwNQ z*ah^oyIql#CiRE(k02Ch-UkgWPBjjbKsFW>pRn$MumX$j zqFLTNU8r{i;*{D$hD+hOUa3_r7*l8 zv!m^zk9RI`jl^J^vt>t_yJad>q#1C=@BvNJ3MPiI931*tyGN(dfE8@a@$)+PFz%6ktHtd^7EFEspL&_D^Xzo&X6_DQ78wf zz1psXF}CZ($`6(2F%C09Pw5W0$pQWGyoi+#B$=AsBzZ;_@JF(*yWu_ba8?#NS)qv3 zq)8|X$tO8<*Cm-6pLzt=@HH~~Whyl@SnX7DTU)W*f~rdggk(W%Z<}b!YT6ltALyJV z&W{eSCYIj#IUky_2kCU`3+UF0CXWJ{R8hft0T~UY^%aGF@Oo1BC3Im`#{kkc7=7sS z8CyJwKM+!`5Ng(Bjw7C=YqBjR4pZ2q^G&dX1t1Bk9B9@gNUD)hE_4oC1LkMMj*Bml z!1|Cs$=oA49A5dB(J*y(pS)A`;qu&G&y}CmAx;G$aS6rh0|Wz#;j$XWiYE!A`t z-nl(heIYdB4%$A?#G8lH%12=MhxWT30nM>+I;h~}7?yr1=LE_C8i57|Wo6{sNQ^>; z76_DvAknlKbXXCYyWKW}OVJIAO$mR9f1kA z`gr)*`~ttfA25CqYm&2*ElP{2i^7qjnqohhLcekYd2ZllD!}7e;-T;lQF}5|iT6py z$l_@r6W(PRz>DAk+cMkZ60X498M-8S!#MJ%S_YjdN(}{_^tcey;R#>;6?L~{leV>u zPbWCJT!zM&*IJeiG+#{cHEvY+ z+Lzy+60#``hEJ4SM{BO+Om>~)RW=p6jE0QoZkC2X1^f$hGAhP8_=LV(#|^Z~1k`J`5Y4{&kph&!7&$xsda&#_|163LJY#sev-!dySjv~soVP|ZwnwS8hqE7eW=?jZIr zi|q0V2R4CbUK!WWlN?7FFNm=IV8vl((EGk<62$xUXcUio))$cnA|RzW;>9U(Bnp6*3SvPm@L)RUplH%j@jDW74248VZ*?j*TrNov+S$c>Dg~fOE1Sik8ABjAeJthLGdbJHnAQl>~+P~ z#8EO}Y7Or4mzgHx>OH=BF}4#ZoI}bJDIC?5J}a%Y(U;mvo%ZW1r2&8f2;ee-6!*6Q zFsae|^`2GCb)p)TzZ{-!^I1Vp@Gyr_M=`Yr)@w?iR~9Kw1~6sAY<}DOF4BFc>oH<+*sWy5S1`mn zF_U-HR381t#PQ`v5doZKTAbNU&Q!FVsUhGIj1!oSU@eSlp5BJPTk$s@L7bUstn`sLU5{#Kyg$T}jmaPaIaQUY)z>ik7Gtj+=Nj;AU=gg&6F~`6+*>>bh zaKRIBVV{_t+a0vt?L;AJae1#NN3)b4T4J^{&oTSdK$>TA&jL2srV0Bw&K~20G=K|j zcmh{_ur7h{M7$gy0P9R^qHnt{2bc55gi`-njR>CF3==d!!^0k-~D{^(9K>;EN-H(QO zcZVNtB+4?UGKW*dGw=#54>WJ8zmpFY%WPBA)rS~ zPf*sTprcOzJg7evUSu! zamXo{%o5}g-xEvC$qkF|h4Yc;6zl5`G@*CeNRuDYY_Il}tj5jasMb`Qx$ZH!@Y3k6 z+vHg^XC|{@Ma$u!yS5RwTtFrB_OZi>IH14e>hHj(Hr+h7{XhjbX zmagNjzDdLH2|so87G^T9=ht^OPok%n@-B7JZd+EBohHA~h|rvTnJWJ-cH5wU9a3e0 zvh1;5>}1vXA)efRhiI*5y=m#|(c|RZ5MCv^G^Vm~bPhcT-P#6llM1*B)Q=|}n#G%- z`-^P3y#>dghcZ-yeS&?^yJeObqdBxnZ6z*>=yfI!cY~2T5*cEWyWcUED2Q2p@DKoz z^OkzZ20>xZGW_|beg{&(M*r^H<#dy|iqOg^qS$Jzp;gQ?*iK&xyqwoSNqVV9;-wY>Bspr8Ti;34;h$o4MC1^b+y{g*55ZzjeWc6f)u8Ng9YEkK>jNC-{Gs}VJgcq(_Z-0ggT3-5t0G)sPE93~qXib;- z5LBi{NKsUJY%s)ymtC2A6uR|VkQQsmlZ8kUrOP}~K7(I=^oSkGxQw1GjA0^MV%;%L z0MBEeSY!ch`*juR$+7!jxlX!YaQFf2)qaVx6X=@~yOIY|;Q7Tu&urcxOemAGWQ(_% z&%;!GQtn8uG%}mcAx~*me%RC!O0xY2>NJ^*f>P#Kp-eBx45d;fTDndGZeXa&yJQ*0 za^P$+D(OSmdXmuwlJN$mZO$v0QWU^gG(CY-0dir%z;;(1zsS?Q1AKQj86wg$o7 ztaYCK?g)FeF_ehxGfp3bBUXIuApba`PhLixgH}sI7BA?5T!650fhsDPJussQVzT~L zP5z4y@!x}?g|=E(0Tcw}790dbGQ|XgAO(pKDn<8@0#K@EpoAuZF5va2QMp}pDk7RR zQo~vV)0?F%tU^IPdpV&b?6r{KV$U;U+A#_+^7mH^Q|6no{|gb${o(8lWT=GQf!OKn z7SHRJpQ4oz;O`yEFG^0h1{E6PX?mV5jwt~=Im%x9VoS4;QCgDzQhy8wG}fsV1JO1V zcM6lDQh@)v|NL%>uhf-KE=_w#{GDgG=1DGP^8y_P>Ioics)A5zUA;TspE3o<7$qF=&{j!*nQi@J1H*qy&fRj5}9W1>v(;&Vb7tAwk0(9 zX1sh-ItRzL-7*><-FadFS0C!q8K!i%5?|hQ67tW-8Q|}R+f@|t;Ic$CbWHI!seIY3 zIe^OgvEl}gt)2MvJ z;gtLYk>PVo4kG_^Iw>~XrqR+p-OR`089eK{vweJqASd7@vpFlX(jNH;^z~{Ws{A6+fmmO=-OL;THV; zus@QT@>O?g;0>5_oN7s6A7PvE~9pb-ae#N05e%sWJJtWYNI&ELSq4mldQ2=9# z`vU(jc>Y(av-6N3Ae1N|AOimb-s~ZM${Za5pr%El7L$$7&vy&yFYxq@%bWY6mo25l0o3OGDC2c!%j@--0`U3x+zz69A0F$wMN$02 zORhsol7=%CP5jV;jLF3iwdX9hOGcD6I_cCYPwEqhIezA^T%Q<77F`*0GiNr`~`L^B*Mo>e6ZO63)@J@Fqo>rU@%4g zBQ>m?f}iZCwpg7>R&Sj{rVPv+iupA-bbx1enWI+;``7|Oa603ZVjH;wL(-z&0Znn~ z5H9}mw0MTe1(!`*@n#Iwq7e=93k5VifES@sNo*bC9=`!3ii(saI8k~MU(3w{W)7{j zUX%$8JUix+_eX&S!K$iFTT_!=GiOa}i2>Qlq6IhOcG@ehjGEgLCyOEfv2W?$yv1pA zIb$!pW<8rs;3lQ>&p@Cd-A&~|d{)*yLI7wXBAv);-Uzk8`9NG(Ky@37L}C>qfUd6e zgMD-F76jWB3f@)Y8FvYnC7_nl=kLP-EIK8{+(i0@Bh^x9*Ey`dUcv1SFbl|8Wbv+X z+>Dkf5qZzB{ae|1+de+rvRmLoGeaFkTUW>|t2w31FZASyo~G8RV~8!DIzpA#uX0+B zXHtKPVE(#Qq>@_9kejW*=R5@qa7|1{-a~8>5rzd3_~-AbzRQ(`p<%kc!Q>RHp{|e4 z>=bO>kc~5O#H+3iU!9SYvvKvKb2bkFx_(qz&lP%RPW6rF=4zWu)Z>aAEaQj;Y>~C* zd`Ky5dZEUEtA5d*WDQDWo^GBzYRzxlwa^Miq`Dkc_xcY5)mpuSg>3PXOZ9jr@1l63yCA+^HtdWt8pJ@|jO!LFGFVy}u}e z`9~i8`sn_Hh=0)wWZv|J88rD}5%(K@m0GQ%LFkt2%%nt~pa*fxR4_oZ&z6)y*p{zV zRUn*J)hw+z%(U9$zKy`?{&d8xow>zdcD6xKtAXOU=+D5)B){w~17M;fWPpO18Wz$F zPpfrhxkK^mad29hK&^B(9#oyT-bQm*N)ngJ+l_Z0NGuDw{ zp-TM`@@k|JAodN{0HDOHmUqiSZjMZv*}sq(&f21cTnsw7^9vEr-tqJd5DV08SVD{1 zDi$GWtahLiXqnw(&tZ%5tDgmLru-2(yb4vjZ(qv5W3bNpeGw|#&y9OFCXZ9)J-kpE zU7p*%^z+d(+ha%34Ov~uopAsIdP(*$g;)#4oa*b1rnr}r77$-V?h9Y~C56Hp(qw%F zJ-9GRmRO`9g&Z|YW&CcEAca>8NAkmzX>yoQJ$j8rsV5k>5eX~uOPh3OcqOcP@HE!W znPD$aTWvp2dkyt=_;I>RMQkU?8!MSxIJ-YV*9F<(K+HWl zfgi3a;9LjJw*hu7#j*MvUvvTj?%W@Y7tDdn`!|@JbUr(@HCM^e?U%fAWYDIa&pXU9bBOn4OH)GDN@ z!C859;_}Q9pQ>Btil0}X`c44zc{qF2d0_zX_hEycusnBiKQCvX`r0HMy7gwSAF$ZS zf4Z#M1i(MwK8bchM%z_W2mBH^kcy2gXpsAiRk?@jO%5D#x#tT+1?*|L3_fb5`ZvWq zwB;P=M;{(_5>Bem&Y=Y(Z8m_}xu_*Vz#+%y9Z{{#P^mEPr}wM4p+l^Ba! z^ZK?EMLCCHGQ9UQ=|*cl&?WM3mGivfZtrv-tEkKkF~T?3@IW)kyU>5Lj(oVUsPtcx z_4F_A`2Q#Cc#iM@d1($xOUmeDf4%UwS21vCBNODsH^7<@l1M6GW+SkvvW=Msw6IpE zvu`k+_=@i1oSv56L{YwJaQt!9grhmvmP9@*uZn_1YHeMI>_XmPyjwHu}yYeQF zQ_0X$d+18Ra;isQFq1C8Dugvb=j^7A;-)T z8Kw>?m8MpJmwyhH10(K;hEnpTs$(9>q=neA*AeB=PclT})o$W0;XjvwlPGlY>qu$5 z%)3zAuD1jy#z8G)yz+!myes)LwIeKJcV+cauP-!z^ibZFRWn$Jj$HJypESxTxMs%E ze>(K3yoRkWh{Z1(r;RdLwaI*MJ@*htv`fr3Y+B?*Tk zPDkcp8W}1Y(Fcpzh&?}(5E+Ov{KJUC0zOyyw!#U|cpQBM6$~RJmDIz_zt>A?e1Af~ z|6Cl#{$l=BDx%hbDN2}Z!EU`yxISBGo=t!u;mK*g=+u*3cL+3ENWIM}%?^ecw&te5 zW_gC7GXcN&qcMoFNQF+E_xAt!FLiJ^!K!~m5C0?j|8;M>92CSQE(aatshs+g6eTnY z+j75!X?mS$FeESvi6JCto$$s|$T=AR!@b<75zp6Sfx(qnco*g)2L$0em0$*S%hbZ z`hR{Vo>@$__3*(XJr3L%zu&`(nXgo;G|8N=TXR&Gd5=~jJiw>ohjP*CYcIY4@=&rE z#Xct5tax4~5wZGoHx3C$T0J&7M{Gm8>ts5@f6=@3W}O+RDSWrtCR6kTzz-?+Jw^AQ zghRGphBr~sclWV>=aNiI7*K9ul%#XN0L_Sy$>YiW`mqe0N2Qjo%HtZJGoAims7@)$ zVV`7E#JR7X+f-JNM5O|kGMDB732L~GrrHBNKs{~ch6)pyDR{TwteT!X`9@2aHM;hy zz)X{d485vt%S>Lv)4<+}VBK;W9_yDArFAvn1fa4uq#NFBz%4(=Va{dR6{#y12G{=r zw|<4N=N`QNPIBsV%3PzXvTM0=e~VduZDwX>o`Fzcv^N#4``PH`*2NCcyi@AwT4&G9 zm|QqlDoM1640-GiR+*aX{SbyyNP-J8gwrG&2ECNMNaZ=;{(?ag;EJ`c^sO_m6WvU& z&KW{JWfJLc6TN_=I|p{1w+xMP3IYFTI>ua1UA^EfWIRHwk9uU_fq;KOET5Y30Cfb1 zk?ipC>Sui%?L`3!WtAX6cY{lOm!ucULQR)dG;3^!tTW=R%&CfK(}|8lW8zmCve^`iz7gS6@&q+I{Bt&^)2la;H9xqXTQ2Fm}r=k9Vqrd)7KLHr%9Fp6vDyI_5UvX;1dCZ4Zv>} z$ryCl=d0hZ1NyKUXwe#Ps)wBY*-M@Z=iYd)UZvQHuDZ1>wM;%h{+pgbM z)wWWm6In6A*7gjrvMBF64|94eJB^eNp6T@<>=JdtS@E8V!;aO+YJd^DfZO#Nj2wE6RN-CJ?_k8a;F8f z02oeQBD8u)&aFG<5~D*;8i7#oOmpg9UV#=Hc*jdM$QC3g*sfMlW@m?O*WxO5{6cd3 zX`ejZ3ysbJ4C^osr=4^_<}DyInJB!z@Tf3ms3<=>a}YcWQyM(IagxaqV5^+3PRm0S zETO@Ck9QOso5yG%6F3H6>UM8A{s|Z|+TQZKdP_YYw=42PI*Tz6EO+ZmT3cr0cyVA^y%#9?eYNQ2o-rbVekn1#E|tto40;x zKcvM&tt1g8<&8v4kVLh!d^QxbXF|0dDGpU)vO-C0#it~lciKZ0=teFhq38x5LHsW3 zmVFmKm-vu)H3_ccBrwtdF@;CkT(u*-lG9TC+)?U`%n}V%SHy4%WbPm557IYD&Mb8X(*P4x^A(SGZECio_ z*s4!Y947&NIu%xz8-5lJC+fEw@NF3@KZF}VwjNyT!HaQhw&u6R177I=cCNcov*|zL z4sKxdF&uJN0--#AC2sH_I?UBZ^j&k(?JP9jNu0gIORjh@^dCeLH$b;*K7N*MJdO03 zWg(1l!uXMI1#Dbp-GNQb85mVg|Kuo&%$_~6i#QO^jCanlgwna0MXz!njj2i_|HJs} z_=PkI8Q(iln)~HJ3Lw0pE`T1Vr8Mlqf1NhU=NF+#M(tAP-M(s9~Q+LW5xZ)iOJ z1(#je@5p6<(pG|a2{2uPbr}1k+3|h7!c&*6_haZcaoBWik=N?>@fi;aP7S7@xAUHE z*hn#x0M}eWpyz53`!jsehk_=6+;mtHtYVJ6*#Bs${WS;Y4k*=@q6a2jE}Ldvd@0RS zxX`!b5Q@(M9e0b9np0*xXq zOmUzs5|0}@2Q>f4|3$1sI>jOXD0tKvk4p3lRY@W&oln6`bg?^p6J>&7izET9lOlGX zab=n`!tbc^C|HpyPT>Uu^0LO)H)a$kVN8djN0gI8?-Sf1KJfI+?yp3OdW5L%Xo^b` zM-xA0ssWRA8Cb_r!LI=Mg}x9d6v2pyq`XmuCbQIADUu&UM+(y3T?u70KO-A&|4XT{ zLZAkCO1+p6VAp9;8U0(41|7~VXmgnd1BDA4Z>1L}mJ(G#e%vx-V`ztQzJc+0b<0!o zFO`x1!Z6fdkiXQ2oeVkK#3I=(r&9fodAGTn-`|gqSV3Sd4(2M&Nn#8MW1JV>rY2*e zp^1L`GEBZQfJHdqpb+Nd(mlJ4WVxXMC9@+r12TU!qw#5sgwj-wc}Q4jdCPPT{ETF?@Uj>Nt8%IAvk(o0faQv<++d z^?{2ephHKDBrzhm2lOkIhqLVJ^fhW2TD{@?xA_z1IGCgR-Mf!ATb5BBTW z<>EuEG9#_MtNM2?NFkdi`!x|invBmdf}BIi01*t0GdJHs_i+SZoI-BAG8E|ROq3vP z)j<=o%JEUO_Grn7S~%HV8Wa8z@6Wh1y7J9Q!l>En-QgU_Xmy8*^8Q#kxl~)->TA(v zef4ykvNXkEO(it9N^k|u9A#!R=ozZMO&PvT-a!#AIvk@yg9>dq<99g@HJO}R_J^FC zBn${l$A3ZpONaA}Hp2G5WVV9>0TKG2WM-Dsf=RQmWE$xFjS!((M_MX8>^?*%zX2k@Xy$a~*t`>n;%zt)IZVEq<~ z$RxOMPxD>j_Q8hmw|rme{S85It?&?zz~@bM$b^9G{?s3TV8Q=tjAaFXEeu^N=8ZyX z40~c_xY(@6`|CihpJU|>Ln1%kpy&^U(F}GKPNAjbhXuMv5@>(yYKiigyZ>OGMJ%P6 zN9rD0KLEWk!=(zRo}03Q@+Ww1$x(hyc9g7A%x$VaKU2#3UIk@}$Fg)IW%)%Wof>;q z)dV}iqeWM|E{}rB?0kv%n5nObtjBU?8ZOOJiT;=?#hpXeQ3kB91nr7!no-pXBb$a> z7i04gJV$ozM6Q2LI&Ob%<%B**Zh2eH^OS$-D*&{gUcDd7rb%0h4Ppuv|5*CM8+@|H z5~qGbwVz(ilVPn-I!lIP%bdt88T^TJug8iaNclGU|UAFJt|9q z96;UBx%57ZCC@F?B!Ie&(}=YOZsx+anhH%RudwPi=BCupCc^yN;saDfMU0y8boIs7 zpk`aQh{3}FhRt$rl*0xyw$*YLcH|(c?8af)PKtR^_J`a|oAvZ`_L{lbdYNPFr*2X%M5x^>k$K`6R_9iuS%>}$6YR!#e*x(9F^Y)fT zFJ8NQ5QCBlJJ?pKkf;nIXHUd&=BF(MGOOXAI9`0fqW_X z;!=^x<^JJaZOxT6?Q(J8R_XS*_D(i!;4!rv3WyX(?eL!^JdCE1GIXA;nG^FHq?vlj zk{WZ5s?kVJd_$`1_cg{ZiIR$V=z!DI12(eSSO-FRfl%V?SoULOtY-@HdHbTJ2|SON zSp-@bvu$}3baxB7TUSy?$P3Kk6b}utoD7@wj_IJYb6LpnoG}AYeTX|~Si6l`^agE? zPUQyM^{XM?;R!Gr(MV@dYC|j>=}a4nQ1H(1dPf-DnNK@BNBHh2obBYi34l?apkiBj zQ3xy+A}Y!pcrGQI2#}4{3KJemmHleLygC|QHAH2zN-TxjXuigz$H+A2C3G?ygw13v>_}Q)=jIGy(J;k;GZ)u$c9OXKm!Zk4L{=it zOtz-}!cADTgcd@Ua}TknHh?>i=Ah>2U!GV}D;)Qje1rwu#P2Z_|vpx0h50+0zWP@{TNcP;s0?A5KD4E$zWB(1)gq8MCVzJTr2npH)Wk9bQYzkJ0{|s zfSgN(g&S=+JF@WcLr9q_Raf|}Xg&C?AUuSv8p+*(Yw?O;hFO?VzK%Fb24G9H&7NO} zk}^N~6=L#03rmRt;CE-Jdj+sveP_3Vq$BS;uyy=h{ocMJ=^Ot%dEH;=h@gb8IW-IB*TzqHV`{AfTZAvjsWQMAAOx zrK8>Xt0X!Oi*?q+V4B^hE@UY}2NQvxD%I{*c_t6IMd3vi=ib29v~BMJnxMlYzrT@y zE!Ic%YM!YIz>0zJLuX|pr;SGF2?a2lx9c+nk@y`MiuEzQTDukma~(qgw+cq`LG8o{ zmG@7w2nz@&B6;zCAiNjq+mDAnAirig5-cQOOWYrrju?**(TNszhb!$iEKz`Z;n+LWu zM3sRu6IuFr$w7e;h6QO->}chMx_INTlVMSY5e5SOMoge~?tSG;Q&%lpRUfPI_0Zap zi`WZ*PJ%Ms-q8R3q;BeBFx79QY`MbqGQCMvEI*Oze3`^7isChyBns#+IESY?9A&sT z6y^2m)n>f92FQbl3RAk1EMViOCwMX^aul=@+Je9^I`v`2ZWlVuCYzn}(n4CvyE+on+*XzbWTn({Mq&|Lh!8xIr6BWqd4Y`+e(;ED! z8}OY%YYdEKpz)y7h4TdWYpcv~rcd%u#YpQ&4aHmW`#!ia=FXQ$k<}R8A9V=i7a-r@I|I}1Cc2k z$Hr64_0FCw9RBM@Yp*q6;_q^1fy4P z(bpznR@&%Kclg7aE87k#9EDJzM=(NYXL?PS6m%!s!P8 zt=)MxPIKMf7}{!W6SJd~s_shuy$C;q9?PW)AF(x#TrcHdIgSkro4 zahz;Q+4qLXxHZRNVdh4*uK=JD{PrYdb?~euzuzcniLv0(g_gGwGYE^SvMQq(|5*~a zM``!z@O|HDALpbIFaZACba;zWvX7U2?e%Vl;>vU2y79w%@?+mY5M-Ba+-LBhC$x5! zFcS>veT<7Aqj-Lc%i2_M#QP&@Z40Tl^UCJviNwemWb{X@_1W0?NfRtjkV@Qf z0QDZ+AlluNNsDoNPn~3VNdI7_u9L;D&6vjSB*~}X_~?M1gFOf zyGLns1g)gx_sIJxX9|0&nusXS)pfO3V_YTlcVb{ylxhIaP@laOTXBOyLN<&V z0}8fXRSSA4TB+swnqR~xi?rXWo)~KvS)?9PCHbg2E8Y(ISA5?Gg7jsK$#r$jeMn0Y zi*hLEt4TBVTVD2-7EFru>rN7p(dASs126pY#;EcVXcrBLbS{FM&(Nk|ZHJ&wKXJ57 z$(D@K%pBMVM==5Xad7u*>(NGsq&;$zuMG$V#Smi)v}DGU-YpX}))}Vm(lors^7a{& zVHRkf(o{u@;f$T2SW^m-6NbabD&K*Se8)Ub<5L~#JHuQ@V)`_IUmOoObtyuJzC1uY zH`mN`+83e`>x<(dBxj+`Zf2Z+YoYi8u_~*%k~8prXrVh``3XKSVW@?^J@^79zF=4l5r1YsRur~&`VroB>cy&XzE=IajU9avpDm28 zj?_Fcl8^d85er3&g)_fVA~K`RE_bu$?gYe=Bb7^&urdPA|y#{y*qP-Bnd!Gf@yZk>oc?|SUZ1E4fJcD>O|q7 za>m?fsDnGse3uJ6-GJS`hbSXZY5s#`Mw*4V53xznIp@qb*zj3J_g=+I`L|{AQdrWAXd}y3 zXs4q$<%((|qq6JC8WPVXH5ta?+pl4KsQVHAN)6gY$o+7}48I;a3O+6xm>PS9{0z4u z8s^ywr(LFNWFp&5?uF9bmsRuz_4(0@bP713{r52%w8v15Dkt5wKP@i(HDzT|ah~Rp z#xKnPWCRYw(Fju;{OQFsQ=QtL`3Mfo?$-ASjPO&R{ITCB`mOWi))ynZxa{?$HgoUn zrIFU1ea@i{sa&Bw8;8;@I0?Jc+&z0y>hOk>9VBK1CRdIG zzr2tP`Yw)=jVb&)7os6i>9}tF$P7SKXg2JsxuNruT+gWTYzo#rmv^2Ha$@;C-NUJA z`c@2=Hm^^`{iAn^&S`6t(}Cj-mO&i*a8)zq2N#G9Y5n#CFdwhw-*qGxZZ zNnM(8zlmYGE%88jxU7}B9R>4}Pb%bmOYjSKHY&Il~N#SFlVf}YJQ zEPU+9AOPD9{rANMT9aCS!066cpoLI24l5oWf6Sy&aJ}G;prH5R4ct54 zv;}C%13Kdhn%DLscVV*2`d8L}HwNH#CotTsmd~xeqwHd>;uu#x?lu{^uA_34rE%FR zynUIf6dY*pz}Pb`BjB_o0*+*i7sCp{#4z!^di6|YLhID}TojNXwggC0aI1~*8j1U= zu+dz3_z{LnOTRAH&r7LMCOm9*eq1SSI_Ia!k!t7D50ntNBN;s)+o2?CR{kp>@Csx1 zQ)vMxbl_TN5GTYkC1@275IK5J_VMHPfHhk%*`_tDi*I<4-lmOEZJ#7L)$B~Os(fJZ ziLf5qYiEontFR1G6a>Up8vXJ^m(XNqBQM8%yT5%yI<>5`tVdMrZ?Ma18!WMXUbM(oKC z;dZB286@@4LBTktO`7{TPx=n60%s?MqGVF3J!YkkRp5-(oFLp-Fef-GIMA1Kz-ZE+ z^2PWfK$zE)*Ad%4*4&@_g>ls{GC{UsH1VBtRsV2w*TUz5a9(c#AUM}VqcOZc{t{}Q z)l))30Q)YS{P-uKsQ!(IC{ylj@l$@CBLKqH_0*Px(ZAC%QDr+I)X|44h>=_GVQDL< z4_ZUmo>_k~$>~g*W-pu59pngseFrfKRv?X^Ros44k2M#HuFPge2y~ym1e`8@zrDZX z1+it${6rbTxf+Q4u{P`iM#ahuniH>J0GIE^&45qp9n{#r-B^*?(iTG^2_GN|*gYBPo&T~Vlmu#} z*|gG|0m(Xlf9)vPgRI#p;iaZG3%9(OdnP7<3dU73W$IDw?eD<2KgJ zgs$dS;DxRo#X3Co78@wp8O1S^s%D;SGmJHnA*{?c`?z&>9W-!U%;UfK;Q&jx83Jb3 zb3lHt80xjzvpFLl&juOp9VuGlG$B>*4XVP8auhtDuO8 zkdxIMcVp72m|D}oJ`=-EkpdQN+6j_vQy9uRIr%4Vuhim#wc9F~vFf6&qsKVtbT8G) zx$(=4bjY4EAeZb!t&n>8lVi<`|G-><8Q?Y)%$A97go3&2ZX%vZ5KUO(ivu{k5hYD8 zz1rs+;`5oLXEx5CwAg1$w>~km1qa@4`lu4rlUw7+t%=~_RqG0~uK-`%;1Ngr!x_&g z@D45*CkRQ4ie@*I(+Iil*Cz_*oXmT_874~CT5Aw@rquZ|{(`3OhTiU%FWrJ(XI|Icw^M z(FAMEe#t9+)LvXHG-_UOG=WC&Y0>+|{%_lO{hyx|`S-&Cq7>rGf7`|yyJ~nE=--Z< zIpG#)s?yZxy26{dpcEQ(ur_vj#JIS!6zJmBvlN{On~dEZ8^V8qf^W+ieP=04SVp{L zq8?=dOIhD!-@Xetc?&L*0q^L4>Q`fa2m6*Z6}RwJ85h* zww-*jZQE93+qTWdR&%;9&c)vUVLi`WbBr0WJ$0(TxqLxS^PB(X3S47h2m_CvjB zB7?Uy=zA>A7`#0RX!R2 z;o7Nr!cluI)=i!ozV4x|SQ56Da&V@1u$d0BagE$bBP#08#J&lWbU)&!rc7e3I~{2p zv>JsLOVU5L%K0_>gq*5Ae$T{uIB)?>`=$!3b6 zTBrT0a5kLQ{}wuon7oC4YIu}NA+T$WH1WB9m@J^_w9R9wH!9dFjqL{|-}QX`l~Cqh zn3l`wDa!&IM_uY*vogsvuKP^?d#mjpm=4Dc@jtCVC0q1*SB`!Yjhs9C?}@n`Bt1Fp zV*T}kFyfM_3%2|Uu2jB~*Q?mAgIp_l{N=_`YnkiB@F>4nE!Io3cK)#Tp1hpwR^E8& zT?YWh!J(*VRBJrQ#MaIz|88r^64~8Sf%j9(dW31rMA=;Cqxnz1x874+v$66THzFs? z!>mmj$Zc>4#u}6J=kL*yd?vE@kl`P%9rj6onBH0hFL0v6AGkHz0fhXAUYw?;=8zjO z^d-4w1n#wK>L)1HeTl&vRN_xr_q^N)2}U5M@`63zK0QO~5NWEMsa;7=N$n)3-j=$*Wn9dn+^T7noK(ucN@W9% z47Md5UMq809N9y}eC0a>Qbri^=ec`jhgpjp1}K*=;i2ZRh78$@XK2@j9-?26bFbfh z@asnq(O!^{o6ec_1i{t-BvJ{?!ebL+_4Fhe>?3E%7gxBrt9P`#0#IO-(?Y&j{5p?zJ- zoyysAuntO>Ym}of{o_W6edLMd73CSc8TRBgfo^1GKkPqlyF2|l6F6ky&M27V3#Ts@2vRIH*{iygOb~`f|oexMToOL4dkot;ZCLlfShXg?hY3*`P zTPqH5L{fWfRTDiz{0lCUolF#xtkXAcM2ktfHj6s;R%@uDQE#%2H2!*o^r=V~dxjJ1 z*vlm3mzr}qwm%(ZJYWoF$kB!uSiyQpxu?wIMjE1nUQT&lbxnl>89fa6JIuk?p70+P z2a>f0k(R0`6gy|9hk8(GZh+=nqjC41XK@MNgbS8@$^1~qzE!+aQSJtzD1j0Bk(-$| zIr8diKlRD6&y3?Zcm&d@o7{?N805=PMbXQz`|ck-X(-7=>iD_LI;WHRBk&Snp1-|3 z*rJ%TI6{JcYq$S+T?WWqsw-Zc81u)EL(2|Qe zE*ENq>O|eRvg$TDIrS~W6eq@WWJy@}de}C{sV=?BxxQjmts0_MjZPrh&%mFq+Db0j z*{`b?#d`s44Rzg7b12!*45f?JVHY3XgBpKIG8)Eh@9}$9YVy|DB1;jQpZ`>%?2%u` zo@dR7o}5LTW!8rFk;w@8hSLEJ#ygD5dMC(k4{A4urO9-M_Op%TXtJ zULnG0+8z1?5+54IVAqFLQOMJ0QAYYi`rYaUf=?M3=rOV;)aXQK=exsgN0BHYB&p}+ z{W(IbecGka*X=1FDGA{f(M{ERjkb^a=EqxXH_MVWM5r;8+Zxzouy3bwqYx(>0;(s* zxJ^-slyA3(pMbR%MJkp+QnW0|Cif+g#}`^&X!ib0=#DqIrx@rj#SBf|%`BpA@P5zH z8g0(csXG5dH4tJRx1cRVzR>=Rks$x(?T1hO*ZpJPMb zKvq;rmqeaa;-vxGL|5#bA5=U$i^A0>m`4xeb!P4Sbk>wj%`(~TYJTzextmh6Az11p z^E%V}*5^6L>#FS}=RViz>bL&aloKP$9L--P>Lp+fa6c6|>)}29Y%%vOpZ#(l6(e*% zb$Clo^_A#I(ZJque1c6pR9G~+y#=BW<@0c__ zx(vWc^}G8i0>8rE{m?V$93Ar1&pEpL+04$(fu&AiRyNp`3Z0YuC7o-M+uDG@mVm^Gfm67L>0tdcME^L5M z9;aNzjLZbb!1&JJd3U$HiOXnkax~9&ScvZWdV6uJvD#~8`Dt6Rt`yfg+v~x{^Os62 z0!PTCF&X>jq{=czY_Tk#sqIpsg*k@VUGtOO>g;w0E!yVx^q>%w5*yRh`sRj{s+|{A zQ)M++1AhOn*_!Ioj*hNsM4mtAaIV1b=ZELZb68hbNRi7lO~U^DBXrrn+fObRk<35Z z3UBue9b$sBZx8Jc?0+IkL=S&T@x}j0h|YFI$)Lee_5jU5^sQ?RWrBlNO2JOS3IWRNUR~Uz;ewb>#+%A(%H) z#f*>}gUf$=h7{&RH=%2%XW87=5vxQGMqNFe+LEr7UdQ0{&)o{~wW}(K53W*hPsKxj zcb%4P_K&!SJgE1n6E@F~N>M+__H-=p7-Cg!0~t6J^4_Sv-V}}@Pk`rFAW`sEbvXNh z(+Tkc7ZdOcU)DHwSx45lTiFwEy=H=(IzB_&OKONKN4y&1rk2|a>R+LS$8yQu@}F6M z=a@Nt*nwy;Ydk=!h3@6O`zq_z)RHP|gGR!OfG3?VIcCGYiLvY}3bEOW3$PX#f^V$v z;V_?w9>nDkEeJ^}JKd|BC6ua)Lmy+XE}E2_OyR4vrzcwXHJFtQlcED^Mz64=(#4re zBnG-HT5O@I4>W&2w5fYf>KjuTj^$+H?#7Pes4$85vIQ523WC{t$(+TdR!d#gX z>-!e<5Cs^`etP%!OIM=fG2glrVR4w*`Rp9I(FixK(tP5TNORc#=_E7$4h-Y=y*W+k zl9@j`^J9(L$xtRBXiR~?`VT4cVnpoEu~W2nmxA3AGe{9FXooD*^SyXgoG8In2vd zwy_A~#_d(@k~Q>d9JC<_3tCBkm?z^obvlV+87<(&>a`2mpnQR;xJgaDAsh<0%7*M@ z15=@nR?4*+%0lEmHjY@@9pMBA8-haZ0@!R1586ZB0%iGLlhM&+$)dosGFzNaE}1O- zP3_>3l$6LZnkot+XMi_+;RSYZ%-$eFSyv@MVzwElzOJ>%z1m-QoR+fGk=2dY1pRZ~ zohG-Hfs2#G78D2!gia-=W$cVA&o}p+SZY3VsW=2t^ANsucAQ1JjnRrbvPJ5|*%H%N ze1VJ>80N5iF!7Wu^g5H$R+9M{nuFud%5>W_%yByfyHjvW+^u>LdvAjS1R(xf(0}H# z{v{(^eo=nN8P3J%nz=D!d&Be5D~}~ z46>pkz{LOCYFPjB5(-TtFD{Z{yJlG|oT*Va6{vwiTo3rR;sK<~^omr5wp?OsMEhAS?(=bMc_|KrgcSOILA8 zal2i)CmrS5n){rG?08?f=u$>bE)8nzRS zR-At7_(`6UW1gH6x&I;!gFBtPfoR=zgHE7E-#}R2iNMPO<^9rraRAwDXbvg1Xq==uFW(SZ8Z|vW8mc9X6 zWX&%j|2~>q!a_GRuh~-5CidJIch{5EuLZaYx!fq2H4^_^XYBC*Vf|F^ zZ4%GMQ&K&a%6$3C_cd^A5G84?@6Gt(W`X?cPZ~B)8#o>Ovgd44&nTU%@a;sN*pdy) zo_wCs9orQ_1f_(FQv{$U_WdhA%(mpdEC$}F-JkccRQnX^tp!C1#wQD7*5)C6^X12I z?j$Y%d!TR|3i-8_@I^2`+mqTI_9T<{hlqpg zmcF+9sQnF9#W4Wy*P*vK^G@h;Amf}EYoyx3=joEhp9c^=sxLrGg`vf44HY(NG)J+| z|F?U2U_kV$f4xSVN0tuQufwaVu{g&Bm6DqFM3r%*Zb*E@1)0OknrZfV29iRO0Y;K6h1VcKwT!0*Za171EDtI+fsc@_|X>g|s zNk=>k9ZiZ0E6-{Lz%bU&j#34iXzzv_W z2D_9C?6=D=)@M#tf14cpSP_CZZ%J}Xf0&xQpY15NS`vU$89J3k;ZakLWw|a+-q1Sf zNppMF#yOe1wDEPAbLJ@w6t{^&-U#_r;o65=9~Hwp-A@0E@GGYUMy)A2`cmpuC`d$*xH`Q(~S z)I#_{A-VTwlQ$upw&Un*STJ3R3SNO8*A%K2k*2wUtpq|}{&)nn0b`9yM^+?Z1=mk+ zO0_MZYB0qslkYW?8q|d4XFKz1B7EPGyaoaeW=>7tV37Vg8P7eR5q*+wfymh&iaDd^ zN^smWa}TmP({jw(bfT=O865K){6a@r$6BUd<&vX>eueAMk(u!?Mavj8$KykMSd*Dq zfD8K~Hh(7ZG~pb<<_I*)x@IPgFAbF0CNnd; z(AwglQw8@c1&g4g+(vo)r^eALl*>f&SI|6l^EuEwmGfJSL19sOkmpcAzGQXi+8D|* z{O+Wc_>+=gvg!>I{!pu(M$`%0DGK?7GHTj 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 VwlMN}`%er%aGR6olj~j${vQ;P=LY}) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..37aef8d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd4..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/settings.gradle b/settings.gradle index 3703f364..291d399d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,13 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url = 'https://maven.minecraftforge.net/' } + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } \ No newline at end of file diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 8d2d5259..c9cea1bd 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,3 +1,3 @@ -// 1.19.4 2023-06-15T20:10:58.3743504 Registries +// 1.20.1 2023-06-15T20:40:21.1760633 Registries 92b52d0f668e65b9a388a48409ce8b97295d4c3c data/statues/forge/biome_modifier/add_fewer_statue_bat_spawn.json 3064d9ca771b5ff2469f323ca2c54b1697a48798 data/statues/forge/biome_modifier/add_statue_bat_spawn.json diff --git a/src/generated/resources/.cache/3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6 b/src/generated/resources/.cache/3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6 index e99b1f67..37f30055 100644 --- a/src/generated/resources/.cache/3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6 +++ b/src/generated/resources/.cache/3f45eedf5e40beff2a92fdcf50d6270c70fdb8e6 @@ -1,3 +1,3 @@ -// 1.19.4 2023-06-15T20:10:58.3718515 Tags for minecraft:worldgen/biome mod id statues +// 1.20.1 2023-06-15T20:40:21.173063 Tags for minecraft:worldgen/biome mod id statues 04ac0a28392a7ff31602fa82ebe378e64220b060 data/statues/tags/worldgen/biome/can_spawn_fewer_statue_bat.json -cfbf1b5c1a6e2d1efdb53ee37b090d5ea9e53a17 data/statues/tags/worldgen/biome/can_spawn_statue_bat.json +57b9bc73504d77a105ed8da0e7b56fcdf9c2c74c data/statues/tags/worldgen/biome/can_spawn_statue_bat.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 42de0553..6063a858 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,117 +1,117 @@ -// 1.19.4 2023-06-15T20:10:58.3728502 Loot Tables -90fe06cbba2e8031adf175009b74d6be9eafe93e data/statues/loot_tables/blocks/angry_bee_statue.json -32ed19c63cb9a7e625fc23a62a9a4ba847d4ae17 data/statues/loot_tables/blocks/azzaro.json -58fedd2b331d61c20e53b85a30b5e4d7a8548160 data/statues/loot_tables/blocks/baby_zombie_statue.json -ca9545da4f72550b8ff14f1aaca8567402e1e421 data/statues/loot_tables/blocks/bee_statue.json -280238614aa43dac79e07888adce40f76f6dbdc0 data/statues/loot_tables/blocks/blaze_statue.json -457a709e9263f0e85e63a82fd1a3fa748bb969f4 data/statues/loot_tables/blocks/brown_mooshroom_statue.json -7a7977511986183e55e6fdfa845f33f311d356e2 data/statues/loot_tables/blocks/bumbo_statue.json -188746a694c5801dbc6e19e1fa388238531ce475 data/statues/loot_tables/blocks/campfire_statue.json -0223ee6a29c7a2ac21277f865b6bab6dc3e67a89 data/statues/loot_tables/blocks/cat_black_statue.json -9dbf85143c831fd173ab0cbbfc66c4b105078be8 data/statues/loot_tables/blocks/cat_british_shorthair_statue.json -7ffff02348b3615588c5afacc890c1b8e1b297ec data/statues/loot_tables/blocks/cat_calico_statue.json -e0f2b4f51ffa39651f5c5f9d333bed40bf2245c9 data/statues/loot_tables/blocks/cat_jellie_statue.json -0cefa980f3fb9ef5d7bf4fe41c371252c9201793 data/statues/loot_tables/blocks/cat_persian_statue.json -ed251a5367d7df2cfaf0a1a5d18f40ff92b7d093 data/statues/loot_tables/blocks/cat_ragdoll_statue.json -4d56f4eed17ee85387eb5d6070a6727f496a40f3 data/statues/loot_tables/blocks/cat_red_statue.json -f8db4685ff81f50ba3813bec220bbc9becff378f data/statues/loot_tables/blocks/cat_siamese_statue.json -a60d3875808ca1fb7ea766c80d3916cc1936f73d data/statues/loot_tables/blocks/cat_tabby_statue.json -1b67b5542a97478bdd382bf8933b63e09a42154a data/statues/loot_tables/blocks/cat_tuxedo_statue.json -cb802a00253fac7cd34ab50629a3cd3ae22c9bea data/statues/loot_tables/blocks/cat_white_statue.json -4118d204031fe08898fd97667770479936e78f6d data/statues/loot_tables/blocks/chicken_jockey_statue.json -4b2abfa1d6c920bb3a02a17b72c67a2d8aee3d51 data/statues/loot_tables/blocks/chicken_statue.json -bedf580da76163c8fd93d78268461bacc4554fb2 data/statues/loot_tables/blocks/cod_statue.json -1605819a2aa1f868f7355f913793feda2a310e10 data/statues/loot_tables/blocks/cow_statue.json -81520dd52656172bda5d554b8b656860164148ad data/statues/loot_tables/blocks/creeper_statue.json -f85078729b0413e02927aa6861e55be3f183467b data/statues/loot_tables/blocks/detective_platypus_statue.json -9ad56f699cc533fbb40e43969e0c07ea71cfddc9 data/statues/loot_tables/blocks/display_stand.json -c13f6b06933c565df4e3cb6fbb498b81f3a8cc71 data/statues/loot_tables/blocks/dolphin_statue.json -ffc6b8dcde7b5623df12d84907921b7fc881aff3 data/statues/loot_tables/blocks/drowned_statue.json -565ce79e9cb540ccaf9c1294b2848d09e8ad1d22 data/statues/loot_tables/blocks/eagle_ray.json -c48898cb41cba6cbaaa324a609dd699e3c99ef89 data/statues/loot_tables/blocks/elder_guardian_statue.json -abf0146cef616d7810a5ae174d6eee7ca9afc677 data/statues/loot_tables/blocks/enderman_statue.json -3df4fe27692634da9cbc0a5f20f4d752912c2132 data/statues/loot_tables/blocks/endermite_statue.json -6192c049a101a4e1e76b492882066f184125c06c data/statues/loot_tables/blocks/evoker_statue.json -ef0e0835f4b6c2a8e16743145aa47ce2df621bda data/statues/loot_tables/blocks/flood_statue.json -ed8cf8438cb32577c5d2eb356144876e2562d1b2 data/statues/loot_tables/blocks/fox_snow_statue.json -e569dc37ab1a71e9685969f0f3394f3f4ca098a8 data/statues/loot_tables/blocks/fox_statue.json -5b7dce1b213218dc61a4c0b4c9225be6c6f0573f data/statues/loot_tables/blocks/ghast_statue.json -9957815cc02369f951c6c855704755eb040d9920 data/statues/loot_tables/blocks/guardian_statue.json -864197951679ecdf4adcd50f594df51bb2fbbff7 data/statues/loot_tables/blocks/husk_statue.json -0ea396fcc95c836e9e388a13ad48fb4748eb45d1 data/statues/loot_tables/blocks/info_statue.json -cb73368875935ac91b498199508cda6704a75352 data/statues/loot_tables/blocks/king_cluck_statue.json -0e980dac6e7ae5583fd616a6449f34cfd47b0fbb data/statues/loot_tables/blocks/magma_statue.json -5d2e5b64e95148326c2f111de3be6cb08a7ff13b data/statues/loot_tables/blocks/mooshroom_statue.json -8e4ffde230f26407019dd1e37db131f0eb8118ec data/statues/loot_tables/blocks/panda_angry_statue.json -9b3bb1ad792ef34f3b45168e2234ace1a0bddac1 data/statues/loot_tables/blocks/panda_brown_statue.json -5726e436f3001e1bd6be84099f2580ae1aca25db data/statues/loot_tables/blocks/panda_lazy_statue.json -cfb33f2ae001b56dca19e48405643b29d9b49199 data/statues/loot_tables/blocks/panda_normal_statue.json -6d82e37c28ab900b34f364da09644bbd5f7608cd data/statues/loot_tables/blocks/panda_playful_statue.json -743040ef805ef252f0faebf48de4b168dbc072d6 data/statues/loot_tables/blocks/panda_weak_statue.json -eced817bf81552dd334107703c704dac124706eb data/statues/loot_tables/blocks/panda_worried_statue.json -1b680d7c88e23c0145d8cbd3d04465f87c374314 data/statues/loot_tables/blocks/pebble.json -d587cb80c83fbe0b10b690f0641ace25cb059833 data/statues/loot_tables/blocks/pig_statue.json -b6aa3f5334e49def299192d5301e6f5d10042020 data/statues/loot_tables/blocks/pillager_statue.json -6106b7619e7eb2285d5a2ad58933b9127ffd4f0f data/statues/loot_tables/blocks/player_statue.json -91dfad0237f2e7f831e01ead8260d08a0a88a049 data/statues/loot_tables/blocks/pufferfish_medium_statue.json -1fb718432c96005456b1603b8b3efffdf24f6e11 data/statues/loot_tables/blocks/pufferfish_small_statue.json -b592b1880350e044f79593fc9eedf9205e700f05 data/statues/loot_tables/blocks/pufferfish_statue.json -1623f2d011a0ec6c0c6cd81f0a62e276fe13320e data/statues/loot_tables/blocks/rabbit_br_statue.json -8a4b578a55f26aabb6572cd9516088dcabff86b0 data/statues/loot_tables/blocks/rabbit_bs_statue.json -976ad5ffc30e5f81497243af0635e756a29293e6 data/statues/loot_tables/blocks/rabbit_bw_statue.json -c68d45978c3d0024645eea86b2ea67052292dc38 data/statues/loot_tables/blocks/rabbit_go_statue.json -9d3ab080a442269efc1738279035addbb76a153d data/statues/loot_tables/blocks/rabbit_wh_statue.json -e0d85df99cf8e67148e4064a5b33638405de0909 data/statues/loot_tables/blocks/rabbit_ws_statue.json -c6cf57b0042a0df1ecd7c768270fa90380c2f8b7 data/statues/loot_tables/blocks/ravager_statue.json -7f4b68efdc46e4dd92a69d3967c40254e6aef6f7 data/statues/loot_tables/blocks/salmon_statue.json -6a02c87717ad88128617b1c6ccf3a085de0b8237 data/statues/loot_tables/blocks/sheep_shaven_statue.json -5643d66d693c3688c529d6e440e2bded4cdc6c5d data/statues/loot_tables/blocks/sheep_statue_black.json -0cec13e5c1826163d5cb9f59aff78c470ecc8bfe data/statues/loot_tables/blocks/sheep_statue_blue.json -a1b5c6728c6af8c64d8290ab755b95c8a17367f4 data/statues/loot_tables/blocks/sheep_statue_brown.json -5f55e43118611fde055edfaf5c8159372d5182af data/statues/loot_tables/blocks/sheep_statue_cyan.json -ecbd857e8772d1d8a08ff301ddee42d408427b71 data/statues/loot_tables/blocks/sheep_statue_gray.json -57ba77e94dbdf5830e6ef1dd32d9a7bedf15dfdd data/statues/loot_tables/blocks/sheep_statue_green.json -1892ab2e53d8f05ba2ece25eb9f32f42302edf7f data/statues/loot_tables/blocks/sheep_statue_light_blue.json -7a00a65f600b32284874a40b2d2901115436c96d data/statues/loot_tables/blocks/sheep_statue_light_gray.json -f34e71f10881fe278c5216c21e1a534164f6d825 data/statues/loot_tables/blocks/sheep_statue_lime.json -3ce2b73b146906d1988fd669b8cf8dd251536a84 data/statues/loot_tables/blocks/sheep_statue_magenta.json -a4844357be790ad651fa42b49bf2ab15dc6685b3 data/statues/loot_tables/blocks/sheep_statue_orange.json -4d1169c0003b82845eac046499959ab45e337270 data/statues/loot_tables/blocks/sheep_statue_pink.json -70ec00180b91d2e393298a541d49e5cd3408a78b data/statues/loot_tables/blocks/sheep_statue_purple.json -d884a4c9851db8f0a21d4e3b42fac45b55c40de8 data/statues/loot_tables/blocks/sheep_statue_red.json -ecdfb1613601e22498ba2d768a0ffb16c226bb11 data/statues/loot_tables/blocks/sheep_statue_white.json -e10984e850e1d1ff728f57b588bbc484993ac8b0 data/statues/loot_tables/blocks/sheep_statue_yellow.json -9282332abd37fb6399809a0704762d54228e6700 data/statues/loot_tables/blocks/shulker_statue.json -bc94159cb2669aab72ea950eb45ad9d32d34995b data/statues/loot_tables/blocks/slabfish.json -613081d0b20ba96a7e9c11a87c1deda9fbdddad9 data/statues/loot_tables/blocks/slime_statue.json -d245a52023803883cf497286b3927dd7e1c1bf04 data/statues/loot_tables/blocks/snow_golem_statue.json -ef51f8fed7b787668fc638d8d989c7ff9a7fc3a0 data/statues/loot_tables/blocks/sombrero.json -4b28c542a8cb9b14d79dfab4c82a5c09b63e264c data/statues/loot_tables/blocks/spider_statue.json -49b1eb51890c89c47c1b0514943c6267677c4db6 data/statues/loot_tables/blocks/squid_statue.json -14faf91999c8d3776cdc24429dbc3698bf3f3984 data/statues/loot_tables/blocks/statue_table.json -0ae1fd1423c7f9b8fecdaa0aa76dd599777ebc88 data/statues/loot_tables/blocks/totem_of_undying_statue.json -331f6fad3f5d785618538d31f97e4e4dde30ae09 data/statues/loot_tables/blocks/trans_bee_statue.json -7ccd2867ceb4638c69c70a156901e096428ea95c data/statues/loot_tables/blocks/tropibee.json -88d10e1c76b0c9e169a824cee26c4a86939ee5f7 data/statues/loot_tables/blocks/tropical_fish_b.json -252af4992c12927982ae6273aee35296057cab5c data/statues/loot_tables/blocks/tropical_fish_bb.json -423240a48d3b2f04c4b0b4171b5f360fdc44996c data/statues/loot_tables/blocks/tropical_fish_be.json -bab1d160302012d7aab6f63ae13a4a7fa59be0d4 data/statues/loot_tables/blocks/tropical_fish_bm.json -88387d635f094a5443a9f7b203236c76fdd510b3 data/statues/loot_tables/blocks/tropical_fish_bmb.json -71d18664919e45b323eb03476ee07e233dc688a6 data/statues/loot_tables/blocks/tropical_fish_bms.json -623d4fdd7fe5254d6d9a9a2495644a5c9859f883 data/statues/loot_tables/blocks/tropical_fish_e.json -9f45194e1209cfd7bc8f2bb971d40be3d0c6e0d2 data/statues/loot_tables/blocks/tropical_fish_es.json -210f31a058b99c252f47a4f31d755e6a07b37042 data/statues/loot_tables/blocks/tropical_fish_hb.json -d5bb884411ab966813b192da27e48daefd3450cd data/statues/loot_tables/blocks/tropical_fish_sb.json -52065ed3df53b47b379e2b28d1556ee398653ed7 data/statues/loot_tables/blocks/tropical_fish_sd.json -87a5b3075967c505654c3f0634ad5cb486fe4e31 data/statues/loot_tables/blocks/tropical_fish_ss.json -60fe32edeb3bc71a78e08415f7cdd584c281606c data/statues/loot_tables/blocks/turtle_statue.json -c5a4b52ba3e0bf16cbc4331c8ddbb3a0e1234fe8 data/statues/loot_tables/blocks/villager_br_statue.json -0a9186d4395b2a60a48cebe1710ef8e379792515 data/statues/loot_tables/blocks/villager_gr_statue.json -5a39078698c4a0d2cd0d8d157c9d92b2d5dc8e24 data/statues/loot_tables/blocks/villager_pu_statue.json -0d3d53cadd8c0d0aaab4897c73b7f4e7cd37c641 data/statues/loot_tables/blocks/villager_wh_statue.json -7d60af9355a290fbff746e170afd949792758c1b data/statues/loot_tables/blocks/vindicator_statue.json -bbd83fd8ba7cdb9db333a11dff8c0c40c4661265 data/statues/loot_tables/blocks/wasteland_statue.json -f92f46e425254524b8b6a25219a03cff8cd39e7b data/statues/loot_tables/blocks/witch_statue.json -ec52187ff3b6b83e29006c742a3285594d964a8c data/statues/loot_tables/blocks/zombie_statue.json -4f8c3805fe6295af64a4aa474c04d530b16385f7 data/statues/loot_tables/entities/player_statue.json -b68b05425b28be6dae278b9739a2b518e45929dc data/statues/loot_tables/entities/statue_bat.json +// 1.20.1 2023-06-15T20:40:21.1740636 Loot Tables +0e0103dece0812379551b1784138d8a1da8d34b9 data/statues/loot_tables/blocks/angry_bee_statue.json +faeaaf1e865e283d5ef22cd8f1ad47035065c0fa data/statues/loot_tables/blocks/azzaro.json +6b66beb711c422336059759a48d09dacabc3a9a2 data/statues/loot_tables/blocks/baby_zombie_statue.json +27585a8828616dda92f046ca0c6c507fb3c62b33 data/statues/loot_tables/blocks/bee_statue.json +d93b2a4d5fc8396c4e215d649dfe910cf0d9575c data/statues/loot_tables/blocks/blaze_statue.json +4849578eb89194b97f032a2f1e035cdba73321b5 data/statues/loot_tables/blocks/brown_mooshroom_statue.json +ee9a1f7fc29d5679b313791411beaed1eb3cce98 data/statues/loot_tables/blocks/bumbo_statue.json +e8ff92761152b968407064c1bfebcfce59ab30ce data/statues/loot_tables/blocks/campfire_statue.json +9f6210d98192254882c41fe244b08de4b0936cd7 data/statues/loot_tables/blocks/cat_black_statue.json +8ebaf393cd9e82bc55778e7c49e5a19bf2c80dd9 data/statues/loot_tables/blocks/cat_british_shorthair_statue.json +144507214704c28553293ab738f0f3c826fe9db3 data/statues/loot_tables/blocks/cat_calico_statue.json +e117328402bf1392a9be23116bbaf2941219253a data/statues/loot_tables/blocks/cat_jellie_statue.json +8b75ad364ceea493b75470589dd149161e7170ee data/statues/loot_tables/blocks/cat_persian_statue.json +9b8de0a6e9b9395ad6dc778f69a5a8d5ddb3e970 data/statues/loot_tables/blocks/cat_ragdoll_statue.json +683cc9bdab06b1cf5aa088435653d82ba6150ba9 data/statues/loot_tables/blocks/cat_red_statue.json +ed63f3fa918e74916f750fe753f5e46bb6dcafe4 data/statues/loot_tables/blocks/cat_siamese_statue.json +b197ccb949f37e2fe0320159886ff004c8eda8ed data/statues/loot_tables/blocks/cat_tabby_statue.json +34a8f8fb832ae7982709d1db0f33c9ea6eb3fbf1 data/statues/loot_tables/blocks/cat_tuxedo_statue.json +c9a8a54933eb135a9a3e136edee8d771c5aad1dd data/statues/loot_tables/blocks/cat_white_statue.json +f4ce331e2acdb461305ceaec3389b9072a8e5207 data/statues/loot_tables/blocks/chicken_jockey_statue.json +230926d8397286db10fb0d8ce2c6e32945817df7 data/statues/loot_tables/blocks/chicken_statue.json +1325b479c72a58ac84bc4ea6373b1d1008f3bac8 data/statues/loot_tables/blocks/cod_statue.json +7e08a960f945081133e91d3013bab941f8f9abbf data/statues/loot_tables/blocks/cow_statue.json +03100f4b910afd5bb28fdf7d7ebb03a4cdf8891c data/statues/loot_tables/blocks/creeper_statue.json +e1cbb8654c49f26c69a1b621cfee8b3aef178fc4 data/statues/loot_tables/blocks/detective_platypus_statue.json +62b276a415552654df7b8f07d927f9a565030cf1 data/statues/loot_tables/blocks/display_stand.json +7666ead5bbb74d589d9531457cb24f0b1e73411c data/statues/loot_tables/blocks/dolphin_statue.json +34cef91f548a214e8720d7c3f7f390c5a6bb66c9 data/statues/loot_tables/blocks/drowned_statue.json +cd6aa20757f66c3f6382542719b96e4167eaf5a5 data/statues/loot_tables/blocks/eagle_ray.json +f492dd074759bc87c4356461cfc162c3928e8461 data/statues/loot_tables/blocks/elder_guardian_statue.json +7043af49a5aeaf9a133d4fd16dd7744ff57145e4 data/statues/loot_tables/blocks/enderman_statue.json +1a3237506f26b0f8e819ce77293d176fd09af0cc data/statues/loot_tables/blocks/endermite_statue.json +41ab38a4130619040294d9417fdd4db66bcc9613 data/statues/loot_tables/blocks/evoker_statue.json +0d48f2ff669571dc77c1bcc95ebeb1ebc2c8a480 data/statues/loot_tables/blocks/flood_statue.json +c084df74cc1de7ed6fa68fc5c171e09521f898d9 data/statues/loot_tables/blocks/fox_snow_statue.json +0c73626de0421e96901bc7d2b83d9bfdf8854278 data/statues/loot_tables/blocks/fox_statue.json +243e2002741b7ebdca2a5adfdfc1da8af12d0100 data/statues/loot_tables/blocks/ghast_statue.json +8e303a5e257c27620b3ca610b5cb74278ceaca51 data/statues/loot_tables/blocks/guardian_statue.json +5bd951103e5aa78c059afeae6e83561a02975bc5 data/statues/loot_tables/blocks/husk_statue.json +ce1dc0c2b860924924969e92ade7010c877e5849 data/statues/loot_tables/blocks/info_statue.json +deeae1b0405e9438402603ea243f93dc70251c13 data/statues/loot_tables/blocks/king_cluck_statue.json +eaea361e8aab6401ebcdcfba8fce8639fd031600 data/statues/loot_tables/blocks/magma_statue.json +24e64e2b8b854fef0ed1b75b59c8666adbed2082 data/statues/loot_tables/blocks/mooshroom_statue.json +331698071251eb1e272c5aef187d6085d027831b data/statues/loot_tables/blocks/panda_angry_statue.json +b652c3af33c07206db2b57835a52f016d7ec0eb9 data/statues/loot_tables/blocks/panda_brown_statue.json +440baec9516928443284b6f8acc28a5d9ff1447d data/statues/loot_tables/blocks/panda_lazy_statue.json +225ac4f486ada01ccf284e84a95f5999af12382a data/statues/loot_tables/blocks/panda_normal_statue.json +cb2431c2d74b69eda24ab073aa8617b05ae23e8f data/statues/loot_tables/blocks/panda_playful_statue.json +f33309abdb316eff0e4d063aa3c76303578b2f09 data/statues/loot_tables/blocks/panda_weak_statue.json +c3cb52d30a78c1e039ef454a2a2ac46b9875887c data/statues/loot_tables/blocks/panda_worried_statue.json +77d4512a7fafe08cfd0732e77f7f7c97fcb6857c data/statues/loot_tables/blocks/pebble.json +892b0bb6954713782845e081315349c9bc7e67f0 data/statues/loot_tables/blocks/pig_statue.json +bd3bdbaf1319b1562295ac1981d41949b9231a3f data/statues/loot_tables/blocks/pillager_statue.json +f76a63a74c06c357476bed948a3ff67559b438bc data/statues/loot_tables/blocks/player_statue.json +9fe17fa06d6fbf9acd484659b832c6f0828ac222 data/statues/loot_tables/blocks/pufferfish_medium_statue.json +80895fecbfd53053184c6b54c4ab736e3d2413c7 data/statues/loot_tables/blocks/pufferfish_small_statue.json +4bd7a839a027b54f03ace313b4852738f68d64ea data/statues/loot_tables/blocks/pufferfish_statue.json +f212b2229ce095a1f1ec69a5aaa5806bc271f9a9 data/statues/loot_tables/blocks/rabbit_br_statue.json +682f49c046e8a34a492b1561b9793f8fe5c61ecc data/statues/loot_tables/blocks/rabbit_bs_statue.json +3198484cbe949d716bf697eebecbd814f54f7577 data/statues/loot_tables/blocks/rabbit_bw_statue.json +0ab5aaf1b66ba83642370cebed20f940ff38d845 data/statues/loot_tables/blocks/rabbit_go_statue.json +fd12a93e25470747fce51e238b4cbb0d50f7105c data/statues/loot_tables/blocks/rabbit_wh_statue.json +36e722ec73c2101e9ac6641efe39bb18463953f7 data/statues/loot_tables/blocks/rabbit_ws_statue.json +db4f8ea451d68c78063c498b2a2c2ea33b38bd9e data/statues/loot_tables/blocks/ravager_statue.json +64b22abeff0ca708c24381cf0d2fc51523f89924 data/statues/loot_tables/blocks/salmon_statue.json +ba2784f53f884aeeeb1f124f6d11d061257acc10 data/statues/loot_tables/blocks/sheep_shaven_statue.json +3178fa8e6df9f4094c907032a3e9e8f0ecef2fb5 data/statues/loot_tables/blocks/sheep_statue_black.json +a58d509516a7cb86bb48b8ce0792a432f56bbbb3 data/statues/loot_tables/blocks/sheep_statue_blue.json +723c56c05e82d033c0bf8b23ac61fb86e50ccdec data/statues/loot_tables/blocks/sheep_statue_brown.json +c3aa16c7bc98dc87ba4f02c9c6db85f5c856f5e1 data/statues/loot_tables/blocks/sheep_statue_cyan.json +2c8d1ff4c6ef7426632e3566cc3eea84cceccbef data/statues/loot_tables/blocks/sheep_statue_gray.json +829f2f8bbfac0a1109cfcadadc321dc2e5a7a3d4 data/statues/loot_tables/blocks/sheep_statue_green.json +0d5f146a98ca8eeec1e2661c906b9fdf161c8c01 data/statues/loot_tables/blocks/sheep_statue_light_blue.json +d2d1ab00d558725851473e0a0dba4b759dfb3b87 data/statues/loot_tables/blocks/sheep_statue_light_gray.json +4f8e1d88f4fffcfbb4c879aed529785e303646eb data/statues/loot_tables/blocks/sheep_statue_lime.json +0b58e3232362d5a312e6b3b0c63b2a02030012c7 data/statues/loot_tables/blocks/sheep_statue_magenta.json +996fcd0748485405835623f463e70549d9750225 data/statues/loot_tables/blocks/sheep_statue_orange.json +135d3fe4adef492ff8dd8bcb9292e02e6af99dad data/statues/loot_tables/blocks/sheep_statue_pink.json +c9ad48fe5147224eb6e1a7e3c0be3dc011dcadb9 data/statues/loot_tables/blocks/sheep_statue_purple.json +62122167e306fb1a39f157c8e80e9adf4bc01266 data/statues/loot_tables/blocks/sheep_statue_red.json +c87dba2df37bde8947eca27249a5e1b0a2bb98bc data/statues/loot_tables/blocks/sheep_statue_white.json +19d48fcae8c2cb6d25577e298cddf79ef86c05a6 data/statues/loot_tables/blocks/sheep_statue_yellow.json +0cf240b04ade2c20f580e90980326c68c56d9030 data/statues/loot_tables/blocks/shulker_statue.json +33ae312401b939c236afc2fa2138af36810bd402 data/statues/loot_tables/blocks/slabfish.json +8d7244c45b635a67b01cdc9c3c6ecf0397e5768e data/statues/loot_tables/blocks/slime_statue.json +ba7f600c6c673b712af89b72645a9a703dfb413a data/statues/loot_tables/blocks/snow_golem_statue.json +f0a4d592185f982c3a587c1c5ac249ce71e17247 data/statues/loot_tables/blocks/sombrero.json +45eeb4294aaba377ab08e75e2887b26a2b82395d data/statues/loot_tables/blocks/spider_statue.json +cf35046a070a18829d4eccca75fccd4e02987716 data/statues/loot_tables/blocks/squid_statue.json +ee72bf178985b610b1e2bf030d3a0fceeedcf879 data/statues/loot_tables/blocks/statue_table.json +a91ee3eee32f62efe5e3de39fcb8faf2fddf771e data/statues/loot_tables/blocks/totem_of_undying_statue.json +988563e2e7b9461670700ce439fab2b8ca5abd6f data/statues/loot_tables/blocks/trans_bee_statue.json +877f042708fd11c7d150a3dc3feb2de89b104c6a data/statues/loot_tables/blocks/tropibee.json +68ee54f35e233783c7e32978220265625a171ba5 data/statues/loot_tables/blocks/tropical_fish_b.json +62ad800a6c9378b44c97d3888305befb28ade5f2 data/statues/loot_tables/blocks/tropical_fish_bb.json +a4da0d8df24db40ddfbd405b6c045af645476516 data/statues/loot_tables/blocks/tropical_fish_be.json +f86c1d76a74d55ec8962f06da5e8788fdb52a3fd data/statues/loot_tables/blocks/tropical_fish_bm.json +a227e140661ccbf7c36d7c8be9045de9eff03ca0 data/statues/loot_tables/blocks/tropical_fish_bmb.json +80cf34af81d62bdefa1f575e11f9a5581240c6fd data/statues/loot_tables/blocks/tropical_fish_bms.json +ff666d18ffbbdcbba503e29327efefe933fd4788 data/statues/loot_tables/blocks/tropical_fish_e.json +b48d673d3b6a56260c02d22ceb44c9d2077aa716 data/statues/loot_tables/blocks/tropical_fish_es.json +ac01f9cbec62923ab2f6df184a3df4415b457742 data/statues/loot_tables/blocks/tropical_fish_hb.json +952136a41759e0f673579e7a87ed585d304965d6 data/statues/loot_tables/blocks/tropical_fish_sb.json +3dc3971eed7088234fd4da0719f34f10814dff2e data/statues/loot_tables/blocks/tropical_fish_sd.json +e89eda0facf4b7fb0eab4c57e0984aadc3f1ad47 data/statues/loot_tables/blocks/tropical_fish_ss.json +5c2f703e834623f64759f127e97203d2dceb52ba data/statues/loot_tables/blocks/turtle_statue.json +6098f22824b77d8f6f79f845cc16ea9b9ab99aed data/statues/loot_tables/blocks/villager_br_statue.json +b75e06b594a37cce323950ab772b22054ce3eff3 data/statues/loot_tables/blocks/villager_gr_statue.json +32e2c1806a7c347d193620816bd0ff06db557dfb data/statues/loot_tables/blocks/villager_pu_statue.json +c210d9b2c330d58105a3f0e0111e898b27c69780 data/statues/loot_tables/blocks/villager_wh_statue.json +26ff0a55c8d4bf5c5d928bc6a11de75811fea11d data/statues/loot_tables/blocks/vindicator_statue.json +81e881ac32ae385e25d217be928623275f1d53e4 data/statues/loot_tables/blocks/wasteland_statue.json +3ba5d2d71fa828cf1c273435ddd907fd12aee713 data/statues/loot_tables/blocks/witch_statue.json +a175b802c25582b751da3e4d78b7d712a529b6e0 data/statues/loot_tables/blocks/zombie_statue.json +b9237d4bff35d7fb6d012e41ea494dd09ea5a717 data/statues/loot_tables/entities/player_statue.json +647b4b5f464164e8c8627ae15bf7635cb5f9574f data/statues/loot_tables/entities/statue_bat.json diff --git a/src/generated/resources/.cache/5e9f99de52df90fff0eca2705b8d4af79b8c83be b/src/generated/resources/.cache/5e9f99de52df90fff0eca2705b8d4af79b8c83be index 6f5dc293..563f8eb7 100644 --- a/src/generated/resources/.cache/5e9f99de52df90fff0eca2705b8d4af79b8c83be +++ b/src/generated/resources/.cache/5e9f99de52df90fff0eca2705b8d4af79b8c83be @@ -1,2 +1,2 @@ -// 1.19.4 2023-06-15T20:10:58.3758509 Tags for minecraft:block mod id statues +// 1.20.1 2023-06-15T20:40:21.1775636 Tags for minecraft:block mod id statues 475043e52f9396367a8ae1de6aad6216ccc08cc9 data/statues/tags/blocks/statues.json diff --git a/src/generated/resources/.cache/62888ce2b9547abf000d004b13c12bacb5ffaca1 b/src/generated/resources/.cache/62888ce2b9547abf000d004b13c12bacb5ffaca1 index 043ff8db..277c49a0 100644 --- a/src/generated/resources/.cache/62888ce2b9547abf000d004b13c12bacb5ffaca1 +++ b/src/generated/resources/.cache/62888ce2b9547abf000d004b13c12bacb5ffaca1 @@ -1,4 +1,4 @@ -// 1.19.4 2023-06-15T20:10:58.3743504 Block States: statues +// 1.20.1 2023-06-15T20:40:21.1760633 Block States: statues 42d5ac316c690763e56b4fc0cab4ff995f42790a assets/statues/blockstates/angry_bee_statue.json edd0b469598a1cf3973bf7e1628a8d76c0da3de2 assets/statues/blockstates/azzaro.json 4595bf7d7bb1274b310630fa285bee98b9e6f6a0 assets/statues/blockstates/baby_zombie_statue.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 7ad4d8ba..6938888b 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 1.19.4 2023-06-15T20:10:58.376349 Sound Definitions +// 1.20.1 2023-06-15T20:40:21.1775636 Sound Definitions a13d81ffd6d8c2ca16d927669a4254399b64d01a assets/statues/sounds.json diff --git a/src/generated/resources/.cache/8fa013ccbf10434e23abe63f04d41f64f8518015 b/src/generated/resources/.cache/8fa013ccbf10434e23abe63f04d41f64f8518015 index 8f605396..ef35e38e 100644 --- a/src/generated/resources/.cache/8fa013ccbf10434e23abe63f04d41f64f8518015 +++ b/src/generated/resources/.cache/8fa013ccbf10434e23abe63f04d41f64f8518015 @@ -1,4 +1,4 @@ -// 1.19.4 2023-06-15T20:10:58.3723499 Tags for minecraft:item mod id statues +// 1.20.1 2023-06-15T20:40:21.1735633 Tags for minecraft:item mod id statues 95e966c60ff996797cf399bd7d3288140ba8cc6e data/curios/tags/items/statue.json a75022c454865d8cbe520ecf02bb8feeabf59d5b data/statues/tags/items/core.json e07ed81eb5155d98050f5996c68bbdaa8211b974 data/statues/tags/items/player_upgrade_item.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a562d61b..4fbf5382 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.4 2023-06-15T20:10:58.3738504 Recipes +// 1.20.1 2023-06-15T20:40:21.1750641 Recipes 28e80424f62a15d0cbd7d55cbc22050a9eca0ddb data/statues/recipes/display_stand_from_quartz_block_stonecutting.json a92a91507462bf36dd8d74c5d7e7437a7e12b5f1 data/statues/recipes/info_statue.json f291cdd7cfc9f72c7302a3f0577f65094f2bc4ea data/statues/recipes/loot/baby_zombie_statue.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 86846a53..e62f209a 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.19.4 2023-06-15T20:10:58.3753495 Languages: en_us +// 1.20.1 2023-06-15T20:40:21.1770633 Languages: en_us 18a72ff3d2361d8ce19fdac1eb093ebf71c537e0 assets/statues/lang/en_us.json diff --git a/src/generated/resources/.cache/d9ca59ae31ccf5a8a87a3f23307ff41b6ca77e97 b/src/generated/resources/.cache/d9ca59ae31ccf5a8a87a3f23307ff41b6ca77e97 index b42db119..21bcfdfa 100644 --- a/src/generated/resources/.cache/d9ca59ae31ccf5a8a87a3f23307ff41b6ca77e97 +++ b/src/generated/resources/.cache/d9ca59ae31ccf5a8a87a3f23307ff41b6ca77e97 @@ -1,4 +1,4 @@ -// 1.19.4 2023-06-15T20:10:58.3708498 Item Models: statues +// 1.20.1 2023-06-15T20:40:21.1695642 Item Models: statues 7b1e7d4cd383ce69a71bdb343872386329321241 assets/statues/models/item/angry_bee_statue.json b2c51440211df6f0290df32fe475c7b456feac89 assets/statues/models/item/azzaro.json 220dc7d6d76d1b849a3009cd36cd27574ba6c2cc assets/statues/models/item/baby_zombie_statue.json diff --git a/src/generated/resources/.cache/f83529e499d02003904562a2f999b81582975f80 b/src/generated/resources/.cache/f83529e499d02003904562a2f999b81582975f80 index 585b90ac..4aac836f 100644 --- a/src/generated/resources/.cache/f83529e499d02003904562a2f999b81582975f80 +++ b/src/generated/resources/.cache/f83529e499d02003904562a2f999b81582975f80 @@ -1,3 +1,3 @@ -// 1.19.4 2023-06-15T20:10:58.3723499 Global Loot Modifiers : statues +// 1.20.1 2023-06-15T20:40:21.1740636 Global Loot Modifiers : statues 17f55865f012eca3d2b5714c838177019a3bed2d data/forge/loot_modifiers/global_loot_modifiers.json 885c50fd928972f60491e7fc412c0faac3663dc3 data/statues/loot_modifiers/statues_loot.json diff --git a/src/generated/resources/data/statues/loot_tables/blocks/angry_bee_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/angry_bee_statue.json index 2e58fb0a..516f5e63 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/angry_bee_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/angry_bee_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/angry_bee_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/azzaro.json b/src/generated/resources/data/statues/loot_tables/blocks/azzaro.json index 2bdd18cc..5913c122 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/azzaro.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/azzaro.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/azzaro" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/baby_zombie_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/baby_zombie_statue.json index b6119634..6b8000cd 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/baby_zombie_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/baby_zombie_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/baby_zombie_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/bee_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/bee_statue.json index da9757ce..65b653fa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/bee_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/bee_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/bee_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/blaze_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/blaze_statue.json index aac3aed5..95b7e9fa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/blaze_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/blaze_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/blaze_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/brown_mooshroom_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/brown_mooshroom_statue.json index 95f9bdd2..86785288 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/brown_mooshroom_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/brown_mooshroom_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/brown_mooshroom_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/bumbo_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/bumbo_statue.json index f877077d..4ccbccf0 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/bumbo_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/bumbo_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/bumbo_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/campfire_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/campfire_statue.json index 2bd44115..c45dc5da 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/campfire_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/campfire_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/campfire_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_black_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_black_statue.json index e2399ae7..2ae6889d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_black_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_black_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_black_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_british_shorthair_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_british_shorthair_statue.json index 579dfebe..d77466bc 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_british_shorthair_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_british_shorthair_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_british_shorthair_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_calico_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_calico_statue.json index e01f68cb..bf35d94d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_calico_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_calico_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_calico_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_jellie_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_jellie_statue.json index 4a769a83..3457f50e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_jellie_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_jellie_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_jellie_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_persian_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_persian_statue.json index 35c66484..33bf025e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_persian_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_persian_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_persian_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_ragdoll_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_ragdoll_statue.json index df88a481..e6bbc275 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_ragdoll_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_ragdoll_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_ragdoll_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_red_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_red_statue.json index 6d29f1db..c5222e37 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_red_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_red_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_red_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_siamese_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_siamese_statue.json index 27e53fc0..5f05d3fc 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_siamese_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_siamese_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_siamese_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_tabby_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_tabby_statue.json index 0b4a06e7..31b33ac8 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_tabby_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_tabby_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_tabby_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_tuxedo_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_tuxedo_statue.json index a4d91c51..9e7467fa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_tuxedo_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_tuxedo_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_tuxedo_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cat_white_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cat_white_statue.json index c9cf048b..02b80f84 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cat_white_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cat_white_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cat_white_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/chicken_jockey_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/chicken_jockey_statue.json index c3e5df3e..45828f6a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/chicken_jockey_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/chicken_jockey_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/chicken_jockey_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/chicken_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/chicken_statue.json index d61585ab..c9658142 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/chicken_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/chicken_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/chicken_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cod_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cod_statue.json index 6ea0a470..717e9cf0 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cod_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cod_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cod_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/cow_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/cow_statue.json index 59d4ae71..ee8495e0 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/cow_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/cow_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/cow_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/creeper_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/creeper_statue.json index bf54b1a5..09c7ee14 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/creeper_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/creeper_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/creeper_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/detective_platypus_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/detective_platypus_statue.json index 1005b82b..bcb6eaf5 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/detective_platypus_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/detective_platypus_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/detective_platypus_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/display_stand.json b/src/generated/resources/data/statues/loot_tables/blocks/display_stand.json index 9c88def5..e6230287 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/display_stand.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/display_stand.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/display_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/dolphin_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/dolphin_statue.json index faec55ae..5401e0a2 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/dolphin_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/dolphin_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/dolphin_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/drowned_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/drowned_statue.json index 25a9c3f0..ca1797aa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/drowned_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/drowned_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/drowned_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/eagle_ray.json b/src/generated/resources/data/statues/loot_tables/blocks/eagle_ray.json index b3159067..001f529e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/eagle_ray.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/eagle_ray.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/eagle_ray" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/elder_guardian_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/elder_guardian_statue.json index 0c3d80d3..424a02a1 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/elder_guardian_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/elder_guardian_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/elder_guardian_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/enderman_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/enderman_statue.json index 7a75f526..a9751fa0 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/enderman_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/enderman_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/enderman_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/endermite_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/endermite_statue.json index b68c730b..5dc22338 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/endermite_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/endermite_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/endermite_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/evoker_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/evoker_statue.json index 24d902cb..ca0abc71 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/evoker_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/evoker_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/evoker_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/flood_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/flood_statue.json index 0a21ef49..5d9a9c52 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/flood_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/flood_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/flood_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/fox_snow_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/fox_snow_statue.json index 35702909..d7cd2237 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/fox_snow_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/fox_snow_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/fox_snow_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/fox_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/fox_statue.json index 6af9877a..fd954643 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/fox_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/fox_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/fox_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/ghast_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/ghast_statue.json index b14e3827..c18c7afd 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/ghast_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/ghast_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/ghast_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/guardian_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/guardian_statue.json index a4de0cd1..8778ee8d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/guardian_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/guardian_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/guardian_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/husk_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/husk_statue.json index a6ddb810..9dfdb0cc 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/husk_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/husk_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/husk_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/info_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/info_statue.json index 2b917825..4f8da7e6 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/info_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/info_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/info_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/king_cluck_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/king_cluck_statue.json index b016dca5..4aba1417 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/king_cluck_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/king_cluck_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/king_cluck_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/magma_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/magma_statue.json index 2f0eb713..2680e633 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/magma_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/magma_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/magma_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/mooshroom_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/mooshroom_statue.json index c52af152..f1ce98a2 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/mooshroom_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/mooshroom_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/mooshroom_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_angry_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_angry_statue.json index 68feecbb..bb895b76 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_angry_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_angry_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_angry_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_brown_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_brown_statue.json index cebbca09..cb941ad5 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_brown_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_brown_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_brown_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_lazy_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_lazy_statue.json index 65fde850..2ec62e7d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_lazy_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_lazy_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_lazy_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_normal_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_normal_statue.json index 0e7fd3e1..a9b1402b 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_normal_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_normal_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_normal_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_playful_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_playful_statue.json index f740e342..27871ccb 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_playful_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_playful_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_playful_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_weak_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_weak_statue.json index 0d50f91d..23ef8985 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_weak_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_weak_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_weak_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/panda_worried_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/panda_worried_statue.json index 38b05829..d04f96e8 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/panda_worried_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/panda_worried_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/panda_worried_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pebble.json b/src/generated/resources/data/statues/loot_tables/blocks/pebble.json index 0f7f907c..885b346b 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pebble.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pebble.json @@ -61,5 +61,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pebble" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pig_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/pig_statue.json index 896342f0..99a9c212 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pig_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pig_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pig_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pillager_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/pillager_statue.json index 82bc216d..7b0ef31e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pillager_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pillager_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pillager_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/player_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/player_statue.json index e4994c2a..5cbf4a60 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/player_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/player_statue.json @@ -22,5 +22,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/player_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_medium_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_medium_statue.json index 4f02c73d..98ebdf83 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_medium_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_medium_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pufferfish_medium_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_small_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_small_statue.json index 3fe1ee51..1bbd801d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_small_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_small_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pufferfish_small_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_statue.json index a2c052fc..5ef39541 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/pufferfish_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/pufferfish_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_br_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_br_statue.json index 7ec5890c..eed56baa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_br_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_br_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_br_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bs_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bs_statue.json index 8d1f6a75..342a6f63 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bs_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bs_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_bs_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bw_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bw_statue.json index ffd72005..74d6dd29 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bw_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_bw_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_bw_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_go_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_go_statue.json index 7e5b3315..45fafbdd 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_go_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_go_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_go_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_wh_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_wh_statue.json index 72781d1e..87f77b18 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_wh_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_wh_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_wh_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_ws_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_ws_statue.json index 04a2d499..277b6d34 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/rabbit_ws_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/rabbit_ws_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/rabbit_ws_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/ravager_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/ravager_statue.json index f9c59fc7..769316c9 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/ravager_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/ravager_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/ravager_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/salmon_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/salmon_statue.json index 7300e7d2..fb50177d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/salmon_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/salmon_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/salmon_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_shaven_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_shaven_statue.json index 0895c2ae..417a1002 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_shaven_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_shaven_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_shaven_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_black.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_black.json index c32cf2e2..018afee7 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_black.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_black.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_black" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_blue.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_blue.json index 0ebf8b59..2f0aa72f 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_blue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_blue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_blue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_brown.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_brown.json index 06112852..c3d71eb8 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_brown.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_brown.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_brown" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_cyan.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_cyan.json index 78d6544c..270d9f1a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_cyan.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_cyan.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_cyan" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_gray.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_gray.json index bc7b7e54..90613077 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_gray.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_gray.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_gray" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_green.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_green.json index 245b1d84..72ca5e3c 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_green.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_green.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_green" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_blue.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_blue.json index a4290331..0df256ce 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_blue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_blue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_light_blue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_gray.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_gray.json index 176d39bb..840c647c 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_gray.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_light_gray.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_light_gray" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_lime.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_lime.json index 45405571..b6bd755b 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_lime.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_lime.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_lime" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_magenta.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_magenta.json index 591a14f3..184055e1 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_magenta.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_magenta.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_magenta" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_orange.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_orange.json index 2ad9e63f..8062a947 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_orange.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_orange.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_orange" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_pink.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_pink.json index 12d10c1e..85e2cdd4 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_pink.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_pink.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_pink" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_purple.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_purple.json index 7ed715be..1e6c782d 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_purple.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_purple.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_purple" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_red.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_red.json index e9842c3c..60b885fc 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_red.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_red.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_red" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_white.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_white.json index b54bfff1..3461e796 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_white.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_white.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_white" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_yellow.json b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_yellow.json index d04beba5..403a9e22 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_yellow.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sheep_statue_yellow.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sheep_statue_yellow" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/shulker_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/shulker_statue.json index 06d21f55..2d40a5f2 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/shulker_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/shulker_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/shulker_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/slabfish.json b/src/generated/resources/data/statues/loot_tables/blocks/slabfish.json index 360bd196..c72a5752 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/slabfish.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/slabfish.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/slabfish" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/slime_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/slime_statue.json index cb542109..05135830 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/slime_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/slime_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/slime_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/snow_golem_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/snow_golem_statue.json index 67e7b955..b13bf3f8 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/snow_golem_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/snow_golem_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/snow_golem_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/sombrero.json b/src/generated/resources/data/statues/loot_tables/blocks/sombrero.json index e0713009..dfc3e419 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/sombrero.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/sombrero.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/sombrero" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/spider_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/spider_statue.json index f2dc4403..9390d87e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/spider_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/spider_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/spider_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/squid_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/squid_statue.json index 5cce1b4e..8e8daf2c 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/squid_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/squid_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/squid_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/statue_table.json b/src/generated/resources/data/statues/loot_tables/blocks/statue_table.json index 4477e1fa..2f518d4a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/statue_table.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/statue_table.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/statue_table" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/totem_of_undying_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/totem_of_undying_statue.json index 2b35ff56..9ffc6d62 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/totem_of_undying_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/totem_of_undying_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/totem_of_undying_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/trans_bee_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/trans_bee_statue.json index 2255a21b..fae1d0de 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/trans_bee_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/trans_bee_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/trans_bee_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropibee.json b/src/generated/resources/data/statues/loot_tables/blocks/tropibee.json index 62dea37e..e0842c16 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropibee.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropibee.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropibee" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_b.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_b.json index e9fa80dc..7d4bf7ec 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_b.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_b.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_b" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bb.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bb.json index 8627c06f..eda8fd62 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bb.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bb.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_bb" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_be.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_be.json index 7499a1fa..268c1281 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_be.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_be.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_be" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bm.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bm.json index 738db74a..acf48846 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bm.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bm.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_bm" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bmb.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bmb.json index b463a55f..14ba7f57 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bmb.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bmb.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_bmb" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bms.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bms.json index 27b1d0df..c98ea2fb 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bms.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_bms.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_bms" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_e.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_e.json index 57a9515b..c454c55a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_e.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_e.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_e" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_es.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_es.json index 7d65cb67..b06ce15c 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_es.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_es.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_es" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_hb.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_hb.json index 3ac8cd5d..13411570 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_hb.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_hb.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_hb" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sb.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sb.json index fe75644c..1012e65a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sb.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sb.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_sb" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sd.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sd.json index b70e5c1b..5a7de9f3 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sd.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_sd.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_sd" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_ss.json b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_ss.json index f76ae935..87325bfd 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_ss.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/tropical_fish_ss.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/tropical_fish_ss" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/turtle_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/turtle_statue.json index 56cc5883..f88956fa 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/turtle_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/turtle_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/turtle_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/villager_br_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/villager_br_statue.json index 5234b84d..de5a6f56 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/villager_br_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/villager_br_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/villager_br_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/villager_gr_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/villager_gr_statue.json index 24665628..80059279 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/villager_gr_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/villager_gr_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/villager_gr_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/villager_pu_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/villager_pu_statue.json index 7d5240ac..24922e3a 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/villager_pu_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/villager_pu_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/villager_pu_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/villager_wh_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/villager_wh_statue.json index 872bef5b..5427e57e 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/villager_wh_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/villager_wh_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/villager_wh_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/vindicator_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/vindicator_statue.json index b1c9f934..bb72874c 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/vindicator_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/vindicator_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/vindicator_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/wasteland_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/wasteland_statue.json index cb5c5e15..c9204b29 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/wasteland_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/wasteland_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/wasteland_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/witch_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/witch_statue.json index c83100b7..47c876f7 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/witch_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/witch_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/witch_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/blocks/zombie_statue.json b/src/generated/resources/data/statues/loot_tables/blocks/zombie_statue.json index 037e2922..c6a2fb7f 100644 --- a/src/generated/resources/data/statues/loot_tables/blocks/zombie_statue.json +++ b/src/generated/resources/data/statues/loot_tables/blocks/zombie_statue.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:blocks/zombie_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/entities/player_statue.json b/src/generated/resources/data/statues/loot_tables/entities/player_statue.json index 6aedd7fa..9e8ca480 100644 --- a/src/generated/resources/data/statues/loot_tables/entities/player_statue.json +++ b/src/generated/resources/data/statues/loot_tables/entities/player_statue.json @@ -27,5 +27,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:entities/player_statue" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/loot_tables/entities/statue_bat.json b/src/generated/resources/data/statues/loot_tables/entities/statue_bat.json index 85b9c2f9..7f7c06c2 100644 --- a/src/generated/resources/data/statues/loot_tables/entities/statue_bat.json +++ b/src/generated/resources/data/statues/loot_tables/entities/statue_bat.json @@ -23,5 +23,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "statues:entities/statue_bat" } \ No newline at end of file diff --git a/src/generated/resources/data/statues/tags/worldgen/biome/can_spawn_statue_bat.json b/src/generated/resources/data/statues/tags/worldgen/biome/can_spawn_statue_bat.json index 3c7079b6..321b23bd 100644 --- a/src/generated/resources/data/statues/tags/worldgen/biome/can_spawn_statue_bat.json +++ b/src/generated/resources/data/statues/tags/worldgen/biome/can_spawn_statue_bat.json @@ -47,6 +47,7 @@ "minecraft:bamboo_jungle", "minecraft:eroded_badlands", "minecraft:windswept_savanna", + "minecraft:cherry_grove", "minecraft:frozen_peaks", "minecraft:dripstone_caves", "minecraft:lush_caves" diff --git a/src/main/java/com/shynieke/statues/Statues.java b/src/main/java/com/shynieke/statues/Statues.java index 170f5557..4d0c69c3 100644 --- a/src/main/java/com/shynieke/statues/Statues.java +++ b/src/main/java/com/shynieke/statues/Statues.java @@ -17,7 +17,6 @@ import com.shynieke.statues.registry.StatueRegistry; import com.shynieke.statues.registry.StatueSerializers; import com.shynieke.statues.registry.StatueSounds; -import com.shynieke.statues.registry.StatueTabs; import net.minecraft.server.MinecraftServer; import net.minecraft.server.players.GameProfileCache; import net.minecraftforge.api.distmarker.Dist; @@ -50,6 +49,7 @@ public Statues() { StatueRegistry.ENTITIES.register(eventBus); StatueRegistry.BLOCKS.register(eventBus); StatueRegistry.ITEMS.register(eventBus); + StatueRegistry.CREATIVE_MODE_TABS.register(eventBus); StatueRegistry.MENU_TYPES.register(eventBus); StatueBlockEntities.BLOCK_ENTITIES.register(eventBus); StatueSounds.SOUND_EVENTS.register(eventBus); @@ -57,7 +57,6 @@ public Statues() { StatuesRecipes.RECIPE_SERIALIZERS.register(eventBus); StatueLootModifiers.GLM.register(eventBus); - eventBus.register(new StatueTabs()); eventBus.addListener(StatueEntities::registerEntityAttributes); eventBus.addListener(StatueEntities::registerSpawnPlacements); diff --git a/src/main/java/com/shynieke/statues/blocks/AbstractStatueBase.java b/src/main/java/com/shynieke/statues/blocks/AbstractStatueBase.java index 722e76ea..d6c981d2 100644 --- a/src/main/java/com/shynieke/statues/blocks/AbstractStatueBase.java +++ b/src/main/java/com/shynieke/statues/blocks/AbstractStatueBase.java @@ -26,7 +26,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -132,7 +132,7 @@ public void playerWillDestroy(Level level, BlockPos pos, BlockState state, Playe } @Override - public List getDrops(BlockState state, LootContext.Builder builder) { + public List getDrops(BlockState state, LootParams.Builder builder) { if (state.getValue(INTERACTIVE)) { return new ArrayList<>(); } diff --git a/src/main/java/com/shynieke/statues/blocks/statues/PlayerStatueBlock.java b/src/main/java/com/shynieke/statues/blocks/statues/PlayerStatueBlock.java index 9a8e6479..acccfbd9 100644 --- a/src/main/java/com/shynieke/statues/blocks/statues/PlayerStatueBlock.java +++ b/src/main/java/com/shynieke/statues/blocks/statues/PlayerStatueBlock.java @@ -38,7 +38,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.SignalGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Mirror; @@ -257,7 +257,7 @@ public boolean isSignalSource(BlockState state) { } @Override - public boolean shouldCheckWeakPower(BlockState state, LevelReader level, BlockPos pos, Direction side) { + public boolean shouldCheckWeakPower(BlockState state, SignalGetter level, BlockPos pos, Direction side) { return false; } @@ -293,7 +293,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player CompoundTag locationTag = new CompoundTag(); Player player = level.getPlayerByUUID(tileProfile.getId()); - if (player != null && player.level.dimension().location().equals(playerIn.level.dimension().location())) { + if (player != null && player.level().dimension().location().equals(playerIn.level().dimension().location())) { BlockPos playerPos = player.blockPosition(); locationTag.putLong("lastPlayerLocation", playerPos.asLong()); locationTag.putString("playerTracking", tileProfile.getName()); diff --git a/src/main/java/com/shynieke/statues/blocks/statues/RabbitStatueBlock.java b/src/main/java/com/shynieke/statues/blocks/statues/RabbitStatueBlock.java index dd3aee64..4ae13370 100644 --- a/src/main/java/com/shynieke/statues/blocks/statues/RabbitStatueBlock.java +++ b/src/main/java/com/shynieke/statues/blocks/statues/RabbitStatueBlock.java @@ -33,7 +33,7 @@ public SoundEvent getSound(BlockState state) { @Override public LivingEntity adjustSpawnedEntity(LivingEntity livingEntity) { - if (livingEntity instanceof Rabbit rabbit && rabbit.level.random.nextDouble() < 0.2) { + if (livingEntity instanceof Rabbit rabbit && rabbit.level().random.nextDouble() < 0.2) { rabbit.setVariant(Rabbit.Variant.EVIL); return rabbit; } diff --git a/src/main/java/com/shynieke/statues/client/ClientHandler.java b/src/main/java/com/shynieke/statues/client/ClientHandler.java index a776c561..fddea1b0 100644 --- a/src/main/java/com/shynieke/statues/client/ClientHandler.java +++ b/src/main/java/com/shynieke/statues/client/ClientHandler.java @@ -75,8 +75,8 @@ public float unclampedCall(ItemStack stack, @Nullable ClientLevel level, @Nullab if (entity == null) { return 0.0F; } else { - if (level == null && entity.level instanceof ClientLevel) { - level = (ClientLevel) entity.level; + if (level == null && entity.level() instanceof ClientLevel) { + level = (ClientLevel) entity.level(); } if (level != null) { BlockPos blockpos = this.getWorldPos(level); diff --git a/src/main/java/com/shynieke/statues/client/render/PlayerStatueRenderer.java b/src/main/java/com/shynieke/statues/client/render/PlayerStatueRenderer.java index 8c7b4835..c259f30f 100644 --- a/src/main/java/com/shynieke/statues/client/render/PlayerStatueRenderer.java +++ b/src/main/java/com/shynieke/statues/client/render/PlayerStatueRenderer.java @@ -88,7 +88,7 @@ protected boolean shouldShowName(PlayerStatue playerStatue) { protected void setupRotations(PlayerStatue playerStatue, PoseStack poseStack, float ageInTicks, float rotationYaw, float partialTicks) { poseStack.mulPose(Axis.YP.rotationDegrees(180.0F - rotationYaw)); - float f = (float) (playerStatue.level.getGameTime() - playerStatue.punchCooldown) + partialTicks; + float f = (float) (playerStatue.level().getGameTime() - playerStatue.punchCooldown) + partialTicks; if (f < 5.0F) { poseStack.mulPose(Axis.YP.rotationDegrees(Mth.sin(f / 1.5F * (float) Math.PI) * 3.0F)); } diff --git a/src/main/java/com/shynieke/statues/client/screen/PlayerPoseScreen.java b/src/main/java/com/shynieke/statues/client/screen/PlayerPoseScreen.java index 38e520d6..86a3b371 100644 --- a/src/main/java/com/shynieke/statues/client/screen/PlayerPoseScreen.java +++ b/src/main/java/com/shynieke/statues/client/screen/PlayerPoseScreen.java @@ -1,6 +1,5 @@ package com.shynieke.statues.client.screen; -import com.mojang.blaze3d.vertex.PoseStack; import com.shynieke.statues.Reference; import com.shynieke.statues.client.screen.widget.DecimalNumberFieldBox; import com.shynieke.statues.client.screen.widget.EnumCycleButton; @@ -12,6 +11,7 @@ import com.shynieke.statues.network.message.PlayerStatueSyncMessage; import net.minecraft.client.GameNarrator; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; @@ -185,18 +185,19 @@ public void onClose() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(poseStack); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); // Draw gui title - drawCenteredString(poseStack, this.font, I18n.get(String.format("%s.playerstatue.gui.title", Reference.MOD_ID)), this.width / 2, 20, 0xFFFFFF); + guiGraphics.drawCenteredString(font, I18n.get(String.format("%s.playerstatue.gui.title", Reference.MOD_ID)), + this.width / 2, 20, 0xFFFFFF); // Draw textboxes - this.rotationTextField.render(poseStack, mouseX, mouseY, partialTicks); - this.YOffsetTextField.render(poseStack, mouseX, mouseY, partialTicks); + this.rotationTextField.render(guiGraphics, mouseX, mouseY, partialTicks); + this.YOffsetTextField.render(guiGraphics, mouseX, mouseY, partialTicks); for (NumberFieldBox textField : this.poseTextFields) if (textField != null) { - textField.render(poseStack, mouseX, mouseY, partialTicks); + textField.render(guiGraphics, mouseX, mouseY, partialTicks); } int offsetY = 50; @@ -206,23 +207,23 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic for (int i = 0; i < this.buttonLabels.length; i++) { int x = offsetX; int y = offsetY + (i * 22) + (11 - (this.font.lineHeight / 2)); - drawString(poseStack, this.font, this.buttonLabels[i], x, y, 0xA0A0A0); + guiGraphics.drawString(font, this.buttonLabels[i], x, y, 0xA0A0A0, false); } // right column labels offsetX = this.width - 20 - 100; // x, y, z - drawString(poseStack, this.font, "X", offsetX, 37, 0xA0A0A0); - drawString(poseStack, this.font, "Y", offsetX + (35), 37, 0xA0A0A0); - drawString(poseStack, this.font, "Z", offsetX + (2 * 35), 37, 0xA0A0A0); + guiGraphics.drawString(font, "X", offsetX, 37, 0xA0A0A0, false); + guiGraphics.drawString(font, "Y", offsetX + (35), 37, 0xA0A0A0, false); + guiGraphics.drawString(font, "Z", offsetX + (2 * 35), 37, 0xA0A0A0, false); // pose textboxes for (int i = 0; i < this.sliderLabels.length; i++) { int x = offsetX - this.font.width(this.sliderLabels[i]) - 10; int y = offsetY + (i * 22) + (10 - (this.font.lineHeight / 2)); - drawString(poseStack, this.font, this.sliderLabels[i], x, y, 0xA0A0A0); + guiGraphics.drawString(font, this.sliderLabels[i], x, y, 0xA0A0A0, false); } - super.render(poseStack, mouseX, mouseY, partialTicks); + super.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/com/shynieke/statues/client/screen/ShulkerStatueScreen.java b/src/main/java/com/shynieke/statues/client/screen/ShulkerStatueScreen.java index 6187ad04..671c029b 100644 --- a/src/main/java/com/shynieke/statues/client/screen/ShulkerStatueScreen.java +++ b/src/main/java/com/shynieke/statues/client/screen/ShulkerStatueScreen.java @@ -1,9 +1,8 @@ package com.shynieke.statues.client.screen; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.shynieke.statues.Reference; import com.shynieke.statues.menu.ShulkerStatueMenu; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -29,16 +28,15 @@ protected void containerTick() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(poseStack); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); - super.render(poseStack, mouseX, mouseY, partialTicks); - this.renderTooltip(poseStack, mouseX, mouseY); + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderTooltip(guiGraphics, mouseX, mouseY); } @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int x, int y) { - RenderSystem.setShaderTexture(0, TEXTURE); - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int x, int y) { + guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); } } \ No newline at end of file diff --git a/src/main/java/com/shynieke/statues/client/screen/StatueTableScreen.java b/src/main/java/com/shynieke/statues/client/screen/StatueTableScreen.java index 63efefec..c951212e 100644 --- a/src/main/java/com/shynieke/statues/client/screen/StatueTableScreen.java +++ b/src/main/java/com/shynieke/statues/client/screen/StatueTableScreen.java @@ -1,12 +1,11 @@ package com.shynieke.statues.client.screen; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.shynieke.statues.Reference; import com.shynieke.statues.menu.StatueTableMenu; import com.shynieke.statues.network.StatuesNetworking; import com.shynieke.statues.network.message.StatueTableMessage; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; @@ -50,21 +49,20 @@ protected void containerTick() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(poseStack); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); - super.render(poseStack, mouseX, mouseY, partialTicks); - this.renderTooltip(poseStack, mouseX, mouseY); + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderTooltip(guiGraphics, mouseX, mouseY); } @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int x, int y) { - RenderSystem.setShaderTexture(0, TEXTURE); - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int x, int y) { + guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); } @Override - protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) { + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { int actualMouseX = mouseX - ((this.width - this.imageWidth) / 2); int actualMouseY = mouseY - ((this.height - this.imageHeight) / 2); @@ -77,7 +75,7 @@ protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) { text.add(Component.translatable("gui.statues.statue_table.invalid_recipe.tooltip") .withStyle(ChatFormatting.RED)); } - renderComponentTooltip(poseStack, text, actualMouseX, actualMouseY); + guiGraphics.renderComponentTooltip(font, text, actualMouseX, actualMouseY); } } } \ No newline at end of file diff --git a/src/main/java/com/shynieke/statues/compat/jei/category/LootCategory.java b/src/main/java/com/shynieke/statues/compat/jei/category/LootCategory.java index dab511ba..c668f256 100644 --- a/src/main/java/com/shynieke/statues/compat/jei/category/LootCategory.java +++ b/src/main/java/com/shynieke/statues/compat/jei/category/LootCategory.java @@ -1,6 +1,5 @@ package com.shynieke.statues.compat.jei.category; -import com.mojang.blaze3d.vertex.PoseStack; import com.shynieke.statues.compat.jei.JEIPlugin; import com.shynieke.statues.recipe.LootRecipe; import com.shynieke.statues.registry.StatueRegistry; @@ -15,6 +14,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; @@ -63,14 +63,14 @@ public void setRecipe(IRecipeLayoutBuilder builder, LootRecipe recipe, IFocusGro } @Override - public void draw(LootRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { - IRecipeCategory.super.draw(recipe, recipeSlotsView, stack, mouseX, mouseY); + public void draw(LootRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { + IRecipeCategory.super.draw(recipe, recipeSlotsView, guiGraphics, mouseX, mouseY); Minecraft minecraft = Minecraft.getInstance(); Font font = minecraft.font; - font.draw(stack, Component.literal((int) (100 * recipe.getChance1()) + "%"), 74, 8, 0); - font.draw(stack, Component.literal((int) (100 * recipe.getChance2()) + "%"), 74, 27, 0); - font.draw(stack, Component.literal((int) (100 * recipe.getChance3()) + "%"), 74, 45, 0); + guiGraphics.drawString(font, Component.literal((int) (100 * recipe.getChance1()) + "%"), 74, 8, 0, false); + guiGraphics.drawString(font, Component.literal((int) (100 * recipe.getChance2()) + "%"), 74, 27, 0, false); + guiGraphics.drawString(font, Component.literal((int) (100 * recipe.getChance3()) + "%"), 74, 45, 0, false); } @Override diff --git a/src/main/java/com/shynieke/statues/compat/jei/category/UpgradeCategory.java b/src/main/java/com/shynieke/statues/compat/jei/category/UpgradeCategory.java index 91bd6e0d..31d0f4a4 100644 --- a/src/main/java/com/shynieke/statues/compat/jei/category/UpgradeCategory.java +++ b/src/main/java/com/shynieke/statues/compat/jei/category/UpgradeCategory.java @@ -1,6 +1,5 @@ package com.shynieke.statues.compat.jei.category; -import com.mojang.blaze3d.vertex.PoseStack; import com.shynieke.statues.Reference; import com.shynieke.statues.compat.jei.JEIPlugin; import com.shynieke.statues.recipe.UpgradeRecipe; @@ -18,6 +17,7 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; @@ -172,8 +172,8 @@ private void setUpgradeSlots(ItemStack stack, int count) { } @Override - public void draw(UpgradeRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { - IRecipeCategory.super.draw(recipe, recipeSlotsView, stack, mouseX, mouseY); + public void draw(UpgradeRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { + IRecipeCategory.super.draw(recipe, recipeSlotsView, guiGraphics, mouseX, mouseY); } @Override diff --git a/src/main/java/com/shynieke/statues/compat/patchouli/PatchouliCompat.java b/src/main/java/com/shynieke/statues/compat/patchouli/PatchouliCompat.java index dbf20876..a66fd68d 100644 --- a/src/main/java/com/shynieke/statues/compat/patchouli/PatchouliCompat.java +++ b/src/main/java/com/shynieke/statues/compat/patchouli/PatchouliCompat.java @@ -19,7 +19,7 @@ public static void convertBook(Player playerIn) { ItemStack patchouliBook = new ItemStack(guideBook); CompoundTag tag = patchouliBook.getOrCreateTag(); tag.putString("patchouli:book", "statues:statues"); - Level level = playerIn.level; + Level level = playerIn.level(); if (!playerIn.addItem(patchouliBook)) { level.addFreshEntity(new ItemEntity(level, playerIn.getX(), playerIn.getY(), playerIn.getZ(), patchouliBook)); } diff --git a/src/main/java/com/shynieke/statues/datagen/StatuesDataGenerator.java b/src/main/java/com/shynieke/statues/datagen/StatuesDataGenerator.java index e629511b..154fc086 100644 --- a/src/main/java/com/shynieke/statues/datagen/StatuesDataGenerator.java +++ b/src/main/java/com/shynieke/statues/datagen/StatuesDataGenerator.java @@ -12,7 +12,6 @@ import com.shynieke.statues.datagen.server.StatueItemTagProvider; import com.shynieke.statues.datagen.server.StatueLootProvider; import com.shynieke.statues.datagen.server.StatueRecipeProvider; -import com.shynieke.statues.datagen.server.patchouli.StatuePatchouliProvider; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistrySetBuilder; @@ -48,7 +47,7 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(event.includeServer(), new StatueItemTagProvider(packOutput, lookupProvider, blockTags, helper)); generator.addProvider(event.includeServer(), new StatueBiomeTagProvider(packOutput, lookupProvider, helper)); generator.addProvider(event.includeServer(), new StatueGLMProvider(packOutput)); - generator.addProvider(event.includeServer(), new StatuePatchouliProvider(packOutput)); +// generator.addProvider(event.includeServer(), new StatuePatchouliProvider(packOutput)); TODO: Re-enable once 1.20 Patchouli is available and I've updated PatchouliProvider generator.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider( packOutput, CompletableFuture.supplyAsync(StatuesDataGenerator::getProvider), Set.of(Reference.MOD_ID))); diff --git a/src/main/java/com/shynieke/statues/datagen/server/StatueLootProvider.java b/src/main/java/com/shynieke/statues/datagen/server/StatueLootProvider.java index d8a9482e..328cf05a 100644 --- a/src/main/java/com/shynieke/statues/datagen/server/StatueLootProvider.java +++ b/src/main/java/com/shynieke/statues/datagen/server/StatueLootProvider.java @@ -14,7 +14,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.LootTables; import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; @@ -38,7 +37,7 @@ public StatueLootProvider(PackOutput packOutput) { @Override protected void validate(Map map, ValidationContext validationtracker) { - map.forEach((name, table) -> LootTables.validate(validationtracker, name, table)); + map.forEach((name, table) -> table.validate(validationtracker)); } private static class StatueBlocks extends BlockLootSubProvider { diff --git a/src/main/java/com/shynieke/statues/datagen/server/patchouli/StatuePatchouliProvider.java b/src/main/java/com/shynieke/statues/datagen/server/patchouli/StatuePatchouliProvider.java index 3698e1c5..008db381 100644 --- a/src/main/java/com/shynieke/statues/datagen/server/patchouli/StatuePatchouliProvider.java +++ b/src/main/java/com/shynieke/statues/datagen/server/patchouli/StatuePatchouliProvider.java @@ -1,65 +1,65 @@ -package com.shynieke.statues.datagen.server.patchouli; - -import com.shynieke.statues.Reference; -import com.shynieke.statues.registry.StatueRegistry; -import net.minecraft.data.PackOutput; -import net.minecraft.world.item.ItemStack; -import xyz.brassgoggledcoders.patchouliprovider.BookBuilder; -import xyz.brassgoggledcoders.patchouliprovider.PatchouliBookProvider; - -import java.util.function.Consumer; - -public class StatuePatchouliProvider extends PatchouliBookProvider { - public StatuePatchouliProvider(PackOutput output) { - super(output, Reference.MOD_ID, "en_us"); - } - - @Override - protected void addBooks(Consumer consumer) { - BookBuilder bookBuilder = createBookBuilder("statues", - "info.statues.book.name", "info.statues.book.landing") - .setSubtitle("info.statues.book.subtitle") - .setCreativeTab("statues.items") - .setModel("patchouli:book_gray") - .setBookTexture("patchouli:textures/gui/book_gray.png") - .setShowProgress(false) - .setUseBlockyFont(true) - .setI18n(true) - .addMacro("$(item)", "$(#c47567)") - .setUseResourcePack(true); //Datapack support is being deprecated in 1.19.4 to be removed - - //Info category - bookBuilder = bookBuilder.addCategory("info", "info.statues.book.info.name", - "info.statues.book.info.desc", "statues:info_statue") - - //Add Statue Core entry - .addEntry("info/core", "info.statues.book.core.entry.name", StatueRegistry.STATUE_CORE.getId().toString()) - .addTextPage("info.statues.book.core.text1").build() - .addEntityPage("statues:statue_bat").build() - .addSpotlightPage(new ItemStack(StatueRegistry.STATUE_CORE.get())).build() - .build() - - //Add S.T.A.T.U.E. entry - .addEntry("info/statue_table", "info.statues.book.statue_table.entry.name", StatueRegistry.STATUE_TABLE.getId().toString()) - .addTextPage("info.statues.book.statue_table.text1").build() - .addSpotlightPage(new ItemStack(StatueRegistry.STATUE_TABLE.get())).build() - .build() - - //Add Upgrading entry - .addEntry("info/upgrading", "info.statues.book.upgrading.entry.name", StatueRegistry.SLIME_STATUE.getId().toString()) - .addTextPage("info.statues.book.upgrading.text1").build() - .addTextPage("info.statues.book.upgrading.text2").build() - .addTextPage("info.statues.book.upgrading.text3").build() - .addTextPage("info.statues.book.upgrading.text4").build() - .addTextPage("info.statues.book.upgrading.text5").build() - .addTextPage("info.statues.book.upgrading.text6").build() - .addTextPage("info.statues.book.upgrading.text7").build() - .build() - - .build(); //Back to the bookbuilder - - - //Finish book - bookBuilder.build(consumer); - } -} +//package com.shynieke.statues.datagen.server.patchouli; +// +//import com.shynieke.statues.Reference; +//import com.shynieke.statues.registry.StatueRegistry; +//import net.minecraft.data.PackOutput; +//import net.minecraft.world.item.ItemStack; +//import xyz.brassgoggledcoders.patchouliprovider.BookBuilder; +//import xyz.brassgoggledcoders.patchouliprovider.PatchouliBookProvider; +// +//import java.util.function.Consumer; +// +//public class StatuePatchouliProvider extends PatchouliBookProvider { +// public StatuePatchouliProvider(PackOutput output) { +// super(output, Reference.MOD_ID, "en_us"); +// } +// +// @Override +// protected void addBooks(Consumer consumer) { +// BookBuilder bookBuilder = createBookBuilder("statues", +// "info.statues.book.name", "info.statues.book.landing") +// .setSubtitle("info.statues.book.subtitle") +// .setCreativeTab("statues.items") +// .setModel("patchouli:book_gray") +// .setBookTexture("patchouli:textures/gui/book_gray.png") +// .setShowProgress(false) +// .setUseBlockyFont(true) +// .setI18n(true) +// .addMacro("$(item)", "$(#c47567)") +// .setUseResourcePack(true); //Datapack support is being deprecated in 1.19.4 to be removed +// +// //Info category +// bookBuilder = bookBuilder.addCategory("info", "info.statues.book.info.name", +// "info.statues.book.info.desc", "statues:info_statue") +// +// //Add Statue Core entry +// .addEntry("info/core", "info.statues.book.core.entry.name", StatueRegistry.STATUE_CORE.getId().toString()) +// .addTextPage("info.statues.book.core.text1").build() +// .addEntityPage("statues:statue_bat").build() +// .addSpotlightPage(new ItemStack(StatueRegistry.STATUE_CORE.get())).build() +// .build() +// +// //Add S.T.A.T.U.E. entry +// .addEntry("info/statue_table", "info.statues.book.statue_table.entry.name", StatueRegistry.STATUE_TABLE.getId().toString()) +// .addTextPage("info.statues.book.statue_table.text1").build() +// .addSpotlightPage(new ItemStack(StatueRegistry.STATUE_TABLE.get())).build() +// .build() +// +// //Add Upgrading entry +// .addEntry("info/upgrading", "info.statues.book.upgrading.entry.name", StatueRegistry.SLIME_STATUE.getId().toString()) +// .addTextPage("info.statues.book.upgrading.text1").build() +// .addTextPage("info.statues.book.upgrading.text2").build() +// .addTextPage("info.statues.book.upgrading.text3").build() +// .addTextPage("info.statues.book.upgrading.text4").build() +// .addTextPage("info.statues.book.upgrading.text5").build() +// .addTextPage("info.statues.book.upgrading.text6").build() +// .addTextPage("info.statues.book.upgrading.text7").build() +// .build() +// +// .build(); //Back to the bookbuilder +// +// +// //Finish book +// bookBuilder.build(consumer); +// } +//} diff --git a/src/main/java/com/shynieke/statues/entity/PlayerStatue.java b/src/main/java/com/shynieke/statues/entity/PlayerStatue.java index 80c42aa4..b2f12185 100644 --- a/src/main/java/com/shynieke/statues/entity/PlayerStatue.java +++ b/src/main/java/com/shynieke/statues/entity/PlayerStatue.java @@ -177,7 +177,7 @@ public void setGameProfile(GameProfile playerProfile) { synchronized (this) { getGameProfile().ifPresent(profile -> { - if (this.level != null && this.level.isClientSide && profile != null && profile.isComplete()) { + if (this.level != null && this.level().isClientSide && profile != null && profile.isComplete()) { Minecraft.getInstance().getSkinManager().registerSkins(profile, (textureType, textureLocation, profileTexture) -> { if (textureType.equals(MinecraftProfileTexture.Type.SKIN)) { String metadata = profileTexture.getMetadata("model"); @@ -557,8 +557,8 @@ public boolean isInvulnerableTo(DamageSource source) { * Called when the entity is attacked. */ public boolean hurt(DamageSource source, float amount) { - if (!this.level.isClientSide && !this.isRemoved()) { - if (damageSources().outOfWorld().equals(source)) { + if (!this.level().isClientSide && !this.isRemoved()) { + if (source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { this.remove(RemovalReason.DISCARDED); return false; } else if (!this.isInvulnerableTo(source)) { @@ -591,9 +591,9 @@ public boolean hurt(DamageSource source, float amount) { this.remove(RemovalReason.KILLED); return flag1; } else { - long i = this.level.getGameTime(); + long i = this.level().getGameTime(); if (i - this.punchCooldown > 5L && !flag) { - this.level.broadcastEntityEvent(this, (byte) 32); + this.level().broadcastEntityEvent(this, (byte) 32); this.punchCooldown = i; } else { this.breakPlayerStatue(source); @@ -615,9 +615,9 @@ public boolean hurt(DamageSource source, float amount) { @OnlyIn(Dist.CLIENT) public void handleEntityEvent(byte id) { if (id == 32) { - if (this.level.isClientSide) { - this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.ARMOR_STAND_HIT, this.getSoundSource(), 0.3F, 1.0F, false); - this.punchCooldown = this.level.getGameTime(); + if (this.level().isClientSide) { + this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.ARMOR_STAND_HIT, this.getSoundSource(), 0.3F, 1.0F, false); + this.punchCooldown = this.level().getGameTime(); } } else { super.handleEntityEvent(id); @@ -640,8 +640,8 @@ public boolean shouldRenderAtSqrDistance(double distance) { } private void playParticles() { - if (this.level instanceof ServerLevel) { - ((ServerLevel) this.level).sendParticles(new BlockParticleOption(ParticleTypes.BLOCK, StatueRegistry.PLAYER_STATUE.get().defaultBlockState()), this.getX(), this.getY(0.6666666666666666D), this.getZ(), 10, (double) (this.getBbWidth() / 4.0F), (double) (this.getBbHeight() / 4.0F), (double) (this.getBbWidth() / 4.0F), 0.05D); + if (this.level() instanceof ServerLevel) { + ((ServerLevel) this.level()).sendParticles(new BlockParticleOption(ParticleTypes.BLOCK, StatueRegistry.PLAYER_STATUE.get().defaultBlockState()), this.getX(), this.getY(0.6666666666666666D), this.getZ(), 10, (double) (this.getBbWidth() / 4.0F), (double) (this.getBbHeight() / 4.0F), (double) (this.getBbWidth() / 4.0F), 0.05D); } } @@ -718,7 +718,7 @@ private void brokenByAnything(DamageSource source) { } private void playBrokenSound() { - this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.ARMOR_STAND_BREAK, this.getSoundSource(), 1.0F, 1.0F); + this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.ARMOR_STAND_BREAK, this.getSoundSource(), 1.0F, 1.0F); } protected float tickHeadTurn(float p_110146_1_, float p_110146_2_) { @@ -917,7 +917,7 @@ public boolean isPickable() { * Called when a player attacks an entity. If this returns true the attack will not happen. */ public boolean skipAttackInteraction(Entity entityIn) { - return entityIn instanceof Player && !this.level.mayInteract((Player) entityIn, this.blockPosition()); + return entityIn instanceof Player && !this.level().mayInteract((Player) entityIn, this.blockPosition()); } protected SoundEvent getFallDamageSound(int heightIn) { @@ -952,7 +952,7 @@ public void onSyncedDataUpdated(EntityDataAccessor key) { if (GAMEPROFILE.equals(key)) { synchronized (this) { getGameProfile().ifPresent(profile -> { - if (this.level != null && this.level.isClientSide && profile != null && profile.isComplete()) { + if (this.level != null && this.level().isClientSide && profile != null && profile.isComplete()) { Minecraft.getInstance().getSkinManager().registerSkins(profile, (textureType, textureLocation, profileTexture) -> { if (textureType.equals(MinecraftProfileTexture.Type.SKIN)) { String metadata = profileTexture.getMetadata("model"); diff --git a/src/main/java/com/shynieke/statues/fakeplayer/StatueFakePlayer.java b/src/main/java/com/shynieke/statues/fakeplayer/StatueFakePlayer.java index 5d9d3eb6..fa5b3295 100644 --- a/src/main/java/com/shynieke/statues/fakeplayer/StatueFakePlayer.java +++ b/src/main/java/com/shynieke/statues/fakeplayer/StatueFakePlayer.java @@ -51,7 +51,7 @@ public boolean canBeAffected(MobEffectInstance mobEffectInstance) { public static void unload(LevelAccessor levelAccessor) { StatueFakePlayer actual = INSTANCE == null ? null : INSTANCE.get(); - if (actual != null && actual.level == levelAccessor) { + if (actual != null && actual.level() == levelAccessor) { actual.level = null; } } diff --git a/src/main/java/com/shynieke/statues/handlers/DropHandler.java b/src/main/java/com/shynieke/statues/handlers/DropHandler.java index 8c655a82..0082bf4e 100644 --- a/src/main/java/com/shynieke/statues/handlers/DropHandler.java +++ b/src/main/java/com/shynieke/statues/handlers/DropHandler.java @@ -28,6 +28,7 @@ import net.minecraft.world.entity.npc.Villager; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDropsEvent; @@ -45,9 +46,10 @@ public class DropHandler { public void onLivingDrop(LivingDropsEvent event) { Entity entity = event.getEntity(); Entity source = event.getSource().getEntity(); + Level level = entity.level(); if (entity instanceof Villager) { - switch (entity.level.random.nextInt(4)) { + switch (level.random.nextInt(4)) { default -> dropLootStatues(entity, new ItemStack(StatueRegistry.VILLAGER_BR_STATUE.get()), source, event); case 1 -> @@ -71,7 +73,7 @@ public void onLivingDrop(LivingDropsEvent event) { dropLootStatues(entity, itemStackToDrop, source, event); } else if (entity instanceof Bee bee) { ItemStack itemStackToDrop = new ItemStack(StatueRegistry.BEE_STATUE.get()); - if (entity.level.random.nextBoolean()) { + if (level.random.nextBoolean()) { itemStackToDrop = new ItemStack(StatueRegistry.ANGRY_BEE_STATUE.get()); } String trans = "Trans Bee"; @@ -216,7 +218,7 @@ public void onLivingDrop(LivingDropsEvent event) { // else // { if (random_drop <= playerDropChance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); + event.getDrops().add(new ItemEntity(level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); } // } } @@ -224,13 +226,13 @@ public void onLivingDrop(LivingDropsEvent event) { case PLAYER_FAKEPLAYER: if (source instanceof ServerPlayer) { if (random_drop <= playerDropChance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); + event.getDrops().add(new ItemEntity(level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); } } break; case ALL: if (random_drop <= playerDropChance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); + event.getDrops().add(new ItemEntity(level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), playerStatueStack)); } break; } @@ -243,16 +245,16 @@ public void dropBossStatue(Entity entity, ItemStack itemStackToDrop, Entity sour switch (StatuesConfig.COMMON.statueKillSource.get()) { default: if (source instanceof ServerPlayer && !(source instanceof FakePlayer)) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); } break; case PLAYER_FAKEPLAYER: if (source instanceof ServerPlayer) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); } break; case ALL: - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); break; } } @@ -290,7 +292,7 @@ public void dropLootStatues(Entity entity, ItemStack itemStackToDrop, Entity sou // else // { if (random_drop <= default_drop_chance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); } // } } @@ -298,13 +300,13 @@ public void dropLootStatues(Entity entity, ItemStack itemStackToDrop, Entity sou case PLAYER_FAKEPLAYER: if (source instanceof ServerPlayer) { if (random_drop <= default_drop_chance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); } } break; case ALL: if (random_drop <= default_drop_chance) { - event.getDrops().add(new ItemEntity(entity.level, entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); + event.getDrops().add(new ItemEntity(entity.level(), entityPos.getX(), entityPos.getY(), entityPos.getZ(), itemStackToDrop)); } break; } diff --git a/src/main/java/com/shynieke/statues/handlers/FishHandler.java b/src/main/java/com/shynieke/statues/handlers/FishHandler.java index 43560048..ac268c65 100644 --- a/src/main/java/com/shynieke/statues/handlers/FishHandler.java +++ b/src/main/java/com/shynieke/statues/handlers/FishHandler.java @@ -17,7 +17,7 @@ public class FishHandler { @SubscribeEvent public void onItemFished(ItemFishedEvent event) { Player player = event.getEntity(); - Level level = player.level; + Level level = player.level(); if (!level.isClientSide) { ItemStack itemStackToDrop = new ItemStack(StatueRegistry.EAGLE_RAY.get()); dropFishedStatue(itemStackToDrop, player, event); diff --git a/src/main/java/com/shynieke/statues/handlers/SpecialHandler.java b/src/main/java/com/shynieke/statues/handlers/SpecialHandler.java index 34ed7d98..bd428e48 100644 --- a/src/main/java/com/shynieke/statues/handlers/SpecialHandler.java +++ b/src/main/java/com/shynieke/statues/handlers/SpecialHandler.java @@ -43,14 +43,14 @@ public void playerTick(PlayerTickEvent event) { if (event.phase == TickEvent.Phase.START) return; - if (!event.player.level.isClientSide) { + if (!event.player.level().isClientSide) { final Player player = event.player; - Level level = player.level; + Level level = player.level(); BlockPos pos = player.blockPosition(); AABB hitbox = new AABB(pos.getX() - 0.5f, pos.getY() - 0.5f, pos.getZ() - 0.5f, pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f) .expandTowards(-3, -3, -3).expandTowards(3, 3, 3); - for (ItemEntity itemE : player.level.getEntitiesOfClass(ItemEntity.class, hitbox)) { + for (ItemEntity itemE : player.level().getEntitiesOfClass(ItemEntity.class, hitbox)) { if (itemE != null) { if (itemE.getItem().getItem().equals(Items.DIAMOND)) { AABB bb = itemE.getBoundingBox().contract(0.1, 0.1, 0.1); diff --git a/src/main/java/com/shynieke/statues/handlers/StatueHandler.java b/src/main/java/com/shynieke/statues/handlers/StatueHandler.java index c1ccd91e..4b2881ec 100644 --- a/src/main/java/com/shynieke/statues/handlers/StatueHandler.java +++ b/src/main/java/com/shynieke/statues/handlers/StatueHandler.java @@ -73,7 +73,7 @@ public void onLivingSpawnEvent(MobSpawnEvent.FinalizeSpawn event) { MobSpawnType spawnReason = event.getSpawnType(); if (spawnReason == MobSpawnType.NATURAL || spawnReason == MobSpawnType.REINFORCEMENT || spawnReason == MobSpawnType.EVENT) { Mob mob = event.getEntity(); - if (StatueSavedData.get().isDespawnerNearby(mob.level.dimension(), mob.blockPosition(), 32)) { + if (StatueSavedData.get().isDespawnerNearby(mob.level().dimension(), mob.blockPosition(), 32)) { // Statues.LOGGER.info(mob.blockPosition() + " Spawn cancelled by a Despawner upgraded Statue " + mob.getType()); event.setSpawnCancelled(true); } diff --git a/src/main/java/com/shynieke/statues/menu/ShulkerStatueMenu.java b/src/main/java/com/shynieke/statues/menu/ShulkerStatueMenu.java index 189b2d44..44265988 100644 --- a/src/main/java/com/shynieke/statues/menu/ShulkerStatueMenu.java +++ b/src/main/java/com/shynieke/statues/menu/ShulkerStatueMenu.java @@ -24,7 +24,7 @@ public ShulkerStatueMenu(final int windowId, final Inventory playerInventory, fi private static ShulkerStatueBlockEntity getBlockEntity(final Inventory playerInventory, final FriendlyByteBuf data) { Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); Objects.requireNonNull(data, "data cannot be null!"); - final BlockEntity BlockEntityAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); + final BlockEntity BlockEntityAtPos = playerInventory.player.level().getBlockEntity(data.readBlockPos()); if (BlockEntityAtPos instanceof ShulkerStatueBlockEntity) { return (ShulkerStatueBlockEntity) BlockEntityAtPos; diff --git a/src/main/java/com/shynieke/statues/menu/StatueTableMenu.java b/src/main/java/com/shynieke/statues/menu/StatueTableMenu.java index 5bca9f60..4fe4aa61 100644 --- a/src/main/java/com/shynieke/statues/menu/StatueTableMenu.java +++ b/src/main/java/com/shynieke/statues/menu/StatueTableMenu.java @@ -30,7 +30,7 @@ public StatueTableMenu(final int windowId, final Inventory playerInventory, fina private static StatueTableBlockEntity getBlockEntity(final Inventory playerInventory, final FriendlyByteBuf data) { Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); Objects.requireNonNull(data, "data cannot be null!"); - final BlockEntity BlockEntityAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); + final BlockEntity BlockEntityAtPos = playerInventory.player.level().getBlockEntity(data.readBlockPos()); if (BlockEntityAtPos instanceof StatueTableBlockEntity) { return (StatueTableBlockEntity) BlockEntityAtPos; @@ -124,7 +124,7 @@ public void slotsChanged(Container inventoryIn) { super.slotsChanged(inventoryIn); } getStatueBE().setChanged(); - if (!player.level.isClientSide) { + if (!player.level().isClientSide) { this.validRecipe[0] = statueBE.hasValidRecipe() ? 1 : 0; } } diff --git a/src/main/java/com/shynieke/statues/network/message/PlayerStatueSyncMessage.java b/src/main/java/com/shynieke/statues/network/message/PlayerStatueSyncMessage.java index 11625de9..8cf9c1af 100644 --- a/src/main/java/com/shynieke/statues/network/message/PlayerStatueSyncMessage.java +++ b/src/main/java/com/shynieke/statues/network/message/PlayerStatueSyncMessage.java @@ -42,7 +42,7 @@ public void handle(Supplier context) { ctx.enqueueWork(() -> { if (ctx.getDirection().getReceptionSide().isServer()) { final ServerPlayer player = ctx.getSender(); - final ServerLevel serverLevel = ctx.getSender().getLevel(); + final ServerLevel serverLevel = ctx.getSender().serverLevel(); Entity entity = serverLevel.getEntity(this.entityUUID); if (entity instanceof PlayerStatue playerStatue && player != null) { if (!playerStatue.isLocked() || (playerStatue.getLockedBy().equals(player.getUUID()))) { diff --git a/src/main/java/com/shynieke/statues/registry/StatueRegistry.java b/src/main/java/com/shynieke/statues/registry/StatueRegistry.java index 2a6918f3..75f39774 100644 --- a/src/main/java/com/shynieke/statues/registry/StatueRegistry.java +++ b/src/main/java/com/shynieke/statues/registry/StatueRegistry.java @@ -75,24 +75,32 @@ import com.shynieke.statues.items.StatueTeaItem; import com.shynieke.statues.menu.ShulkerStatueMenu; import com.shynieke.statues.menu.StatueTableMenu; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.material.MapColor; import net.minecraftforge.common.ForgeSpawnEggItem; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; +import java.util.List; import java.util.function.Supplier; public class StatueRegistry { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Reference.MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Reference.MOD_ID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Reference.MOD_ID); + public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Reference.MOD_ID); public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.MENU_TYPES, Reference.MOD_ID); @@ -272,6 +280,23 @@ private static Item.Properties itemBuilder() { } private static Block.Properties blockBuilder() { - return Block.Properties.of(Material.SHULKER_SHELL); + return Block.Properties.of().mapColor(MapColor.COLOR_PURPLE); } + + + public static final RegistryObject STATUES_BLOCKS = CREATIVE_MODE_TABS.register("blocks", () -> CreativeModeTab.builder() + .icon(() -> new ItemStack(StatueRegistry.SLIME_STATUE.get())) + .title(Component.translatable("itemGroup.statues.blocks")) + .displayItems((displayParameters, output) -> { + List stacks = StatueRegistry.BLOCKS.getEntries().stream().map(reg -> new ItemStack(reg.get())).toList(); + output.acceptAll(stacks); + }).build()); + public static final RegistryObject STATUES_ITEMS = CREATIVE_MODE_TABS.register("items", () -> CreativeModeTab.builder() + .icon(() -> new ItemStack(StatueRegistry.STATUE_CORE.get())) + .title(Component.translatable("itemGroup.statues.items")) + .displayItems((displayParameters, output) -> { + List stacks = StatueRegistry.ITEMS.getEntries().stream() + .filter(reg -> !(reg.get() instanceof BlockItem)).map(reg -> new ItemStack(reg.get())).toList(); + output.acceptAll(stacks); + }).build()); } diff --git a/src/main/java/com/shynieke/statues/registry/StatueTabs.java b/src/main/java/com/shynieke/statues/registry/StatueTabs.java deleted file mode 100644 index 828db199..00000000 --- a/src/main/java/com/shynieke/statues/registry/StatueTabs.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.shynieke.statues.registry; - -import com.shynieke.statues.Reference; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.event.CreativeModeTabEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; - -import java.util.List; - -public class StatueTabs { - private static CreativeModeTab STATUES_BLOCKS; - - private static CreativeModeTab STATUES_ITEMS; - - @SubscribeEvent - public void registerCreativeTabs(final CreativeModeTabEvent.Register event) { - STATUES_BLOCKS = event.registerCreativeModeTab(new ResourceLocation(Reference.MOD_ID, "blocks"), builder -> - builder.icon(() -> new ItemStack(StatueRegistry.SLIME_STATUE.get())) - .title(Component.translatable("itemGroup.statues.blocks")) - .displayItems((displayParameters, output) -> { - List stacks = StatueRegistry.BLOCKS.getEntries().stream().map(reg -> new ItemStack(reg.get())).toList(); - output.acceptAll(stacks); - })); - - STATUES_ITEMS = event.registerCreativeModeTab(new ResourceLocation(Reference.MOD_ID, "items"), builder -> - builder.icon(() -> new ItemStack(StatueRegistry.STATUE_CORE.get())) - .title(Component.translatable("itemGroup.statues.items")) - .displayItems((displayParameters, output) -> { - List stacks = StatueRegistry.ITEMS.getEntries().stream() - .filter(reg -> !(reg.get() instanceof BlockItem)).map(reg -> new ItemStack(reg.get())).toList(); - output.acceptAll(stacks); - })); - } -} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index ef8062cb..368a64e2 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,2 +1,3 @@ public net.minecraft.client.model.PlayerModel f_103375_ #rightSleeve -public net.minecraft.client.model.HumanoidModel f_102809_ #hat \ No newline at end of file +public net.minecraft.client.model.HumanoidModel f_102809_ #hat +public net.minecraft.world.entity.Entity f_19853_ # level \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 201c4fdd..634b29e6 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[45,)" +loaderVersion="[46,)" issueTrackerURL="https://github.com/ShyNieke/StatuesMod/issues" license="MIT" @@ -15,18 +15,12 @@ Just a little functional decoration. [[dependencies.statues]] modId="minecraft" mandatory=true -versionRange="[1.19.3,1.20)" +versionRange="[1.20,1.21)" ordering="NONE" side="BOTH" [[dependencies.statues]] modId="forge" mandatory=true -versionRange="[45.1.0,)" -ordering="NONE" -side="BOTH" -[[dependencies.statues]] -modId="curios" -mandatory=false -versionRange="[1.19.4-5.1.5.3,)" +versionRange="[46.0.1,)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index dca9370c..b5f1ae36 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,8 @@ { - "pack": { - "description": "Statues resources", - "pack_format": 13, - "forge:server_data_pack_format": 12 - } + "pack": { + "description": { + "text": "Statues resources" + }, + "pack_format": 15 + } }