Merge branch '0.2.0/1.19/master' into 0.2.0/1.19/slide

CONTRIBUTING.md

@@ -20,56 +20,24 @@
 
 * Open a new GitHub pull request with the patch.
 
-* Ensure the PR description clearly describes the problem and solution. Use the PR template. Include the relevant issue number if applicable.
+* Ensure the PR description clearly describes the problem (or a link to the relevant issue, if applicable) and solution. Use the PR template.
+
+* Before submitting, please check that your code matches our code style. The repo contains a checkstyle, which you should try to follow.
 
-* Before submitting, please check that your code matches our code style (Example):
-```java
-    /**
-     * This code is actually gibberish. It's a mishmash of things intended to show our code style.
-     * <br>~ Jack
-     */
-    @Inject(
-        method = "tickEntities", 
-        at = @At(
-            value = "INVOKE", 
-            target = "Lnet/minecraft/client/world/ClientWorld;tickBlockEntities()V"
-        ),
-        cancellable = true
-    )
-    private void postEntityTick(CallbackInfo ci) {
-        for (Entity entity : entityList) {
-            if (entity instanceof PostTickEntity postTickEntity) {
-                postTickEntity.postTick();
-                ci.cancel();
-            }
-        }
-        BlockLikeSet.getAllStructures().forEachRemaining(BlockLikeSet::postTick);
-    }
-    // Oh, and use spaces, not tabs.
-```
 #### **Do you have write access to the repo and want to make a change?**
 
 * **MAKE A PULL REQUEST FOR NEW FEATURES**.
-* Refer to CDA's details on contribution and branch names:
+* Refer to these details on contribution and branch names:
 ```
-**<MCVER>**: Assume these are production/live branches unless otherwise written or stated.
+**<VER>/<MCVER>/master**: Assume these are production/live branches unless otherwise written or stated.
   - Only push code here that is tested and expected to ship in the next applicable update
-**experimental/<MCVER>**: Experimental Snapshot branches (Separate category due to mojang typically using different baseline versions)
-  - Only port changes are allowed to be pushed here, as this branch is typically rebased off the latest stable/matching **<MCVER>** baseline.
-**snapshots**: Primary snapshot branch, typically the next short-term minecraft update
-  - Same regulations as **experimental/<MCVER>**, only port changes should be in this branch.
-
-**feature/<TARGET>/<FEATURE_NAME>**: Feature branches designated for the specified upcoming release
-  - These branches get merged into **next** when applicable, ready, and tested enough to be accepted into **next**
-
-**next**: Branch designated for the next major revision to project, typically baselined off the latest game version (Or pre-release if applicable)
-  - Segment into **next/<VERSION>** if multiple releases are in active development
-  - In the case of the baseline being a snapshot/pre-releases, **Do not push port changes here -- they will eventually be baselined into next via rebase or merging the baseline into next**
+  
+**<VER>/<MCVER>/<FEATURE_NAME>**: Feature branches designated for the specified upcoming release
+  - These branches get merged into **<VER>/<MCVER>/master** when applicable, ready, and tested enough to be accepted.
 ```
 #### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
 
 * Changes that are cosmetic in nature and do not add anything substantial to the project will likely not be accepted.
-
 * Documentation changes may be accepted if the changes are not just grammar fixes.
 
 #### **Do you intend to add a new feature or change an existing one?**
