feat: finish port to 1.21.4

The-Aether-Team · Dec 21, 2024 · 7ebc5c1 · 7ebc5c1
1 parent 67a5ad2
commit 7ebc5c1
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 20 deletions.
diff --git a/common/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java b/common/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java
@@ -39,7 +39,7 @@ protected void renderListBackground(GuiGraphics guiGraphics) { }
     protected void renderListSeparators(GuiGraphics guiGraphics) { }
 
     @Override
-    protected int getScrollbarPosition() {
+    protected int scrollBarX() {
         return (this.parent.width / 2) + (this.parent.frameWidth / 2) - 18;
     }
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Cumulus - 1.21.4-2.0.0
+
+- Port to 1.21.4
+
 # Cumulus - 1.21.3-2.0.0
 
 -  Port to 1.21.3

diff --git a/docs/README.md b/docs/README.md
@@ -36,9 +36,9 @@ If you're interested in sponsoring Cumulus or The Aether Team, please [contact O
 [![Modrinth Version](https://img.shields.io/modrinth/game-versions/cumulus?color=00AF5C&label=latest&logo=modrinth&last=true)](https://modrinth.com/mod/cumulus)
 [![CurseForge Downloads](http://cf.way2muchnoise.eu/cumulus.svg)](https://www.curseforge.com/minecraft/mc-mods/cumulus)
 [![CurseForge Version](http://cf.way2muchnoise.eu/versions/cumulus_latest.svg)](https://www.curseforge.com/minecraft/mc-mods/cumulus)
-[![CircleCI](https://circleci.com/gh/The-Aether-Team/Cumulus/tree/1.21.3-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Cumulus?branch=1.21.3-develop)
+[![CircleCI](https://circleci.com/gh/The-Aether-Team/Cumulus/tree/1.21.4-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Cumulus?branch=1.21.4-develop)
 ### Release builds
-Cumulus has stable release builds available for 1.19.2, 1.19.4, 1.20.1, 1.20.2, 1.20.4, 1.21.1, and 1.21.3 on [Modrinth](https://modrinth.com/mod/cumulus) and [CurseForge](https://www.curseforge.com/minecraft/mc-mods/cumulus).
+Cumulus has stable release builds available for 1.19.2, 1.19.4, 1.20.1, 1.20.2, 1.20.4, 1.21.1, 1.21.3, and 1.21.4 on [Modrinth](https://modrinth.com/mod/cumulus) and [CurseForge](https://www.curseforge.com/minecraft/mc-mods/cumulus).
 
 ### Bleeding edge builds
 If you’re feeling a bit more adventurous or wish to help test the in-development versions, we provide **bleeding edge builds** which are produced on [CircleCI](https://app.circleci.com/pipelines/github/The-Aether-Team/Cumulus). These builds are created for every new commit and contain the latest available code. We do not recommend users treat these builds as releases, as they are unfinished and may contain serious issues. If you wish to download these builds, check out [this guide](https://github.com/The-Aether-Team/Cumulus/wiki/CircleCI-Guide).
@@ -100,12 +100,12 @@ dependencies {
 If you're running into bugs or other problems, feel free to open an issue on our [issue tracker](https://github.com/The-Aether-Team/Cumulus/issues). When doing so, make sure to use one of the provided templates and fill out all the requested information. Make sure to keep your issue's description clear and concise. Your issue's title should also be easy to digest, giving our developers and reporters a good idea of what's wrong without including too many details. Failure to follow any of the above may result in your issue being closed.
 
 ## :wrench: Contribute to the project
-Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Cumulus/blob/1.21.3-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Cumulus/blob/1.21.3-develop/docs/AGREEMENT.md) before getting started.
+Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Cumulus/blob/1.21.4-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Cumulus/blob/1.21.4-develop/docs/AGREEMENT.md) before getting started.
 
 Not sure what to help with? Take a look at our issue tracker for some ideas! [Here's a quick link](https://github.com/The-Aether-Team/Cumulus/labels/status%2Fhelp-wanted) which shows all the currently open issues that we'd love some help on.
 
 ## :scroll: License information
-[![License (LGPL v3.0)](https://img.shields.io/badge/license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Cumulus/blob/1.21.3-develop/LICENSE.txt)
+[![License (LGPL v3.0)](https://img.shields.io/badge/license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Cumulus/blob/1.21.4-develop/LICENSE.txt)
 
 If you're wanting to create a gameplay video/review, extension or addon, parody, or any other fan work of your own for Cumulus, go for it! We love seeing the content our community creates, and we hope to make it as welcoming as possible for everyone. We ask however that you please don't advertise using our brand (our specific logo assets, team name, official social media posts).
 
@@ -126,4 +126,4 @@ Cumulus is available in these languages thanks to the following contributors:
 If you are interested in contributing translations to Cumulus, check out our [Crowdin](https://translate.cumulus.devaether.com/) and our [Discord](https://discord.gg/aethermod)! If you have contributed translations in the past and your name is missing from the above list, please contact us.
 
 ### :hammer: Contributions
-All of our code contribution credits can be found [here](https://github.com/The-Aether-Team/Cumulus/blob/1.21.3-develop/docs/CREDITS.txt). If you contributed to the project and do not see your name, please contact us.
+All of our code contribution credits can be found [here](https://github.com/The-Aether-Team/Cumulus/blob/1.21.4-develop/docs/CREDITS.txt). If you contributed to the project and do not see your name, please contact us.
diff --git a/fabric/src/main/generated/.cache/ae1d30c191d4db2b7f214b6d362f276779fea27b b/fabric/src/main/generated/.cache/ae1d30c191d4db2b7f214b6d362f276779fea27b
@@ -1,2 +1,2 @@
-// 1.21.3	2024-12-21T10:50:42.9270876	Cumulus/Pack Metadata
-911e45306939be3e6c4f3bd08e4fcc229a142b33 pack.mcmeta
+// 1.21.4	-999999999-01-01T00:00:00	Cumulus/Pack Metadata
+49cd2028d69248861ad9f6eef003d0ede50bdea4 pack.mcmeta
diff --git a/fabric/src/main/generated/.cache/d201efe10f782834b959d1d9aa09d02766e262cc b/fabric/src/main/generated/.cache/d201efe10f782834b959d1d9aa09d02766e262cc
@@ -1,2 +1,2 @@
-// 1.21.3	2024-12-21T10:50:42.9260874	Cumulus/Language (en_us)
-b698ad6fb052eaa41b9335a7feb9bac53529c4db assets\cumulus_menus\lang\en_us.json
+// 1.21.4	-999999999-01-01T00:00:00	Cumulus/Language (en_us)
+b698ad6fb052eaa41b9335a7feb9bac53529c4db assets/cumulus_menus/lang/en_us.json
diff --git a/fabric/src/main/generated/pack.mcmeta b/fabric/src/main/generated/pack.mcmeta
@@ -3,6 +3,6 @@
     "description": {
       "translate": "pack.cumulus_menus.mod.description"
     },
-    "pack_format": 42
+    "pack_format": 46
   }
 }
diff --git a/fabric/src/main/java/com/aetherteam/cumulus/client/event/listeners/WorldPreviewListener.java b/fabric/src/main/java/com/aetherteam/cumulus/client/event/listeners/WorldPreviewListener.java
@@ -10,6 +10,7 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
+import net.minecraft.client.renderer.entity.state.EntityRenderState;
 import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
 import net.minecraft.world.entity.Entity;
 
@@ -67,7 +68,7 @@ public static void onRenderPlayer(PlayerRenderer renderer, CancellableCallback c
     }
 
     /**
-     * @see WorldPreviewHooks#shouldHideEntity(Entity)
+     * @see WorldPreviewHooks#shouldHideEntity(EntityRenderer, EntityRenderState, float)
      * @see WorldPreviewHooks#adjustShadow(EntityRenderer, boolean)
      */
     public static void onRenderEntity(LivingEntityRenderState renderState, EntityRenderer<?, ?> renderer, float partialTick, CancellableCallback callback) {

diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ mod_name=Cumulus
 mod_version=2.0.0
 mod_license=LGPL-3.0
 mod_url=https://modrinth.com/mod/cumulus
-mod_update=https://github.com/The-Aether-Team/Cumulus/raw/1.21.3-develop/update.json
+mod_update=https://github.com/The-Aether-Team/Cumulus/raw/1.21.4-develop/update.json
 mod_tracker=https://github.com/The-Aether-Team/Cumulus/issues
 mod_credits=The Aether Team; kingbdogz, for the original Main Menu API that this is inspired by
 mod_authors=AlphaMode, bconlon, Blodhgarm

diff --git a/neoforge/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/neoforge/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86
@@ -1,2 +1,2 @@
-// 1.21.3	2024-12-21T10:49:52.5635634	Pack Metadata
-911e45306939be3e6c4f3bd08e4fcc229a142b33 pack.mcmeta
+// 1.21.4	2024-12-21T11:19:04.9072747	Pack Metadata
+49cd2028d69248861ad9f6eef003d0ede50bdea4 pack.mcmeta
diff --git a/neoforge/src/generated/resources/.cache/222c7a37905a9e3eae8a1bd77013bedc2d6bd57a b/neoforge/src/generated/resources/.cache/222c7a37905a9e3eae8a1bd77013bedc2d6bd57a
@@ -1,2 +1,2 @@
-// 1.21.3	2024-12-21T10:49:52.5145659	Languages: en_us for mod: cumulus_menus
+// 1.21.4	2024-12-21T11:19:04.8685631	Languages: en_us for mod: cumulus_menus
 b698ad6fb052eaa41b9335a7feb9bac53529c4db assets/cumulus_menus/lang/en_us.json
diff --git a/neoforge/src/generated/resources/pack.mcmeta b/neoforge/src/generated/resources/pack.mcmeta
@@ -3,6 +3,6 @@
     "description": {
       "translate": "pack.cumulus_menus.mod.description"
     },
-    "pack_format": 42
+    "pack_format": 46
   }
 }
diff --git a/neoforge/src/main/java/com/aetherteam/cumulus/CumulusNeoForge.java b/neoforge/src/main/java/com/aetherteam/cumulus/CumulusNeoForge.java
@@ -35,7 +35,7 @@ public void clientSetup(FMLClientSetupEvent event) {
         event.enqueueWork(Menus::init);
     }
 
-    public void dataSetup(GatherDataEvent event) {
+    public void dataSetup(GatherDataEvent.Client event) {
         DataGenerator generator = event.getGenerator();
         PackOutput packOutput = generator.getPackOutput();
 

diff --git a/...rge/src/main/java/com/aetherteam/cumulus/client/event/listeners/WorldPreviewListener.java b/...rge/src/main/java/com/aetherteam/cumulus/client/event/listeners/WorldPreviewListener.java
@@ -89,7 +89,7 @@ public static void onRenderOverlay(RenderGuiLayerEvent.Pre event) {
     }
 
     /**
-     * @see WorldPreviewHooks#shouldHidePlayer()
+     * @see WorldPreviewHooks#shouldHideEntity(EntityRenderer, EntityRenderState, float)
      * @see WorldPreviewHooks#adjustShadow(EntityRenderer, boolean)
      */
     @SubscribeEvent

diff --git a/update.json b/update.json
@@ -7,6 +7,7 @@
     "1.20.2-recommended": "1.20.2-1.0.1-neoforge",
     "1.20.4-recommended": "1.20.4-1.0.1-neoforge",
     "1.21.1-recommended": "2.0.0",
-    "1.21.3-recommended": "2.0.0"
+    "1.21.3-recommended": "2.0.0",
+    "1.21.4-recommended": "2.0.0"
   }
 }