From 5bee0ee30aef0a7a2ceb555cdf7f4cfbcccbf28a Mon Sep 17 00:00:00 2001 From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com> Date: Tue, 23 Apr 2024 22:25:29 +0200 Subject: [PATCH] 1.20.5 Port, LICENSE.md Update & Version Bump --- LICENSE | 172 ----------------- LICENSE.md | 175 ++++++++++++++++++ README.md | 16 +- build.gradle | 16 +- gradle.properties | 16 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../assets/client/EDAEnvJsonVisitors.java | 20 +- .../env/driven/assets/client/EDAUtils.java | 4 +- .../client/EnvironmentDrivenAssets.java | 4 +- .../client/blockstate/BlockStateManager.java | 4 +- .../blockstate/BlockStateModelProvider.java | 2 +- .../client/duck/BakedModelDuckInterface.java | 4 +- .../client/duck/JsonObjectDuckInterface.java | 4 +- .../duck/JsonUnbakedModelDuckInterface.java | 4 +- .../impl/axiom/AxiomBlockEnvJsonVisitor.java | 14 +- .../MappedBlockAndTintGetterInstance.java | 2 +- .../impl/env/json/BlockEnvJsonVisitor.java | 14 +- .../impl/env/json/ClientEnvJsonVisitor.java | 16 +- .../client/impl/env/json/EmptyVisitor.java | 10 +- .../impl/env/json/EntityEnvJsonVisitor.java | 14 +- .../sodium/SodiumBlockEnvJsonVisitor.java | 16 +- .../injected/BakedModelRedirection.java | 2 +- .../client/injected/ManagerContainer.java | 6 +- .../assets/client/model/EDABakedModel.java | 12 +- .../assets/client/model/ModelManager.java | 6 +- .../model/plugin/EDAModelLoadingPlugin.java | 10 +- .../client/BakedModelCacheKeyAccessor.java | 2 +- .../mixin/client/BakedModelManagerMixin.java | 21 +-- .../assets/mixin/client/BakedModelMixin.java | 4 +- .../mixin/client/BasicBakedModelMixin.java | 6 +- .../mixin/client/BlockDustParticleMixin.java | 8 +- .../mixin/client/BlockModelRendererMixin.java | 8 +- .../mixin/client/BuiltinBakedModelMixin.java | 6 +- .../client/ChunkRendererRegionAccessor.java | 2 +- .../mixin/client/ChunkedBlockRegionMixin.java | 8 +- .../client/ForwardingBakedModelMixin.java | 6 +- .../assets/mixin/client/JsonObjectMixin.java | 6 +- .../mixin/client/JsonUnbakedModelMixin.java | 6 +- .../client/MappedBlockAndTintGetterMixin.java | 4 +- .../assets/mixin/client/ModelLoaderMixin.java | 24 +-- .../client/MultipartBakedModelMixin.java | 6 +- .../SpriteBillboardParticleAccessor.java | 2 +- .../mixin/client/WeightedBakedModelMixin.java | 6 +- .../mixin/client/WorldSliceAccessor.java | 2 +- .../plugin/mixin/client/EDAMixinPlugin.java | 10 +- .../assets/env_driven_assets/lang/en_us.json | 2 +- .../resources/env_driven_assets.mixins.json | 6 +- src/main/resources/fabric.mod.json | 23 ++- .../minecraft/models/item/torch-json.env.json | 2 +- .../env_driven_new_default/pack.mcmeta | 6 +- 50 files changed, 373 insertions(+), 368 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/EDAEnvJsonVisitors.java (68%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/EDAUtils.java (97%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/EnvironmentDrivenAssets.java (95%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/blockstate/BlockStateManager.java (93%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/blockstate/BlockStateModelProvider.java (93%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/duck/BakedModelDuckInterface.java (57%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/duck/JsonObjectDuckInterface.java (63%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java (58%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java (95%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java (74%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java (86%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java (90%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/env/json/EmptyVisitor.java (81%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java (87%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java (86%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/injected/BakedModelRedirection.java (96%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/injected/ManagerContainer.java (50%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/model/EDABakedModel.java (88%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/model/ModelManager.java (88%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java (68%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java (89%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BakedModelManagerMixin.java (80%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BakedModelMixin.java (57%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BasicBakedModelMixin.java (72%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BlockDustParticleMixin.java (84%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BlockModelRendererMixin.java (87%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java (72%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java (85%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java (87%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java (81%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/JsonObjectMixin.java (70%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java (85%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java (80%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/ModelLoaderMixin.java (87%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/MultipartBakedModelMixin.java (72%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java (86%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/WeightedBakedModelMixin.java (81%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/mixin/client/WorldSliceAccessor.java (84%) rename src/main/java/{fr/firstmegagame4 => com/mmodding}/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java (69%) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a75015f..0000000 --- a/LICENSE +++ /dev/null @@ -1,172 +0,0 @@ -License for Environment Driven Assets 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..9b19910 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,175 @@ +### License for Environment Driven Assets (EDA) 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 bbf2e78..a0090b5 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ +[![MModding](https://raw.githubusercontent.com/MModding/mmodding.github.io/main/assets/mmodding_dark_banner.png)](https://mmodding.github.io/discord-link) + # Environment Driven Assets -[EDA logo](https://modrinth.com/mod/env-driven-assets) +[EDA logo](https://modrinth.com/mod/env-driven-assets) -[This Mod is Work in Progress!](https://github.com/FirstMegaGame4/env-driven-assets) +[This Mod is Work in Progress!](https://github.com/MModding/env-driven-assets) ## Supports @@ -13,7 +15,7 @@ [Requires Fabric API](https://modrinth.com/mod/fabric-api) -[Requires env.json](https://modrinth.com/mod/env.json) +[Requires env.json](https://modrinth.com/mod/env.json) ## Concept @@ -33,15 +35,15 @@ Next features like BlockState redirections or Texture redirections are under dev ## Usage For Resource Pack Creators -You will have to look at [the env.json wiki](https://github.com/FirstMegaGame4/env.json?tab=readme-ov-file#the-envjson-format). +You will have to look at [the env.json wiki](https://github.com/MModding/env.json?tab=readme-ov-file#the-envjson-format). Note that Environment Driven Assets currently only loads [env.json](https://modrinth.com/mod/env.json) files present under the `/models/block` asset directory and the `/models/item` directory. ## Badge For Resource Pack Creators -[Recommands Environment Driven Assets](https://modrinth.com/mod/env-driven-assets) +[Recommands Environment Driven Assets](https://modrinth.com/mod/env-driven-assets) -`[Recommands Environment Driven Assets](https://modrinth.com/mod/env-driven-assets)` +`[Recommands Environment Driven Assets](https://modrinth.com/mod/env-driven-assets)` ## Environment Driven New Default @@ -50,7 +52,7 @@ features that Resource Pack Creators can use for their Resource Packs. ### Gallery -EDND Showcase Image +EDND Showcase Image #### EDND Feature Showcase: Few Patches Of Snow Before The True Snowy Grass Block diff --git a/build.gradle b/build.gradle index 0e927c6..4cf95a2 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' } @@ -41,7 +41,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // env.json - modImplementation "com.github.FirstMegaGame4:env.json:${project.env_json_version}" + modImplementation "com.github.MModding:env.json:${project.env_json_version}" // sodium-fabric, needed for compatibility modImplementation "maven.modrinth:sodium:${project.sodium_version}" @@ -53,8 +53,8 @@ dependencies { modImplementation "maven.modrinth:axiom:${project.axiom_version}" modCompileOnly "com.github.moulberry:AxiomClientAPI:1.0.5.3" - // noindium, needed for weirdos that doesn't know what "compatibility" means - include "me.luligabi:NoIndium:${project.noindium_version}" + // noindium, needed for weirdos that doesn't know what "compatibility" means => temporarily disabled + // include "me.luligabi:NoIndium:${project.noindium_version}" } loom { @@ -70,7 +70,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -79,12 +79,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 8048500..2a07d8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,20 +4,20 @@ 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.0.4-alpha -maven_group=fr.firstmegagame4.env.driven.assets +mod_version=0.0.5-alpha +maven_group=com.mmodding.env.driven.assets archives_base_name=env_driven_assets # Dependencies -fabric_version=0.91.3+1.20.4 -env_json_version=0.3.1 +fabric_version=0.97.5+1.20.5 +env_json_version=0.4.0 # Compatibilities -sodium_version=mc1.20.3-0.5.5 -axiom_version=2.3.1 +sodium_version=mc1.20.5-0.5.8 +axiom_version=2.7.0 noindium_version=1.1.0+1.20.4 \ 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/driven/assets/client/EDAEnvJsonVisitors.java b/src/main/java/com/mmodding/env/driven/assets/client/EDAEnvJsonVisitors.java similarity index 68% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/EDAEnvJsonVisitors.java rename to src/main/java/com/mmodding/env/driven/assets/client/EDAEnvJsonVisitors.java index e274f0a..2d1ef4d 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/EDAEnvJsonVisitors.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/EDAEnvJsonVisitors.java @@ -1,16 +1,16 @@ -package fr.firstmegagame4.env.driven.assets.client; +package com.mmodding.env.driven.assets.client; import com.moulberry.axiom.render.regions.ChunkedBlockRegion; import com.moulberry.axiom.render.regions.MapBlockAndTintGetter; -import fr.firstmegagame4.env.driven.assets.client.impl.axiom.AxiomBlockEnvJsonVisitor; -import fr.firstmegagame4.env.driven.assets.client.impl.axiom.MappedBlockAndTintGetterInstance; -import fr.firstmegagame4.env.driven.assets.client.impl.env.json.BlockEnvJsonVisitor; -import fr.firstmegagame4.env.driven.assets.client.impl.env.json.ClientEnvJsonVisitor; -import fr.firstmegagame4.env.driven.assets.client.impl.env.json.EntityEnvJsonVisitor; -import fr.firstmegagame4.env.driven.assets.client.impl.env.json.EmptyVisitor; -import fr.firstmegagame4.env.driven.assets.client.impl.sodium.SodiumBlockEnvJsonVisitor; -import fr.firstmegagame4.env.driven.assets.mixin.client.ChunkRendererRegionAccessor; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; +import com.mmodding.env.driven.assets.client.impl.axiom.AxiomBlockEnvJsonVisitor; +import com.mmodding.env.driven.assets.client.impl.axiom.MappedBlockAndTintGetterInstance; +import com.mmodding.env.driven.assets.client.impl.env.json.BlockEnvJsonVisitor; +import com.mmodding.env.driven.assets.client.impl.env.json.ClientEnvJsonVisitor; +import com.mmodding.env.driven.assets.client.impl.env.json.EntityEnvJsonVisitor; +import com.mmodding.env.driven.assets.client.impl.env.json.EmptyVisitor; +import com.mmodding.env.driven.assets.client.impl.sodium.SodiumBlockEnvJsonVisitor; +import com.mmodding.env.driven.assets.mixin.client.ChunkRendererRegionAccessor; +import com.mmodding.env.json.api.EnvJsonVisitor; import me.jellysquid.mods.sodium.client.world.WorldSlice; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/EDAUtils.java b/src/main/java/com/mmodding/env/driven/assets/client/EDAUtils.java similarity index 97% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/EDAUtils.java rename to src/main/java/com/mmodding/env/driven/assets/client/EDAUtils.java index 7a0383e..6edf9ef 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/EDAUtils.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/EDAUtils.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.client; +package com.mmodding.env.driven.assets.client; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.block.BlockState; import net.minecraft.client.render.model.MultipartUnbakedModel; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/EnvironmentDrivenAssets.java b/src/main/java/com/mmodding/env/driven/assets/client/EnvironmentDrivenAssets.java similarity index 95% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/EnvironmentDrivenAssets.java rename to src/main/java/com/mmodding/env/driven/assets/client/EnvironmentDrivenAssets.java index c8e16cb..215b6b5 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/EnvironmentDrivenAssets.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/EnvironmentDrivenAssets.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.driven.assets.client; +package com.mmodding.env.driven.assets.client; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.context.CommandContext; -import fr.firstmegagame4.env.driven.assets.client.model.plugin.EDAModelLoadingPlugin; +import com.mmodding.env.driven.assets.client.model.plugin.EDAModelLoadingPlugin; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateManager.java b/src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateManager.java similarity index 93% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateManager.java rename to src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateManager.java index 6086c7a..f2185ac 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateManager.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateManager.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.client.blockstate; +package com.mmodding.env.driven.assets.client.blockstate; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateModelProvider.java b/src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateModelProvider.java similarity index 93% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateModelProvider.java rename to src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateModelProvider.java index 62b6e45..31623d2 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/blockstate/BlockStateModelProvider.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/blockstate/BlockStateModelProvider.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.client.blockstate; +package com.mmodding.env.driven.assets.client.blockstate; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.block.BlockState; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/BakedModelDuckInterface.java b/src/main/java/com/mmodding/env/driven/assets/client/duck/BakedModelDuckInterface.java similarity index 57% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/BakedModelDuckInterface.java rename to src/main/java/com/mmodding/env/driven/assets/client/duck/BakedModelDuckInterface.java index 074fbff..c959f45 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/BakedModelDuckInterface.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/duck/BakedModelDuckInterface.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.client.duck; +package com.mmodding.env.driven.assets.client.duck; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; public interface BakedModelDuckInterface { diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonObjectDuckInterface.java b/src/main/java/com/mmodding/env/driven/assets/client/duck/JsonObjectDuckInterface.java similarity index 63% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonObjectDuckInterface.java rename to src/main/java/com/mmodding/env/driven/assets/client/duck/JsonObjectDuckInterface.java index 13cd051..097d292 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonObjectDuckInterface.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/duck/JsonObjectDuckInterface.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.client.duck; +package com.mmodding.env.driven.assets.client.duck; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; // Yeah, it's very awkward, I know public interface JsonObjectDuckInterface { diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java b/src/main/java/com/mmodding/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java similarity index 58% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java rename to src/main/java/com/mmodding/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java index eeeb000..f20a21d 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/duck/JsonUnbakedModelDuckInterface.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.client.duck; +package com.mmodding.env.driven.assets.client.duck; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.json.api.EnvJson; public interface JsonUnbakedModelDuckInterface { diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java similarity index 95% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java index 66b064f..4335dfd 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/AxiomBlockEnvJsonVisitor.java @@ -1,13 +1,13 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.axiom; +package com.mmodding.env.driven.assets.client.impl.axiom; import com.moulberry.axiom.render.regions.ChunkedBlockRegion; import com.moulberry.axiom.render.regions.MapBlockAndTintGetter; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -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.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.json.api.EnvJsonVisitor; +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.client.MinecraftClient; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java similarity index 74% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java index 344e904..ea45d17 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/axiom/MappedBlockAndTintGetterInstance.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.axiom; +package com.mmodding.env.driven.assets.client.impl.axiom; import net.minecraft.world.BlockRenderView; import net.minecraft.world.World; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java similarity index 86% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java index 0e248fb..7f6e32c 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/BlockEnvJsonVisitor.java @@ -1,11 +1,11 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.env.json; +package com.mmodding.env.driven.assets.client.impl.env.json; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -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.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.json.api.EnvJsonVisitor; +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/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java similarity index 90% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java index 9664a3e..c91c819 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/ClientEnvJsonVisitor.java @@ -1,11 +1,11 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.env.json; - -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -import fr.firstmegagame4.env.json.api.rule.SkyEnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.VoidEnvJsonRule; -import fr.firstmegagame4.env.json.api.rule.WaterEnvJsonRule; +package com.mmodding.env.driven.assets.client.impl.env.json; + +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.json.api.EnvJsonVisitor; +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.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/EmptyVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EmptyVisitor.java similarity index 81% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/EmptyVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EmptyVisitor.java index 5d5a882..41d2c3e 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/EmptyVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EmptyVisitor.java @@ -1,9 +1,9 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.env.json; +package com.mmodding.env.driven.assets.client.impl.env.json; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -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.EnvJsonVisitor; +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/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java similarity index 87% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java index 721c834..3085b7a 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/env/json/EntityEnvJsonVisitor.java @@ -1,11 +1,11 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.env.json; +package com.mmodding.env.driven.assets.client.impl.env.json; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -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.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.json.api.EnvJsonVisitor; +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.entity.Entity; import net.minecraft.registry.RegistryKey; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java b/src/main/java/com/mmodding/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java similarity index 86% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java rename to src/main/java/com/mmodding/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java index 92b65c2..d26055e 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/impl/sodium/SodiumBlockEnvJsonVisitor.java @@ -1,12 +1,12 @@ -package fr.firstmegagame4.env.driven.assets.client.impl.sodium; +package com.mmodding.env.driven.assets.client.impl.sodium; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.mixin.client.WorldSliceAccessor; -import fr.firstmegagame4.env.json.api.EnvJsonVisitor; -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.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.mixin.client.WorldSliceAccessor; +import com.mmodding.env.json.api.EnvJsonVisitor; +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 me.jellysquid.mods.sodium.client.world.WorldSlice; import net.minecraft.registry.RegistryKey; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/BakedModelRedirection.java b/src/main/java/com/mmodding/env/driven/assets/client/injected/BakedModelRedirection.java similarity index 96% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/BakedModelRedirection.java rename to src/main/java/com/mmodding/env/driven/assets/client/injected/BakedModelRedirection.java index 2b8f01e..d1cc902 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/BakedModelRedirection.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/injected/BakedModelRedirection.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.client.injected; +package com.mmodding.env.driven.assets.client.injected; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/ManagerContainer.java b/src/main/java/com/mmodding/env/driven/assets/client/injected/ManagerContainer.java similarity index 50% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/ManagerContainer.java rename to src/main/java/com/mmodding/env/driven/assets/client/injected/ManagerContainer.java index 5dc8da2..bbaf8ec 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/injected/ManagerContainer.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/injected/ManagerContainer.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.client.injected; +package com.mmodding.env.driven.assets.client.injected; -import fr.firstmegagame4.env.driven.assets.client.blockstate.BlockStateManager; -import fr.firstmegagame4.env.driven.assets.client.model.ModelManager; +import com.mmodding.env.driven.assets.client.blockstate.BlockStateManager; +import com.mmodding.env.driven.assets.client.model.ModelManager; public interface ManagerContainer { diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/EDABakedModel.java b/src/main/java/com/mmodding/env/driven/assets/client/model/EDABakedModel.java similarity index 88% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/model/EDABakedModel.java rename to src/main/java/com/mmodding/env/driven/assets/client/model/EDABakedModel.java index cfa90a3..467a093 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/EDABakedModel.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/model/EDABakedModel.java @@ -1,10 +1,10 @@ -package fr.firstmegagame4.env.driven.assets.client.model; +package com.mmodding.env.driven.assets.client.model; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.blockstate.BlockStateModelProvider; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.injected.ManagerContainer; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.blockstate.BlockStateModelProvider; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.injected.ManagerContainer; +import com.mmodding.env.json.api.EnvJson; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/ModelManager.java b/src/main/java/com/mmodding/env/driven/assets/client/model/ModelManager.java similarity index 88% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/model/ModelManager.java rename to src/main/java/com/mmodding/env/driven/assets/client/model/ModelManager.java index 3c9f7a0..ef16a72 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/ModelManager.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/model/ModelManager.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.client.model; +package com.mmodding.env.driven.assets.client.model; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.mixin.client.BakedModelCacheKeyAccessor; +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.mixin.client.BakedModelCacheKeyAccessor; import net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java b/src/main/java/com/mmodding/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java similarity index 68% rename from src/main/java/fr/firstmegagame4/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java rename to src/main/java/com/mmodding/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java index f8a6395..e6d8699 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java +++ b/src/main/java/com/mmodding/env/driven/assets/client/model/plugin/EDAModelLoadingPlugin.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.driven.assets.client.model.plugin; +package com.mmodding.env.driven.assets.client.model.plugin; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.model.EDABakedModel; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.model.EDABakedModel; import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier; import net.minecraft.client.render.model.BakedModel; @@ -12,7 +12,7 @@ public class EDAModelLoadingPlugin implements ModelLoadingPlugin { private static BakedModel modifyModelAfterBake(@Nullable BakedModel model, ModelModifier.AfterBake.Context context) { if (model != null && !model.isBuiltin() && context.sourceModel() instanceof JsonUnbakedModelDuckInterface jum && model instanceof BakedModelDuckInterface ducked) { - ((BakedModelDuckInterface) model).env_driven_assets$setEnvJson(jum.env_driven_assets$getEnvJson()); + ducked.env_driven_assets$setEnvJson(jum.env_driven_assets$getEnvJson()); return new EDABakedModel(context.loader(), model, context.settings()); } return model; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java similarity index 89% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java index 3cd0051..3142315 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelCacheKeyAccessor.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import net.minecraft.client.render.model.ModelLoader; import net.minecraft.util.Identifier; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelManagerMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelManagerMixin.java similarity index 80% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelManagerMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelManagerMixin.java index 6cac3c7..628785a 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelManagerMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelManagerMixin.java @@ -1,18 +1,18 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import com.google.gson.JsonObject; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.datafixers.util.Pair; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.client.blockstate.BlockStateManager; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonObjectDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.injected.ManagerContainer; -import fr.firstmegagame4.env.driven.assets.client.model.ModelManager; -import fr.firstmegagame4.env.json.api.resource.ExtendedResource; -import fr.firstmegagame4.env.json.api.resource.ExtendedResourceReader; +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.client.blockstate.BlockStateManager; +import com.mmodding.env.driven.assets.client.duck.JsonObjectDuckInterface; +import com.mmodding.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.injected.ManagerContainer; +import com.mmodding.env.driven.assets.client.model.ModelManager; +import com.mmodding.env.json.api.resource.ExtendedResource; +import com.mmodding.env.json.api.resource.ExtendedResourceReader; import net.minecraft.client.render.model.BakedModelManager; import net.minecraft.client.render.model.ModelLoader; import net.minecraft.resource.Resource; @@ -35,13 +35,12 @@ public class BakedModelManagerMixin implements ManagerContainer { private ModelLoader modelLoader = null; // This mixin works, MCDev is just doing weird checks - @SuppressWarnings("UnresolvedMixinReference") @WrapOperation(method = "method_45898", at = @At(value = "INVOKE", target = "Lcom/mojang/datafixers/util/Pair;of(Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair;")) private static Pair mutateModelValue(F first, S second, Operation> original, @Local(argsOnly = true) Map.Entry entry) { ExtendedResource resource = ExtendedResource.of(entry.getValue()); try { if (resource.getEnvJson() != null) { - EDAUtils.LOGGER.info("env.json file detected for model " + entry.getKey()); + EDAUtils.LOGGER.info("env.json file detected for model {}", entry.getKey()); ((JsonUnbakedModelDuckInterface) second).env_driven_assets$setEnvJson(resource.getEnvJson()); } } diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelMixin.java similarity index 57% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelMixin.java index 8ec379c..5124074 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BakedModelMixin.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.injected.BakedModelRedirection; +import com.mmodding.env.driven.assets.client.injected.BakedModelRedirection; import net.minecraft.client.render.model.BakedModel; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BasicBakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BasicBakedModelMixin.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BasicBakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BasicBakedModelMixin.java index f7fb01b..ba95569 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BasicBakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BasicBakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.client.render.model.BasicBakedModel; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockDustParticleMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockDustParticleMixin.java similarity index 84% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockDustParticleMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockDustParticleMixin.java index 4835fbf..06abd87 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockDustParticleMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockDustParticleMixin.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.model.ModelManager; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.model.ModelManager; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.particle.BlockDustParticle; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockModelRendererMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockModelRendererMixin.java similarity index 87% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockModelRendererMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockModelRendererMixin.java index c003433..b4e049b 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BlockModelRendererMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BlockModelRendererMixin.java @@ -1,9 +1,9 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import com.llamalad7.mixinextras.sugar.Local; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.block.BlockModelRenderer; import net.minecraft.client.render.model.BakedModel; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java index 78e4a1d..b86b33b 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/BuiltinBakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.client.render.model.BuiltinBakedModel; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java similarity index 85% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java index 7cc283e..f6cf0d1 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkRendererRegionAccessor.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import net.minecraft.client.render.chunk.ChunkRendererRegion; import net.minecraft.world.World; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java similarity index 87% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java index 72a3526..4b806be 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ChunkedBlockRegionMixin.java @@ -1,10 +1,10 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.moulberry.axiom.render.regions.ChunkedBlockRegion; -import fr.firstmegagame4.env.driven.assets.client.EDAEnvJsonVisitors; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.EDAEnvJsonVisitors; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.BufferBuilder; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java similarity index 81% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java index 666f6bd..9bab170 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ForwardingBakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel; import net.minecraft.client.render.model.BakedModel; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonObjectMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonObjectMixin.java similarity index 70% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonObjectMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonObjectMixin.java index 0fb5365..c9508c7 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonObjectMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonObjectMixin.java @@ -1,8 +1,8 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import com.google.gson.JsonObject; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonObjectDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.JsonObjectDuckInterface; +import com.mmodding.env.json.api.EnvJson; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java similarity index 85% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java index 206aa35..73a75d4 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/JsonUnbakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.client.render.model.json.JsonUnbakedModel; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java similarity index 80% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java index e8ce455..7d21227 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/MappedBlockAndTintGetterMixin.java @@ -1,6 +1,6 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.impl.axiom.MappedBlockAndTintGetterInstance; +import com.mmodding.env.driven.assets.client.impl.axiom.MappedBlockAndTintGetterInstance; import net.minecraft.world.BlockRenderView; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ModelLoaderMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ModelLoaderMixin.java similarity index 87% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ModelLoaderMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/ModelLoaderMixin.java index 86ee564..2d7f579 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/ModelLoaderMixin.java @@ -1,13 +1,13 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; -import fr.firstmegagame4.env.driven.assets.client.EDAUtils; -import fr.firstmegagame4.env.driven.assets.client.blockstate.BlockStateManager; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonObjectDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; -import fr.firstmegagame4.env.driven.assets.client.injected.ManagerContainer; -import fr.firstmegagame4.env.driven.assets.client.model.ModelManager; +import com.mmodding.env.driven.assets.client.EDAUtils; +import com.mmodding.env.driven.assets.client.blockstate.BlockStateManager; +import com.mmodding.env.driven.assets.client.duck.JsonObjectDuckInterface; +import com.mmodding.env.driven.assets.client.duck.JsonUnbakedModelDuckInterface; +import com.mmodding.env.driven.assets.client.injected.ManagerContainer; +import com.mmodding.env.driven.assets.client.model.ModelManager; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.render.model.*; import net.minecraft.client.render.model.json.JsonUnbakedModel; @@ -54,10 +54,12 @@ public abstract class ModelLoaderMixin implements ManagerContainer { private void computeStatesIntoManager(BlockColors blockColors, Profiler profiler, Map jsonUnbakedModels, Map> blockStates, CallbackInfo ci) { Registries.BLOCK.streamEntries().forEach(ref -> { Identifier stateId = ModelLoader.BLOCK_STATES_FINDER.toResourcePath(ref.registryKey().getValue()); - JsonObjectDuckInterface ducked = (JsonObjectDuckInterface) blockStates.get(stateId); - if (ducked.env_driven_assets$getEnvJson() != null) { - this.blockStateManager.appendBlock(ref.value(), ducked.env_driven_assets$getEnvJson()); - } + blockStates.get(stateId).forEach(source -> { + JsonObjectDuckInterface ducked = (JsonObjectDuckInterface) source.data(); + if (ducked.env_driven_assets$getEnvJson() != null) { + this.blockStateManager.appendBlock(ref.value(), ducked.env_driven_assets$getEnvJson()); + } + }); }); } diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MultipartBakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/MultipartBakedModelMixin.java similarity index 72% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MultipartBakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/MultipartBakedModelMixin.java index c13505c..c929d89 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/MultipartBakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/MultipartBakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.minecraft.client.render.model.MultipartBakedModel; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java similarity index 86% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java index 5a20ae3..f8898b3 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/SpriteBillboardParticleAccessor.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import net.minecraft.client.particle.SpriteBillboardParticle; import net.minecraft.client.texture.Sprite; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WeightedBakedModelMixin.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/WeightedBakedModelMixin.java similarity index 81% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WeightedBakedModelMixin.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/WeightedBakedModelMixin.java index ffb10bc..9d77f05 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WeightedBakedModelMixin.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/WeightedBakedModelMixin.java @@ -1,7 +1,7 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; -import fr.firstmegagame4.env.driven.assets.client.duck.BakedModelDuckInterface; -import fr.firstmegagame4.env.json.api.EnvJson; +import com.mmodding.env.driven.assets.client.duck.BakedModelDuckInterface; +import com.mmodding.env.json.api.EnvJson; import net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.WeightedBakedModel; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WorldSliceAccessor.java b/src/main/java/com/mmodding/env/driven/assets/mixin/client/WorldSliceAccessor.java similarity index 84% rename from src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WorldSliceAccessor.java rename to src/main/java/com/mmodding/env/driven/assets/mixin/client/WorldSliceAccessor.java index 0efb436..207eca5 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/mixin/client/WorldSliceAccessor.java +++ b/src/main/java/com/mmodding/env/driven/assets/mixin/client/WorldSliceAccessor.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.mixin.client; +package com.mmodding.env.driven.assets.mixin.client; import me.jellysquid.mods.sodium.client.world.WorldSlice; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/fr/firstmegagame4/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java b/src/main/java/com/mmodding/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java similarity index 69% rename from src/main/java/fr/firstmegagame4/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java rename to src/main/java/com/mmodding/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java index e970870..5c52575 100644 --- a/src/main/java/fr/firstmegagame4/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java +++ b/src/main/java/com/mmodding/env/driven/assets/plugin/mixin/client/EDAMixinPlugin.java @@ -1,4 +1,4 @@ -package fr.firstmegagame4.env.driven.assets.plugin.mixin.client; +package com.mmodding.env.driven.assets.plugin.mixin.client; import net.fabricmc.loader.api.FabricLoader; import org.objectweb.asm.tree.ClassNode; @@ -22,12 +22,12 @@ public String getRefMapperConfig() { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { if (!FabricLoader.getInstance().isModLoaded("sodium")) { - return !mixinClassName.equals("fr.firstmegagame4.env.driven.assets.mixin.client.WorldSliceAccessor"); + return !mixinClassName.equals("com.mmodding.env.driven.assets.mixin.client.WorldSliceAccessor"); } if (!FabricLoader.getInstance().isModLoaded("axiom")) { - BooleanSupplier mapped = () -> mixinClassName.equals("fr.firstmegagame4.env.driven.assets.mixin.client.MappedBlockAndTintGetterMixin"); - BooleanSupplier chunked = () -> mixinClassName.equals("fr.firstmegagame4.env.driven.assets.mixin.client.ChunkedBlockRegionMixin"); - return !(mapped.getAsBoolean() || chunked.getAsBoolean()); + BooleanSupplier mapped = () -> mixinClassName.equals("com.mmodding.env.driven.assets.mixin.client.MappedBlockAndTintGetterMixin"); + BooleanSupplier chunked = () -> mixinClassName.equals("com.mmodding.env.driven.assets.mixin.client.ChunkedBlockRegionMixin"); + return !mapped.getAsBoolean() && !chunked.getAsBoolean(); } return true; } diff --git a/src/main/resources/assets/env_driven_assets/lang/en_us.json b/src/main/resources/assets/env_driven_assets/lang/en_us.json index bc0a2e4..65b74c2 100644 --- a/src/main/resources/assets/env_driven_assets/lang/en_us.json +++ b/src/main/resources/assets/env_driven_assets/lang/en_us.json @@ -1,4 +1,4 @@ { "resourcePack.env_driven_assets.env_driven_new_default.name": "Environment Driven New Default", - "resourcePack.env_driven_assets.env_driven_new_default.desc": "A Vanilla Plus Resource Pack provided in Resource Driven Assets that showcases some possibilities of the mod." + "resourcePack.env_driven_assets.env_driven_new_default.desc": "A Vanilla Plus Resource Pack provided in Environment Resource Driven Assets that showcases some possibilities of the mod." } diff --git a/src/main/resources/env_driven_assets.mixins.json b/src/main/resources/env_driven_assets.mixins.json index 89dbe1d..d2871c0 100644 --- a/src/main/resources/env_driven_assets.mixins.json +++ b/src/main/resources/env_driven_assets.mixins.json @@ -1,8 +1,8 @@ { "required": true, - "package": "fr.firstmegagame4.env.driven.assets.mixin", - "compatibilityLevel": "JAVA_17", - "plugin": "fr.firstmegagame4.env.driven.assets.plugin.mixin.client.EDAMixinPlugin", + "package": "com.mmodding.env.driven.assets.mixin", + "compatibilityLevel": "JAVA_21", + "plugin": "com.mmodding.env.driven.assets.plugin.mixin.client.EDAMixinPlugin", "mixins": [ "client.ChunkedBlockRegionMixin", "client.JsonObjectMixin", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index af4e03d..8eb02a2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,19 +5,22 @@ "name": "Environment Driven Assets", "description": "Environment Driven Assets is a FabricMC mod which implements the env.json library in order to apply it on vanilla asset types.", "authors": [ + "MModding Team" + ], + "contributors": [ "FirstMegaGame4" ], "contact": { "homepage": "https://modrinth.com/mod/env-driven-assets", - "sources": "https://github.com/FirstMegaGame4/env-driven-assets", - "issues": "https://github.com/FirstMegaGame4/env-driven-assets/issues" + "sources": "https://github.com/MModding/env-driven-assets", + "issues": "https://github.com/MModding/env-driven-assets/issues" }, - "license": "Code: LGPL-3.0\\nAssets: All Rights Reserved", + "license": "Code: PolyForm-Shield-1.0.0\\nAssets: All Rights Reserved", "icon": "assets/env_driven_assets/icon.png", "environment": "client", "entrypoints": { "client": [ - "fr.firstmegagame4.env.driven.assets.client.EnvironmentDrivenAssets" + "com.mmodding.env.driven.assets.client.EnvironmentDrivenAssets" ] }, "accessWidener": "env_driven_assets.accesswidener", @@ -26,19 +29,19 @@ ], "depends": { "fabricloader": ">=0.15.1", - "minecraft": ">=1.20.1 <=1.20.4", - "java": ">=17", + "minecraft": ">=1.20.5", + "java": ">=21", "fabric-api": "*", - "env_json": ">=0.3.0-" + "env_json": ">=0.4.0-" }, "suggests": { "env-driven-data": "*" }, "custom": { "loom:injected_interfaces": { - "net/minecraft/class_1087": [ "fr/firstmegagame4/env/driven/assets/client/injected/BakedModelRedirection" ], - "net/minecraft/class_1088": [ "fr/firstmegagame4/env/driven/assets/client/injected/ManagerContainer" ], - "net/minecraft/class_1092": [ "fr/firstmegagame4/env/driven/assets/client/injected/ManagerContainer" ] + "net/minecraft/class_1087": [ "com/mmodding/env/driven/assets/client/injected/BakedModelRedirection" ], + "net/minecraft/class_1088": [ "com/mmodding/env/driven/assets/client/injected/ManagerContainer" ], + "net/minecraft/class_1092": [ "com/mmodding/env/driven/assets/client/injected/ManagerContainer" ] }, "modmenu": { "parent": "env_json" diff --git a/src/main/resources/resourcepacks/env_driven_new_default/assets/minecraft/models/item/torch-json.env.json b/src/main/resources/resourcepacks/env_driven_new_default/assets/minecraft/models/item/torch-json.env.json index 5b5eb57..7db1496 100644 --- a/src/main/resources/resourcepacks/env_driven_new_default/assets/minecraft/models/item/torch-json.env.json +++ b/src/main/resources/resourcepacks/env_driven_new_default/assets/minecraft/models/item/torch-json.env.json @@ -69,7 +69,7 @@ }, { "type": "biome", - "rule": "minecraft:space_jungle" + "rule": "minecraft:sparse_jungle" } ], "result": "env_driven_new_default:item/jungle_torch" diff --git a/src/main/resources/resourcepacks/env_driven_new_default/pack.mcmeta b/src/main/resources/resourcepacks/env_driven_new_default/pack.mcmeta index 7ad3d50..45a9aab 100644 --- a/src/main/resources/resourcepacks/env_driven_new_default/pack.mcmeta +++ b/src/main/resources/resourcepacks/env_driven_new_default/pack.mcmeta @@ -1,10 +1,6 @@ { "pack": { - "pack_format": 22, - "supported_formats": { - "min_inclusive": 15, - "max_inclusive": 22 - }, + "pack_format": 32, "description": { "translate": "resourcePack.env_driven_assets.env_driven_new_default.desc" }