@@ -87,7 +55,7 @@
     /**
      * Write reasonable documentation for non-obvious methods.
      * For public facing APIs, like {@link net.id.aether.api.MoaAPI} or {@link net.id.aether.api.FloatingBlockHelper}, 
-     * fully document everything that is public. ^ (Also, use these @link tags when possible)
+     * fully document everything that is public. ^ (Also, use these @link tags to other things public)
      * <br>Use @param and @return tags if non-obvious or if specific values may give strange results.
      * <br>If you didn't write the code and you're just adding docs, end your docs with a tilde and your
      * name/username. If you did write it, then just the @author tag is alright.

README.md

@@ -1,5 +1,5 @@
 # Paradise Lost
-[![Code license (GNU GPL 3.0)](https://img.shields.io/badge/code%20license-GNU%20GPLv3-green.svg?style=flat)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+[![Code license (GNU GPL 3.0)](https://img.shields.io/github/license/devs-immortal/Paradise-Lost)](https://github.com/devs-immortal/Paradise-Lost/blob/0.2.0/1.19/master/LICENSE.md)
 [![Asset license (Unlicensed)](https://img.shields.io/badge/assets%20license-All%20Rights%20Reserved-red.svg?style=flat)](https://creativecommons.org/licenses/by-sa/4.0/)
 [![Github all releases](https://img.shields.io/github/downloads/kalucky0/The-Aether/total.svg?logoColor=FFFFFF&logo=github)](https://github.com/devs-immortal/The-Aether/releases/)
 
@@ -14,9 +14,9 @@ The Aether is a dimension high in the sky composed of floating islands.
 Ascend through a Glowstone portal and begin a new survival adventure packed with new ores, structures to explore, mythical creatures, and perilous dungeons. Build a Glowstone frame and add water to light the mystical portal, step in and be transported to the beautiful but hostile paradise known as the Aether.
 This tranquil oasis is the polar opposite of the Nether, filled with lush trees and foliage, and populated by unique and exotic mobs, both hostile and friendly. The Aether is deceptively charming, and the further you explore, the darker its secrets get. Mine new ores, craft new gear, explore hidden temples and dungeons, and battle to claim The Aether as your own.
 
-You can download the mod on [Modrinth](https://modrinth.com/mod/aether), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/paradise-lost), or in the [releases tab](https://github.com/devs-immortal/Paradise-Lost/releases) on Github.
+You can download the mod on [Modrinth](https://modrinth.com/mod/paradise-lost), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/paradise-lost), or in the [releases tab](https://github.com/devs-immortal/Paradise-Lost/releases) on Github.
 
-**Original repo:** [GildedGames/The-Aether](https://gitea.gildedgames.com/GildedGames/The-Aether)
+**Original repo:** [GildedGames/The-Aether](https://github.com/Gilded-Games/The-Aether)
 
 ## Support
 [![Discord](https://img.shields.io/discord/770691727568404521.svg?logoColor=FFFFFF&logo=discord&color=7289DA)](https://discord.com/invite/wmMa47n)
@@ -41,25 +41,9 @@ Paradise Lost makes use of crowd sourced translations.
 
 ## License information
 Created by Immortal Devs.\
-Originally made by [Gilded Games](https://gildedgames.com/) under GNU GPLv3 license.\
-New assets are unlicensed and all rights are reserved to them by Immortal Devs.
+Inspired by [Gilded Games' The Aether](https://github.com/Gilded-Games/The-Aether), which uses the GNU GPLv3 license.\
+Assets are all rights are reserved by Immortal Devs.
 
-```
-    Copyright (C) 2021 Immortal Devs
+You can find out more information about the license [here](https://github.com/devs-immortal/Paradise-Lost/blob/0.2.0/1.19/master/LICENSE.md).
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-```
-You can find more about GNU GPLv3 on [this website](https://www.gnu.org/licenses/gpl-3.0.en.html).
-
-<a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api" target="_blank"><img alt="Fabric API - Mods - Minecraft - CurseForge" src="https://i.imgur.com/Ol1Tcf8.png" height="48"></a>&nbsp;&nbsp;<a href="https://www.curseforge.com/minecraft/mc-mods/trinkets-fabric" target="_blank"><img alt="Trinkets (Fabric) - Mods - Minecraft - CurseForge" src="https://kalucky0.b-cdn.net/trinkets.webp" height="48"></a>
+<a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api" target="_blank"><img alt="Fabric API - Mods - Minecraft - CurseForge" src="https://i.imgur.com/Ol1Tcf8.png" height="48"></a>&nbsp;&nbsp;<a href="https://www.curseforge.com/minecraft/mc-mods/trinkets" target="_blank"><img alt="Trinkets (Fabric) - Mods - Minecraft - CurseForge" src="https://kalucky0.b-cdn.net/trinkets.webp" height="48"></a>

build.gradle.kts

@@ -68,11 +68,6 @@ repositories {
         url = uri("https://maven.jamieswhiteshirt.com/libs-release/")
     }
 
-    maven {
-        name = "Gudenau"
-        url = uri("https://maven.gudenau.net")
-    }
-
     maven {
         name = "Modrinth"
         url = uri("https://api.modrinth.com/maven")
@@ -82,6 +77,11 @@ repositories {
         name = "Jitpack"
         url = uri("https://jitpack.io")
     }
+
+    maven {
+        name = "Gudenau"
+        url = uri("https://maven.gudenau.net")
+    }
 }
 
 dependencies {
@@ -176,11 +176,11 @@ dependencies {
             version = modmenuVersion,
     )
 
-    modRuntimeOnly(
-            group = "me.shedaniel",
-            name = "RoughlyEnoughItems-fabric",
-            version = reiVersion,
-    )
+//    modRuntimeOnly(
+//            group = "me.shedaniel",
+//            name = "RoughlyEnoughItems-fabric",
+//            version = reiVersion,
+//    )
 
     include(
             group = "maven.modrinth",

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.jvmargs=-Xmx2G
 
 paradiseLostVersion=0.2.0-beta+1.19
 
-minecraftVersion=1.19
-yarnVersion=1.19+build.1
-loaderVersion=0.14.6
+minecraftVersion=1.19.2
+yarnVersion=1.19.2+build.4
+loaderVersion=0.14.9
 javaVersion=17
 
-fabricApiVersion=0.55.1+1.19
-incubusCoreVersion=1.19-SNAPSHOT
-customportalapiVersion=0.0.1-beta51-1.19
-cardinalComponentsVersion=5.0.0-beta.1
+fabricApiVersion=0.60.0+1.19.2
+incubusCoreVersion=1.7.0
+customportalapiVersion=0.0.1-beta54-1.19
+cardinalComponentsVersion=5.0.1
 trinketsVersion=3.4.0
-crowdinTranslateVersion=1.18.2
+crowdinTranslateVersion=1.19.2
 entityAttributesVersion=2.3.0
-modmenuVersion=4.0.0
-reiVersion=9.0.484
+modmenuVersion=4.0.6
+reiVersion=9.1.530
 moreTagsVersion=3.0.5
 recipeConfidenceVersion=1.0.2
 satinVersion=1.8.0

src/main/java/net/id/aether/client/model/AetherModelLayers.java

@@ -26,6 +26,7 @@ public class AetherModelLayers {
     public static final EntityModelLayer MOA = register("moa", "main", MoaModel.getTexturedModelData());
     public static final EntityModelLayer ROOK = register("rook", "main", RookModel.getTexturedModelData());
     public static final EntityModelLayer ROOK_GLOW = register("rook_glow", "glow", RookModel.getTexturedModelData());
+    public static final EntityModelLayer AMBYST = register("ambyst", "main", AmbystModel.getTexturedModelData());
     public static final EntityModelLayer PHOENIX_ARMOR = register("phoenix_armor", "main", PhoenixArmorModel.getTexturedModelData());
 
     public static final EntityModelLayer DUNGEON_SWITCH = register("dungeon_switch", "main", DungeonSwitchModel.getTexturedModelData());