build(version): 1.4.0->1.4.1

The-Aether-Team · Apr 26, 2024 · 7f704a4 · 7f704a4
1 parent 878ad5a
commit 7f704a4
Show file tree

Hide file tree

Showing 47 changed files with 562 additions and 78 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -6,7 +6,7 @@ orbs:
 parameters:
   artifact-name:
     type: string
-    default: aether-1.19.4-1.4.0-forge.jar
+    default: aether-1.19.4-1.4.1-forge.jar
   deploy-branch:
     type: string
     default: 1.20.1-develop

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,18 @@
+# The Aether - Forge - 1.19.4-1.4.1
+
+Changes
+
+- Rework the follow behavior for Moas now be controlled by shift right-clicking with a Nature Staff instead of by empty hand.
+- Split some Moa Skin elements between the saddle layer and a hat layer.
+- Make the Berry Bush model opaque with the fast graphics option.
+
+Fixes
+
+- Fix Aerbunny boosts sometimes not resetting from jumping on Blue Aerclouds.
+- Fix speed effects not working on Swets and Moas.
+- Fix the wings of Phygs, Flying Cows, and Valkyries not flashing red when hit.
+- Fix gloves letting the sleeve layer clip through them slightly.
+
 # The Aether - Forge - 1.19.4-1.4.0
 
 Additions

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+z# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false

diff --git a/src/generated/resources/.cache/1742123cf955ee7ecf092ba55decb836aa65bc2c b/src/generated/resources/.cache/1742123cf955ee7ecf092ba55decb836aa65bc2c
@@ -1,4 +1,4 @@
-// 1.19.4	2024-01-01T14:23:34.4917018	Block States: aether
+// 1.19.4	2024-04-25T17:08:22.5771969	Block States: aether
 79cb0c0ea34a92e86b03080a209cb60f268cb31e assets/aether/blockstates/aerogel.json
 28f7eea22b621bda459b2328c2252cdebe0bcdb9 assets/aether/blockstates/aerogel_slab.json
 0866f96b2339b894ff4c8a01aebb3d87103eb0fb assets/aether/blockstates/aether_dirt.json
@@ -246,8 +246,8 @@ a8854a5e210ca69e33042bfe746e6971e6a099b4 assets/aether/models/block/mossy_holyst
 cb2a8ab22c6bfe0e3353c310af35d8e990e9f926 assets/aether/models/block/pillar_horizontal.json
 45eca4fd51bdc28e50e4ba3f0587c76d9f7f4450 assets/aether/models/block/pillar_top.json
 f4e9ea5d483484d62b4b6de8aea208b28a2e485c assets/aether/models/block/pillar_top_horizontal.json
-402b62a8443994b9cf239cc5db1a8ddbb30cc007 assets/aether/models/block/potted_berry_bush.json
-62591dd2d094bff022d534b7b91295e86a1e649b assets/aether/models/block/potted_berry_bush_stem.json
+c555738f3c7edf5fbed00421dda5626335df4be2 assets/aether/models/block/potted_berry_bush.json
+60782e46f7fdcad6bb7c691dd203caebc00738fc assets/aether/models/block/potted_berry_bush_stem.json
 7c3a50c0820e7cf446e38e18b7cd7ec07d831566 assets/aether/models/block/potted_golden_oak_sapling.json
 eb9987a5ae084a2563cf1b396202a09d77a8877e assets/aether/models/block/potted_purple_flower.json
 eda9086f5b2a7381d2f2ef777f0196e2a17af85a assets/aether/models/block/potted_skyroot_sapling.json

diff --git a/src/generated/resources/assets/aether/models/block/potted_berry_bush.json b/src/generated/resources/assets/aether/models/block/potted_berry_bush.json
@@ -153,24 +153,24 @@
         "north": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         },
         "south": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         }
       },
       "from": [
-        1,
+        7,
         4,
         8
       ],
@@ -183,6 +183,47 @@
           8
         ]
       },
