diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..d657f37 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ diff --git a/.gitignore b/.gitignore index a233ec2..c476faf 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ run/ hs_err_*.log replay_*.log *.hprof -*.jfr \ No newline at end of file +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/build.gradle b/build.gradle index f128edd..9547f82 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' } @@ -22,7 +22,7 @@ loom { splitEnvironmentSourceSets() mods { - "modid" { + "worldloader" { sourceSet sourceSets.main sourceSet sourceSets.client } @@ -43,16 +43,12 @@ fabricApi { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - // Uncomment the following line to enable the deprecated Fabric API modules. - // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. - - // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + } processResources { @@ -64,48 +60,32 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 25 } java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. // If you remove this line, sources will not be generated. - // withSourcesJar() - - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - -tasks.named("runGameTest") { - doFirst { - def gameTestRunDir = file("$buildDir/run/gameTest") - def propsFile = file("$gameTestRunDir/server.properties") + withSourcesJar() - if (!gameTestRunDir.exists()) { - gameTestRunDir.mkdirs() - } - if (!propsFile.exists()) { - propsFile.createNewFile() - } - - def props = new Properties() - propsFile.withInputStream { props.load(it) } - props.setProperty("level-seed", "987654321") - propsFile.withOutputStream { os -> props.store(os, "Minecraft server properties") } - } + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { + inputs.property "archivesName", project.base.archivesName + from("LICENSE") { - rename { "${it}_${inputs.properties.archivesBaseName}"} + rename { "${it}_${inputs.properties.archivesName}"} } } // configure the maven publication publishing { publications { - mavenJava(MavenPublication) { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name from components.java } } diff --git a/gradle.properties b/gradle.properties index 1eb2f61..849e968 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ org.gradle.configuration-cache=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.11 -loader_version=0.18.2 -loom_version=1.14-SNAPSHOT +minecraft_version=26.1 +loader_version=0.18.5 +loom_version=1.15-SNAPSHOT # Mod Properties -mod_version = 1.4.2 -maven_group = com.gmail.anthony17j -archives_base_name = WorldLoader +mod_version=1.4.3 +maven_group=fr.jeanney +archives_base_name=worldloader # Dependencies -fabric_version=0.139.4+1.21.11 +fabric_api_version=0.144.3+26.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee3..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2..19a6bde 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b05573..adff685 --- a/gradlew +++ b/gradlew @@ -245,4 +245,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 53e45d3..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -90,4 +90,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega diff --git a/settings.gradle b/settings.gradle index 56266b4..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } } \ No newline at end of file diff --git a/src/gametest/java/com/gmail/anthony17j/worldloader/test/WorldLoaderGameTest.java b/src/gametest/java/fr/jeanney/WorldLoaderGameTest.java similarity index 98% rename from src/gametest/java/com/gmail/anthony17j/worldloader/test/WorldLoaderGameTest.java rename to src/gametest/java/fr/jeanney/WorldLoaderGameTest.java index a61c7e4..128bf4d 100644 --- a/src/gametest/java/com/gmail/anthony17j/worldloader/test/WorldLoaderGameTest.java +++ b/src/gametest/java/fr/jeanney/WorldLoaderGameTest.java @@ -1,6 +1,6 @@ -package com.gmail.anthony17j.worldloader.test; +package fr.jeanney; -import com.gmail.anthony17j.worldloader.WorldLoader; +import fr.jeanney.WorldLoader; import net.fabricmc.fabric.api.gametest.v1.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.server.MinecraftServer; diff --git a/src/gametest/resources/fabric.mod.json b/src/gametest/resources/fabric.mod.json index 199ea8d..bc3241d 100644 --- a/src/gametest/resources/fabric.mod.json +++ b/src/gametest/resources/fabric.mod.json @@ -6,7 +6,7 @@ "environment": "*", "entrypoints": { "fabric-gametest": [ - "com.gmail.anthony17j.worldloader.test.WorldLoaderGameTest" + "fr.jeanney.WorldLoaderGameTest" ] }, "depends": { diff --git a/src/main/java/com/gmail/anthony17j/worldloader/WorldLoader.java b/src/main/java/fr/jeanney/WorldLoader.java similarity index 95% rename from src/main/java/com/gmail/anthony17j/worldloader/WorldLoader.java rename to src/main/java/fr/jeanney/WorldLoader.java index d6b0956..8350b75 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/WorldLoader.java +++ b/src/main/java/fr/jeanney/WorldLoader.java @@ -1,12 +1,12 @@ -package com.gmail.anthony17j.worldloader; +package fr.jeanney; -import com.gmail.anthony17j.worldloader.fakeplayer.EntityPlayerFake; +import fr.jeanney.fakeplayer.EntityPlayerFake; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLevelEvents; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.core.BlockPos; import net.minecraft.resources.Identifier; @@ -43,9 +43,7 @@ public class WorldLoader implements ModInitializer { public void onInitialize() { reloadConfig(); - ServerWorldEvents.LOAD.register(((server, world) -> { - trySpawnLoaderForWorld(server, world); - })); + ServerLevelEvents.LOAD.register((WorldLoader::trySpawnLoaderForWorld)); ServerLifecycleEvents.SERVER_STARTED.register(WorldLoader::spawnConfiguredLoadersForLoadedWorlds); ServerLifecycleEvents.SERVER_STOPPING.register(server -> SPAWNED_WORLDS.clear()); diff --git a/src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/EntityPlayerFake.java b/src/main/java/fr/jeanney/fakeplayer/EntityPlayerFake.java similarity index 96% rename from src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/EntityPlayerFake.java rename to src/main/java/fr/jeanney/fakeplayer/EntityPlayerFake.java index fa16b93..ec15164 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/EntityPlayerFake.java +++ b/src/main/java/fr/jeanney/fakeplayer/EntityPlayerFake.java @@ -1,6 +1,6 @@ -package com.gmail.anthony17j.worldloader.fakeplayer; +package fr.jeanney.fakeplayer; -import com.gmail.anthony17j.worldloader.WorldLoader; +import fr.jeanney.WorldLoader; import com.mojang.authlib.GameProfile; import net.minecraft.core.UUIDUtil; import net.minecraft.network.protocol.PacketFlow; diff --git a/src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/FakeClientConnection.java b/src/main/java/fr/jeanney/fakeplayer/FakeClientConnection.java similarity index 86% rename from src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/FakeClientConnection.java rename to src/main/java/fr/jeanney/fakeplayer/FakeClientConnection.java index 9c8fe4b..718d5d0 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/fakeplayer/FakeClientConnection.java +++ b/src/main/java/fr/jeanney/fakeplayer/FakeClientConnection.java @@ -1,6 +1,6 @@ -package com.gmail.anthony17j.worldloader.fakeplayer; +package fr.jeanney.fakeplayer; -import com.gmail.anthony17j.worldloader.interfaces.ClientConnectionInterface; +import fr.jeanney.interfaces.ClientConnectionInterface; import io.netty.channel.embedded.EmbeddedChannel; import net.minecraft.network.Connection; import net.minecraft.network.PacketListener; diff --git a/src/main/java/com/gmail/anthony17j/worldloader/interfaces/ClientConnectionInterface.java b/src/main/java/fr/jeanney/interfaces/ClientConnectionInterface.java similarity index 69% rename from src/main/java/com/gmail/anthony17j/worldloader/interfaces/ClientConnectionInterface.java rename to src/main/java/fr/jeanney/interfaces/ClientConnectionInterface.java index 5d5668e..0cc6148 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/interfaces/ClientConnectionInterface.java +++ b/src/main/java/fr/jeanney/interfaces/ClientConnectionInterface.java @@ -1,4 +1,4 @@ -package com.gmail.anthony17j.worldloader.interfaces; +package fr.jeanney.interfaces; import io.netty.channel.Channel; diff --git a/src/main/java/com/gmail/anthony17j/worldloader/mixin/ClientConnectionMixin.java b/src/main/java/fr/jeanney/mixin/ClientConnectionMixin.java similarity index 74% rename from src/main/java/com/gmail/anthony17j/worldloader/mixin/ClientConnectionMixin.java rename to src/main/java/fr/jeanney/mixin/ClientConnectionMixin.java index 727cd93..99b4633 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/mixin/ClientConnectionMixin.java +++ b/src/main/java/fr/jeanney/mixin/ClientConnectionMixin.java @@ -1,6 +1,6 @@ -package com.gmail.anthony17j.worldloader.mixin; +package fr.jeanney.mixin; -import com.gmail.anthony17j.worldloader.interfaces.ClientConnectionInterface; +import fr.jeanney.interfaces.ClientConnectionInterface; import io.netty.channel.Channel; import net.minecraft.network.Connection; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/gmail/anthony17j/worldloader/mixin/PlayerManagerMixin.java b/src/main/java/fr/jeanney/mixin/PlayerManagerMixin.java similarity index 92% rename from src/main/java/com/gmail/anthony17j/worldloader/mixin/PlayerManagerMixin.java rename to src/main/java/fr/jeanney/mixin/PlayerManagerMixin.java index 62245c0..af8a0f1 100644 --- a/src/main/java/com/gmail/anthony17j/worldloader/mixin/PlayerManagerMixin.java +++ b/src/main/java/fr/jeanney/mixin/PlayerManagerMixin.java @@ -1,4 +1,4 @@ -package com.gmail.anthony17j.worldloader.mixin; +package fr.jeanney.mixin; import net.minecraft.network.Connection; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import java.util.List; -import static com.gmail.anthony17j.worldloader.WorldLoader.WORLD_LOADER_NAME_PREFIX; +import static fr.jeanney.WorldLoader.WORLD_LOADER_NAME_PREFIX; @Mixin(PlayerList.class) public abstract class PlayerManagerMixin { diff --git a/src/main/resources/assets/worldloader/icon.png b/src/main/resources/assets/worldloader/icon.png new file mode 100644 index 0000000..91a64fa Binary files /dev/null and b/src/main/resources/assets/worldloader/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d2cdb73..b7a0510 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,32 +1,31 @@ { - "schemaVersion": 1, - "id": "worldloader", - "version": "${version}", - - "name": "WorldLoader", - "description": "Keep the overworld loaded without any players", - "authors": [ - "Uxzylon" - ], - "contact": { - "homepage": "https://anthony17j.dev", - "sources": "https://github.com/Uxzylon/CreativeWorld" - }, - - "environment": "server", - "entrypoints": { - "main": [ - "com.gmail.anthony17j.worldloader.WorldLoader" - ] - }, - "mixins": [ - "worldloader.mixins.json" - ], - - "depends": { - "fabricloader": ">=0.18.2", - "minecraft": "~1.21.11", - "java": ">=21", - "fabric-api": "*" - } -} + "schemaVersion": 1, + "id": "worldloader", + "version": "${version}", + "name": "WorldLoader", + "description": "Keep the overworld loaded without any players", + "authors": [ + "Uxzylon" + ], + "contact": { + "homepage": "https://anthony.jeanney.fr", + "sources": "https://github.com/Uxzylon/CreativeWorld" + }, + "license": "CC0-1.0", + "icon": "assets/worldloader/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "fr.jeanney.WorldLoader" + ] + }, + "mixins": [ + "worldloader.mixins.json" + ], + "depends": { + "fabricloader": ">=0.18.5", + "minecraft": "~26.1", + "java": ">=25", + "fabric-api": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/worldloader.mixins.json b/src/main/resources/worldloader.mixins.json index 798782a..fe94697 100644 --- a/src/main/resources/worldloader.mixins.json +++ b/src/main/resources/worldloader.mixins.json @@ -1,16 +1,15 @@ { - "required": true, - "minVersion": "0.8", - "package": "com.gmail.anthony17j.worldloader.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - "ClientConnectionMixin", - "PlayerManagerMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} + "required": true, + "package": "fr.jeanney.mixin", + "compatibilityLevel": "JAVA_25", + "mixins": [ + "ClientConnectionMixin", + "PlayerManagerMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file