diff --git a/LICENSE b/LICENSE deleted file mode 100644 index ab547c4..0000000 --- a/LICENSE +++ /dev/null @@ -1,172 +0,0 @@ -License for env.json Past, Current and Future Assets : - -Copyright (c) 2023 FirstMegaGame4 -All rights reserved. - -License for Code : - - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..4813f29 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,175 @@ +### License for env.json Past, Current and Future Assets: + +``` +Copyright (c) 2023 FirstMegaGame4 +Copyright (c) 2024 MModding + +All rights reserved. +``` + +### License for Code: + +# PolyForm Shield License 1.0.0 + + + +## Acceptance + +In order to get any license under these terms, you must agree +to them as both strict obligations and conditions to all +your licenses. + +## Copyright License + +The licensor grants you a copyright license for the +software to do everything you might do with the software +that would otherwise infringe the licensor's copyright +in it for any permitted purpose. However, you may +only distribute the software according to [Distribution +License](#distribution-license) and make changes or new works +based on the software according to [Changes and New Works +License](#changes-and-new-works-license). + +## Distribution License + +The licensor grants you an additional copyright license +to distribute copies of the software. Your license +to distribute covers distributing the software with +changes and new works permitted by [Changes and New Works +License](#changes-and-new-works-license). + +## Notices + +You must ensure that anyone who gets a copy of any part of +the software from you also gets a copy of these terms or the +URL for them above, as well as copies of any plain-text lines +beginning with `Required Notice:` that the licensor provided +with the software. For example: + +> Required Notice: Copyright Yoyodyne, Inc. (http://example.com) + +## Changes and New Works License + +The licensor grants you an additional copyright license to +make changes and new works based on the software for any +permitted purpose. + +## Patent License + +The licensor grants you a patent license for the software that +covers patent claims the licensor can license, or becomes able +to license, that you would infringe by using the software. + +## Noncompete + +Any purpose is a permitted purpose, except for providing any +product that competes with the software or any product the +licensor or any of its affiliates provides using the software. + +## Competition + +Goods and services compete even when they provide functionality +through different kinds of interfaces or for different technical +platforms. Applications can compete with services, libraries +with plugins, frameworks with development tools, and so on, +even if they're written in different programming languages +or for different computer architectures. Goods and services +compete even when provided free of charge. If you market a +product as a practical substitute for the software or another +product, it definitely competes. + +## New Products + +If you are using the software to provide a product that does +not compete, but the licensor or any of its affiliates brings +your product into competition by providing a new version of +the software or another product using the software, you may +continue using versions of the software available under these +terms beforehand to provide your competing product, but not +any later versions. + +## Discontinued Products + +You may begin using the software to compete with a product +or service that the licensor or any of its affiliates has +stopped providing, unless the licensor includes a plain-text +line beginning with `Licensor Line of Business:` with the +software that mentions that line of business. For example: + +> Licensor Line of Business: YoyodyneCMS Content Management +System (http://example.com/cms) + +## Sales of Business + +If the licensor or any of its affiliates sells a line of +business developing the software or using the software +to provide a product, the buyer can also enforce +[Noncompete](#noncompete) for that product. + +## Fair Use + +You may have "fair use" rights for the software under the +law. These terms do not limit them. + +## No Other Rights + +These terms do not allow you to sublicense or transfer any of +your licenses to anyone else, or prevent the licensor from +granting licenses to anyone else. These terms do not imply +any other licenses. + +## Patent Defense + +If you make any written claim that the software infringes or +contributes to infringement of any patent, your patent license +for the software granted under these terms ends immediately. If +your company makes such a claim, your patent license ends +immediately for work on behalf of your company. + +## Violations + +The first time you are notified in writing that you have +violated any of these terms, or done anything with the software +not covered by your licenses, your licenses can nonetheless +continue if you come into full compliance with these terms, +and take practical steps to correct past violations, within +32 days of receiving notice. Otherwise, all your licenses +end immediately. + +## No Liability + +***As far as the law allows, the software comes as is, without +any warranty or condition, and the licensor will not be liable +to you for any damages arising out of these terms or the use +or nature of the software, under any kind of legal claim.*** + +## Definitions + +The **licensor** is the individual or entity offering these +terms, and the **software** is the software the licensor makes +available under these terms. + +A **product** can be a good or service, or a combination +of them. + +**You** refers to the individual or entity agreeing to these +terms. + +**Your company** is any legal entity, sole proprietorship, +or other kind of organization that you work for, plus all +its affiliates. + +**Affiliates** means the other organizations than an +organization has control over, is under the control of, or is +under common control with. + +**Control** means ownership of substantially all the assets of +an entity, or the power to direct its management and policies +by vote, contract, or otherwise. Control can be direct or +indirect. + +**Your licenses** are all the licenses granted to you for the +software under these terms. + +**Use** means anything you do with the software requiring one +of your licenses. \ No newline at end of file diff --git a/README.md b/README.md index 0334fb3..e444588 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ +[![MModding](https://raw.githubusercontent.com/MModding/mmodding.github.io/main/assets/mmodding_dark_banner.png)](https://discord.gg/2Sr83HJpD3) + # env.json -[env.json logo](https://modrinth.com/mod/env.json) +[env.json logo](https://modrinth.com/mod/env.json) ## Supports @@ -126,7 +128,7 @@ repositories { dependencies { // ... - modImplementation "com.github.FirstMegaGame4:env.json:${theMostBeautifulVersionYouCanFind}" + modImplementation "com.github.MModding:env.json:${theMostBeautifulVersionYouCanFind}" } ``` @@ -135,9 +137,9 @@ or parse it with `EnvJson#parse(Path)` or `EnvJson#parse(InputStream)`. ## Badge For Developers -[Requires env.json](https://modrinth.com/mod/env.json) +[Requires env.json](https://modrinth.com/mod/env.json) -`[Requires env.json](https://modrinth.com/mod/env.json)` +`[Requires env.json](https://modrinth.com/mod/env.json)` ## Promotion diff --git a/build.gradle b/build.gradle index 9a66d76..bfa5fe4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -46,7 +46,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -55,12 +55,12 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { - from("LICENSE") { + from("LICENSE.md") { rename { "${it}_${project.base.archivesName.get()}"} } } diff --git a/gradle.properties b/gradle.properties index da7914b..2cdc368 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 +minecraft_version=1.20.5 +yarn_mappings=1.20.5+build.1 loader_version=0.15.1 # Mod Properties -mod_version=0.3.1-beta -maven_group=fr.firstmegagame4.env.json +mod_version=0.4.0-beta +maven_group=com.mmodding.env.json archives_base_name=env_json # Dependencies -fabric_version=0.91.3+1.20.4 \ No newline at end of file +fabric_version=0.97.5+1.20.5 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/fr/firstmegagame4/env/json/api/EnvJson.java b/src/main/java/com/mmodding/env/json/api/EnvJson.java similarity index 81% rename from src/main/java/fr/firstmegagame4/env/json/api/EnvJson.java rename to src/main/java/com/mmodding/env/json/api/EnvJson.java index fd6599c..0e7b7fc 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/EnvJson.java +++ b/src/main/java/com/mmodding/env/json/api/EnvJson.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.api; +package com.mmodding.env.json.api; -import fr.firstmegagame4.env.json.impl.EnvJsonParser; +import com.mmodding.env.json.impl.EnvJsonParser; import net.minecraft.util.Identifier; import java.io.InputStream; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/EnvJsonMember.java b/src/main/java/com/mmodding/env/json/api/EnvJsonMember.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/json/api/EnvJsonMember.java rename to src/main/java/com/mmodding/env/json/api/EnvJsonMember.java index 5bd8a46..20e7397 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/EnvJsonMember.java +++ b/src/main/java/com/mmodding/env/json/api/EnvJsonMember.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.api; +package com.mmodding.env.json.api; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; +import com.mmodding.env.json.api.rule.EnvJsonRule; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/EnvJsonVisitor.java b/src/main/java/com/mmodding/env/json/api/EnvJsonVisitor.java similarity index 79% rename from src/main/java/fr/firstmegagame4/env/json/api/EnvJsonVisitor.java rename to src/main/java/com/mmodding/env/json/api/EnvJsonVisitor.java index d623dce..a2880b6 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/EnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/json/api/EnvJsonVisitor.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.api; +package com.mmodding.env.json.api; -import fr.firstmegagame4.env.json.api.rule.SkyEnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.VoidEnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.WaterEnvJsonRule; +import com.mmodding.env.json.api.rule.SkyEnvJsonRule; +import com.mmodding.env.json.api.rule.VoidEnvJsonRule; +import com.mmodding.env.json.api.rule.WaterEnvJsonRule; import it.unimi.dsi.fastutil.ints.Int2BooleanFunction; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResource.java b/src/main/java/com/mmodding/env/json/api/resource/ExtendedResource.java similarity index 67% rename from src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResource.java rename to src/main/java/com/mmodding/env/json/api/resource/ExtendedResource.java index dd21ee1..da84032 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResource.java +++ b/src/main/java/com/mmodding/env/json/api/resource/ExtendedResource.java @@ -1,7 +1,8 @@ -package fr.firstmegagame4.env.json.api.resource; +package com.mmodding.env.json.api.resource; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.impl.resource.ExtendedResourceImpl; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.impl.resource.ExtendedResourceImpl; +import net.minecraft.registry.VersionedIdentifier; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourcePack; import net.minecraft.resource.metadata.ResourceMetadata; @@ -9,6 +10,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; +import java.util.Optional; public interface ExtendedResource { @@ -18,9 +20,9 @@ static ExtendedResource of(Resource resource) { ResourcePack getPack(); - String getResourcePackName(); + String getPackId(); - boolean isAlwaysStable(); + Optional getKnownPackInfo(); InputStream getInputStream() throws IOException; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResourceReader.java b/src/main/java/com/mmodding/env/json/api/resource/ExtendedResourceReader.java similarity index 76% rename from src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResourceReader.java rename to src/main/java/com/mmodding/env/json/api/resource/ExtendedResourceReader.java index d51e319..7c548d3 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/resource/ExtendedResourceReader.java +++ b/src/main/java/com/mmodding/env/json/api/resource/ExtendedResourceReader.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.resource; +package com.mmodding.env.json.api.resource; import java.io.BufferedReader; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/AnyEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/AnyEnvJsonRule.java similarity index 70% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/AnyEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/AnyEnvJsonRule.java index 1b449dd..76bec82 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/AnyEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/AnyEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; import java.util.List; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/BiomeEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/BiomeEnvJsonRule.java similarity index 84% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/BiomeEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/BiomeEnvJsonRule.java index 920f098..896ce4c 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/BiomeEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/BiomeEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/CoordEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/CoordEnvJsonRule.java similarity index 90% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/CoordEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/CoordEnvJsonRule.java index edd3d11..a2e216d 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/CoordEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/CoordEnvJsonRule.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; -import fr.firstmegagame4.env.json.impl.rule.CoordEnvJsonRuleImpl; +import com.mmodding.env.json.impl.rule.CoordEnvJsonRuleImpl; import java.util.function.BiFunction; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/DimensionEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/DimensionEnvJsonRule.java similarity index 89% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/DimensionEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/DimensionEnvJsonRule.java index 4929295..7a21019 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/DimensionEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/DimensionEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/EnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/EnvJsonRule.java similarity index 89% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/EnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/EnvJsonRule.java index c8dfadf..7ac15e1 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/EnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/EnvJsonRule.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.impl.rule.EnvJsonRuleImpl; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.impl.rule.EnvJsonRuleImpl; public interface EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/NotEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/NotEnvJsonRule.java similarity index 63% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/NotEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/NotEnvJsonRule.java index 4241c0d..a8d5f6e 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/NotEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/NotEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; public interface NotEnvJsonRule extends EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/SequenceEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/SequenceEnvJsonRule.java similarity index 71% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/SequenceEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/SequenceEnvJsonRule.java index b1911ff..43d2544 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/SequenceEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/SequenceEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; import java.util.List; diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/SkyEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/SkyEnvJsonRule.java similarity index 75% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/SkyEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/SkyEnvJsonRule.java index 0b51f9f..6063053 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/SkyEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/SkyEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; public interface SkyEnvJsonRule extends EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/SubmergedEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/SubmergedEnvJsonRule.java similarity index 65% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/SubmergedEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/SubmergedEnvJsonRule.java index cd1c955..6501f98 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/SubmergedEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/SubmergedEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; public interface SubmergedEnvJsonRule extends EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/VoidEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/VoidEnvJsonRule.java similarity index 75% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/VoidEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/VoidEnvJsonRule.java index d8d3120..87e2f87 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/VoidEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/VoidEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; public interface VoidEnvJsonRule extends EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/api/rule/WaterEnvJsonRule.java b/src/main/java/com/mmodding/env/json/api/rule/WaterEnvJsonRule.java similarity index 75% rename from src/main/java/fr/firstmegagame4/env/json/api/rule/WaterEnvJsonRule.java rename to src/main/java/com/mmodding/env/json/api/rule/WaterEnvJsonRule.java index edefd37..b2b1c72 100644 --- a/src/main/java/fr/firstmegagame4/env/json/api/rule/WaterEnvJsonRule.java +++ b/src/main/java/com/mmodding/env/json/api/rule/WaterEnvJsonRule.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.api.rule; +package com.mmodding.env.json.api.rule; public interface WaterEnvJsonRule extends EnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonImpl.java b/src/main/java/com/mmodding/env/json/impl/EnvJsonImpl.java similarity index 68% rename from src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonImpl.java rename to src/main/java/com/mmodding/env/json/impl/EnvJsonImpl.java index a8e354f..80b026a 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/EnvJsonImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl; +package com.mmodding.env.json.impl; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.api.EnvJsonMember; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJsonMember; +import com.mmodding.env.json.api.EnvJsonVisitor; import net.minecraft.util.Identifier; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonInitializer.java b/src/main/java/com/mmodding/env/json/impl/EnvJsonInitializer.java similarity index 90% rename from src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonInitializer.java rename to src/main/java/com/mmodding/env/json/impl/EnvJsonInitializer.java index d0214ff..95ff77a 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonInitializer.java +++ b/src/main/java/com/mmodding/env/json/impl/EnvJsonInitializer.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.impl; +package com.mmodding.env.json.impl; import net.fabricmc.api.ModInitializer; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonMemberImpl.java b/src/main/java/com/mmodding/env/json/impl/EnvJsonMemberImpl.java similarity index 69% rename from src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonMemberImpl.java rename to src/main/java/com/mmodding/env/json/impl/EnvJsonMemberImpl.java index e85f0b3..b67cf0b 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonMemberImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/EnvJsonMemberImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl; +package com.mmodding.env.json.impl; -import fr.firstmegagame4.env.json.api.EnvJsonMember; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.EnvJsonMember; +import com.mmodding.env.json.api.rule.EnvJsonRule; import net.minecraft.util.Identifier; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonParser.java b/src/main/java/com/mmodding/env/json/impl/EnvJsonParser.java similarity index 95% rename from src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonParser.java rename to src/main/java/com/mmodding/env/json/impl/EnvJsonParser.java index 1699f19..b452cad 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonParser.java +++ b/src/main/java/com/mmodding/env/json/impl/EnvJsonParser.java @@ -1,13 +1,13 @@ -package fr.firstmegagame4.env.json.impl; +package com.mmodding.env.json.impl; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.api.EnvJsonMember; -import fr.firstmegagame4.env.json.api.rule.*; -import fr.firstmegagame4.env.json.impl.rule.*; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJsonMember; +import com.mmodding.env.json.api.rule.*; +import com.mmodding.env.json.impl.rule.*; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonUtils.java b/src/main/java/com/mmodding/env/json/impl/EnvJsonUtils.java similarity index 96% rename from src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonUtils.java rename to src/main/java/com/mmodding/env/json/impl/EnvJsonUtils.java index ca02acb..0b7ce67 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/EnvJsonUtils.java +++ b/src/main/java/com/mmodding/env/json/impl/EnvJsonUtils.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.impl; +package com.mmodding.env.json.impl; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/EntryListDuckInterface.java b/src/main/java/com/mmodding/env/json/impl/resource/EntryListDuckInterface.java similarity index 90% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/EntryListDuckInterface.java rename to src/main/java/com/mmodding/env/json/impl/resource/EntryListDuckInterface.java index f668a34..41cf19c 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/EntryListDuckInterface.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/EntryListDuckInterface.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.ResourcePack; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceImpl.java b/src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceImpl.java similarity index 87% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceImpl.java rename to src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceImpl.java index e991130..b8cbeb8 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.api.resource.ExtendedResource; -import fr.firstmegagame4.env.json.mixin.ResourceAccessor; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.api.resource.ExtendedResource; +import com.mmodding.env.json.mixin.ResourceAccessor; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourcePack; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceReaderImpl.java b/src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceReaderImpl.java similarity index 77% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceReaderImpl.java rename to src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceReaderImpl.java index e69759b..7766e7d 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ExtendedResourceReaderImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/ExtendedResourceReaderImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; -import fr.firstmegagame4.env.json.api.resource.ExtendedResource; -import fr.firstmegagame4.env.json.api.resource.ExtendedResourceReader; +import com.mmodding.env.json.api.resource.ExtendedResource; +import com.mmodding.env.json.api.resource.ExtendedResourceReader; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceDuckInterface.java b/src/main/java/com/mmodding/env/json/impl/resource/ResourceDuckInterface.java similarity index 82% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceDuckInterface.java rename to src/main/java/com/mmodding/env/json/impl/resource/ResourceDuckInterface.java index eb5c5b1..c24423b 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceDuckInterface.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/ResourceDuckInterface.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.resource.InputSupplier; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceResult.java b/src/main/java/com/mmodding/env/json/impl/resource/ResourceResult.java similarity index 85% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceResult.java rename to src/main/java/com/mmodding/env/json/impl/resource/ResourceResult.java index dc87f9b..bd94afc 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResourceResult.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/ResourceResult.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.ResourcePack; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResultAccess.java b/src/main/java/com/mmodding/env/json/impl/resource/ResultAccess.java similarity index 86% rename from src/main/java/fr/firstmegagame4/env/json/impl/resource/ResultAccess.java rename to src/main/java/com/mmodding/env/json/impl/resource/ResultAccess.java index b80d392..abc00c6 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/resource/ResultAccess.java +++ b/src/main/java/com/mmodding/env/json/impl/resource/ResultAccess.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.impl.resource; +package com.mmodding.env.json.impl.resource; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.ResourcePack; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/AnyEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/AnyEnvJsonRuleImpl.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/AnyEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/AnyEnvJsonRuleImpl.java index dd201c5..e83b587 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/AnyEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/AnyEnvJsonRuleImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.AnyEnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.AnyEnvJsonRule; +import com.mmodding.env.json.api.rule.EnvJsonRule; import org.jetbrains.annotations.ApiStatus; import java.util.List; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/BiomeEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/BiomeEnvJsonRuleImpl.java similarity index 85% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/BiomeEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/BiomeEnvJsonRuleImpl.java index 8b400b9..2990c06 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/BiomeEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/BiomeEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.BiomeEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.BiomeEnvJsonRule; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/CoordEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/CoordEnvJsonRuleImpl.java similarity index 89% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/CoordEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/CoordEnvJsonRuleImpl.java index 01e001c..64b1d19 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/CoordEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/CoordEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.CoordEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.CoordEnvJsonRule; import org.jetbrains.annotations.ApiStatus; import java.util.Arrays; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/DimensionEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/DimensionEnvJsonRuleImpl.java similarity index 86% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/DimensionEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/DimensionEnvJsonRuleImpl.java index c21f925..da3312e 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/DimensionEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/DimensionEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.DimensionEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.DimensionEnvJsonRule; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.tag.TagKey; import net.minecraft.world.World; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/EnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/EnvJsonRuleImpl.java similarity index 80% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/EnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/EnvJsonRuleImpl.java index a20dfba..330b303 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/EnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/EnvJsonRuleImpl.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; +import com.mmodding.env.json.api.rule.EnvJsonRule; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/NotEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/NotEnvJsonRuleImpl.java similarity index 67% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/NotEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/NotEnvJsonRuleImpl.java index 741dfb0..c49da5b 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/NotEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/NotEnvJsonRuleImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.NotEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.EnvJsonRule; +import com.mmodding.env.json.api.rule.NotEnvJsonRule; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SequenceEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/SequenceEnvJsonRuleImpl.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/SequenceEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/SequenceEnvJsonRuleImpl.java index cbf0f07..210f90c 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SequenceEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/SequenceEnvJsonRuleImpl.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.EnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.SequenceEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.EnvJsonRule; +import com.mmodding.env.json.api.rule.SequenceEnvJsonRule; import org.jetbrains.annotations.ApiStatus; import java.util.List; diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SkyEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/SkyEnvJsonRuleImpl.java similarity index 75% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/SkyEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/SkyEnvJsonRuleImpl.java index b2c92b1..d588579 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SkyEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/SkyEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.SkyEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.SkyEnvJsonRule; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java index a2ccbf8..57980e9 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/SubmergedEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.SubmergedEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.SubmergedEnvJsonRule; public class SubmergedEnvJsonRuleImpl extends EnvJsonRuleImpl implements SubmergedEnvJsonRule { diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/VoidEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/VoidEnvJsonRuleImpl.java similarity index 75% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/VoidEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/VoidEnvJsonRuleImpl.java index c26f13c..e5fa0a2 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/VoidEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/VoidEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.VoidEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.VoidEnvJsonRule; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/src/main/java/fr/firstmegagame4/env/json/impl/rule/WaterEnvJsonRuleImpl.java b/src/main/java/com/mmodding/env/json/impl/rule/WaterEnvJsonRuleImpl.java similarity index 76% rename from src/main/java/fr/firstmegagame4/env/json/impl/rule/WaterEnvJsonRuleImpl.java rename to src/main/java/com/mmodding/env/json/impl/rule/WaterEnvJsonRuleImpl.java index 70a171a..2ec4cec 100644 --- a/src/main/java/fr/firstmegagame4/env/json/impl/rule/WaterEnvJsonRuleImpl.java +++ b/src/main/java/com/mmodding/env/json/impl/rule/WaterEnvJsonRuleImpl.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.impl.rule; +package com.mmodding.env.json.impl.rule; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.WaterEnvJsonRule; +import com.mmodding.env.json.api.EnvJsonVisitor; +import com.mmodding.env.json.api.rule.WaterEnvJsonRule; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal diff --git a/src/main/java/fr/firstmegagame4/env/json/mixin/EntryListMixin.java b/src/main/java/com/mmodding/env/json/mixin/EntryListMixin.java similarity index 90% rename from src/main/java/fr/firstmegagame4/env/json/mixin/EntryListMixin.java rename to src/main/java/com/mmodding/env/json/mixin/EntryListMixin.java index 3bcbada..dace238 100644 --- a/src/main/java/fr/firstmegagame4/env/json/mixin/EntryListMixin.java +++ b/src/main/java/com/mmodding/env/json/mixin/EntryListMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.json.mixin; +package com.mmodding.env.json.mixin; -import fr.firstmegagame4.env.json.impl.EnvJsonUtils; -import fr.firstmegagame4.env.json.impl.resource.EntryListDuckInterface; +import com.mmodding.env.json.impl.resource.EntryListDuckInterface; +import com.mmodding.env.json.impl.EnvJsonUtils; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.NamespaceResourceManager; diff --git a/src/main/java/fr/firstmegagame4/env/json/mixin/NamespaceResourceManagerMixin.java b/src/main/java/com/mmodding/env/json/mixin/NamespaceResourceManagerMixin.java similarity index 96% rename from src/main/java/fr/firstmegagame4/env/json/mixin/NamespaceResourceManagerMixin.java rename to src/main/java/com/mmodding/env/json/mixin/NamespaceResourceManagerMixin.java index b01c1b1..2288676 100644 --- a/src/main/java/fr/firstmegagame4/env/json/mixin/NamespaceResourceManagerMixin.java +++ b/src/main/java/com/mmodding/env/json/mixin/NamespaceResourceManagerMixin.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.mixin; +package com.mmodding.env.json.mixin; import com.google.common.collect.Iterators; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; @@ -7,12 +7,12 @@ import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Share; import com.llamalad7.mixinextras.sugar.ref.LocalRef; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.impl.EnvJsonUtils; -import fr.firstmegagame4.env.json.impl.resource.EntryListDuckInterface; -import fr.firstmegagame4.env.json.impl.resource.ResourceDuckInterface; -import fr.firstmegagame4.env.json.impl.resource.ResourceResult; -import fr.firstmegagame4.env.json.impl.resource.ResultAccess; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.impl.resource.EntryListDuckInterface; +import com.mmodding.env.json.impl.resource.ResourceDuckInterface; +import com.mmodding.env.json.impl.resource.ResourceResult; +import com.mmodding.env.json.impl.resource.ResultAccess; +import com.mmodding.env.json.impl.EnvJsonUtils; import net.minecraft.resource.*; import net.minecraft.resource.metadata.ResourceMetadata; import net.minecraft.util.Identifier; diff --git a/src/main/java/fr/firstmegagame4/env/json/mixin/ResourceAccessor.java b/src/main/java/com/mmodding/env/json/mixin/ResourceAccessor.java similarity index 94% rename from src/main/java/fr/firstmegagame4/env/json/mixin/ResourceAccessor.java rename to src/main/java/com/mmodding/env/json/mixin/ResourceAccessor.java index 7e3cd79..db79947 100644 --- a/src/main/java/fr/firstmegagame4/env/json/mixin/ResourceAccessor.java +++ b/src/main/java/com/mmodding/env/json/mixin/ResourceAccessor.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.json.mixin; +package com.mmodding.env.json.mixin; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.Resource; diff --git a/src/main/java/fr/firstmegagame4/env/json/mixin/ResourceMixin.java b/src/main/java/com/mmodding/env/json/mixin/ResourceMixin.java similarity index 80% rename from src/main/java/fr/firstmegagame4/env/json/mixin/ResourceMixin.java rename to src/main/java/com/mmodding/env/json/mixin/ResourceMixin.java index 47371b7..b2c8337 100644 --- a/src/main/java/fr/firstmegagame4/env/json/mixin/ResourceMixin.java +++ b/src/main/java/com/mmodding/env/json/mixin/ResourceMixin.java @@ -1,10 +1,10 @@ -package fr.firstmegagame4.env.json.mixin; +package com.mmodding.env.json.mixin; -import fr.firstmegagame4.env.json.api.EnvJson; -import fr.firstmegagame4.env.json.api.resource.ExtendedResource; -import fr.firstmegagame4.env.json.impl.EnvJsonUtils; -import fr.firstmegagame4.env.json.impl.resource.ExtendedResourceReaderImpl; -import fr.firstmegagame4.env.json.impl.resource.ResourceDuckInterface; +import com.mmodding.env.json.api.EnvJson; +import com.mmodding.env.json.impl.resource.ExtendedResourceReaderImpl; +import com.mmodding.env.json.impl.resource.ResourceDuckInterface; +import com.mmodding.env.json.api.resource.ExtendedResource; +import com.mmodding.env.json.impl.EnvJsonUtils; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.Resource; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/fr/firstmegagame4/env/json/mixin/ResultAccessor.java b/src/main/java/com/mmodding/env/json/mixin/ResultAccessor.java similarity index 82% rename from src/main/java/fr/firstmegagame4/env/json/mixin/ResultAccessor.java rename to src/main/java/com/mmodding/env/json/mixin/ResultAccessor.java index 039f198..546337f 100644 --- a/src/main/java/fr/firstmegagame4/env/json/mixin/ResultAccessor.java +++ b/src/main/java/com/mmodding/env/json/mixin/ResultAccessor.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.json.mixin; +package com.mmodding.env.json.mixin; -import fr.firstmegagame4.env.json.impl.resource.ResultAccess; +import com.mmodding.env.json.impl.resource.ResultAccess; import net.minecraft.resource.InputSupplier; import net.minecraft.resource.ResourcePack; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/resources/env_json.mixins.json b/src/main/resources/env_json.mixins.json index 1be9249..3938df8 100644 --- a/src/main/resources/env_json.mixins.json +++ b/src/main/resources/env_json.mixins.json @@ -1,7 +1,7 @@ { "required": true, - "package": "fr.firstmegagame4.env.json.mixin", - "compatibilityLevel": "JAVA_17", + "package": "com.mmodding.env.json.mixin", + "compatibilityLevel": "JAVA_21", "mixins": [ "EntryListMixin", "NamespaceResourceManagerMixin", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 24c844d..1f23748 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,6 +5,9 @@ "name": "env.json", "description": "env.json is a Minecraft Library introducing a new sub json file extension format, with the goal of redirecting minecraft resources to other ones based on the environment context.", "authors": [ + "MModding Team" + ], + "contributors": [ "FirstMegaGame4" ], "contact": { @@ -12,12 +15,12 @@ "sources": "https://github.com/FirstMegaGame4/env.json", "issues": "https://github.com/FirstMegaGame4/env.json/issues" }, - "license": "Code: LGPL-3.0\\nAssets: All Rights Reserved", + "license": "Code: PolyForm-Shield-1.0.0\\nAssets: All Rights Reserved", "icon": "assets/env_json/icon.png", "environment": "*", "entrypoints": { "main": [ - "fr.firstmegagame4.env.json.impl.EnvJsonInitializer" + "com.mmodding.env.json.impl.EnvJsonInitializer" ] }, "accessWidener": "env_json.accesswidener", @@ -26,8 +29,8 @@ ], "depends": { "fabricloader": ">=0.15.1", - "minecraft": ">=1.20.1 <=1.20.4", - "java": ">=17", + "minecraft": ">=1.20.5", + "java": ">=21", "fabric-api": "*" }, "suggests": {