+      "to": [
+        9,
+        6,
+        8
+      ]
+    },
+    {
+      "faces": {
+        "north": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        },
+        "south": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        }
+      },
+      "from": [
+        1,
+        6,
+        8
+      ],
+      "rotation": {
+        "angle": 45.0,
+        "axis": "y",
+        "origin": [
+          8,
+          8,
+          8
+        ]
+      },
       "to": [
         15,
         16,
@@ -194,25 +235,66 @@
         "east": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         },
         "west": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         }
       },
       "from": [
         8,
         4,
+        7
+      ],
+      "rotation": {
+        "angle": 45.0,
+        "axis": "y",
+        "origin": [
+          8,
+          8,
+          8
+        ]
+      },
+      "to": [
+        8,
+        6,
+        9
+      ]
+    },
+    {
+      "faces": {
+        "east": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        },
+        "west": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        }
+      },
+      "from": [
+        8,
+        6,
         1
       ],
       "rotation": {

diff --git a/src/generated/resources/assets/aether/models/block/potted_berry_bush_stem.json b/src/generated/resources/assets/aether/models/block/potted_berry_bush_stem.json
@@ -153,24 +153,24 @@
         "north": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         },
         "south": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         }
       },
       "from": [
-        1,
+        7,
         4,
         8
       ],
@@ -183,6 +183,47 @@
           8
         ]
       },
+      "to": [
+        9,
+        6,
+        8
+      ]
+    },
+    {
+      "faces": {
+        "north": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        },
+        "south": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        }
+      },
+      "from": [
+        1,
+        6,
+        8
+      ],
+      "rotation": {
+        "angle": 45.0,
+        "axis": "y",
+        "origin": [
+          8,
+          8,
+          8
+        ]
+      },
       "to": [
         15,
         16,
@@ -194,25 +235,66 @@
         "east": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         },
         "west": {
           "texture": "#stem",
           "uv": [
-            0.0,
-            4.0,
-            16.0,
+            7.0,
+            14.0,
+            9.0,
             16.0
           ]
         }
       },
       "from": [
         8,
         4,
+        7
+      ],
+      "rotation": {
+        "angle": 45.0,
+        "axis": "y",
+        "origin": [
+          8,
+          8,
+          8
+        ]
+      },
+      "to": [
+        8,
+        6,
+        9
+      ]
+    },
+    {
+      "faces": {
+        "east": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        },
+        "west": {
+          "texture": "#stem",
+          "uv": [
+            1.0,
+            4.0,
+            15.0,
+            14.0
+          ]
+        }
+      },
+      "from": [
+        8,
+        6,
         1
       ],
       "rotation": {

diff --git a/src/main/java/com/aetherteam/aether/client/event/hooks/HandRenderHooks.java b/src/main/java/com/aetherteam/aether/client/event/hooks/HandRenderHooks.java
@@ -148,7 +148,7 @@ public static void renderPlayerArm(ICurioRenderer renderer, ItemStack glovesStac
         if (isSlim) {
             offset = 5.65F;
         }
-        poseStack.translate(f * offset, 0.0F, 0.0F);
+        poseStack.translate(f * offset, 0.005F, 0.0F);
         switch (handRenderType) {
             case GLOVES -> ((GlovesRenderer) renderer).renderFirstPerson(glovesStack, poseStack, buffer, combinedLight, player, arm);
             case SHIELD_OF_REPULSION -> ((ShieldOfRepulsionRenderer) renderer).renderFirstPerson(glovesStack, poseStack, buffer, combinedLight, player, arm);

diff --git a/src/main/java/com/aetherteam/aether/client/renderer/AetherModelLayers.java b/src/main/java/com/aetherteam/aether/client/renderer/AetherModelLayers.java
@@ -21,6 +21,7 @@ public class AetherModelLayers {
     public static final ModelLayerLocation SHEEPUFF_WOOL_PUFFED = register("sheepuff", "outer_puffed");
     public static final ModelLayerLocation AERBUNNY = register("aerbunny");
     public static final ModelLayerLocation MOA = register("moa");
+    public static final ModelLayerLocation MOA_HAT = register("moa", "hat");
     public static final ModelLayerLocation MOA_SADDLE = register("moa", "saddle");
     public static final ModelLayerLocation AERWHALE = register("aerwhale");
     public static final ModelLayerLocation AERWHALE_CLASSIC = register("aerwhale", "classic");