1.1.2 Update (#168)

1.1.2 Update

.github/workflows/build_check.yml

@@ -0,0 +1,17 @@
+name: Build Check
+
+on: [push, pull_request]
+
+jobs:
+    build:
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v1
+            - name: Set up JDK 1.8
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+            - name: Build with Gradle
+              run: ./gradlew build

.github/workflows/release.yml

@@ -2,14 +2,27 @@ name: Requiem Release
 
 on:
   pull_request:
-    types: [closed]
-    branches: 
+    types: [closed, labeled, opened, edited, synchronize]
+    branches:
       - master
 
 jobs:
+  check_release:
+    runs-on: ubuntu-latest
+    if: contains(github.event.pull_request.labels.nodes.*.name, 'release')
+
+    steps: 
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: ./gradlew checkGitStatus
+
   release:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged && github.event.pull_request.labels.nodes.*.name.contains("release")
+    if: github.event.pull_request.merged && contains(github.event.pull_request.labels.nodes.*.name, 'release')
 
     steps:
     - uses: actions/checkout@v1

build.gradle

@@ -245,7 +245,7 @@ githubRelease {
     // default repo: name of the project
     tagName = project.version
     targetCommitish = { grgit.branch.current().name }
-    body = { getChangelog() }
+    body = { project.getChangelogText() }
 
     FilenameFilter filter = { dir, filename -> filename.contains(project.version) && !filename.contains('-dev.jar') }
     releaseAssets = { jar.destinationDirectory.asFile.get().listFiles filter }

changelog.md

@@ -1,3 +1,12 @@
+------------------------------------------------------
+Version 1.1.2
+------------------------------------------------------
+Additions
+- Mummies from The Hallow can now be possessed
+
+Bug Fixes
+- Fixed health bar not being right during possession when Health Overlay is installed
+
 ------------------------------------------------------
 Version 1.1.1
 ------------------------------------------------------

expansions/pandemonium/changelog.md

@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 1.1.2
+------------------------------------------------------
+Bug Fixes
+- Fixed crash when possessing guardians
+
 ------------------------------------------------------
 Version 0.1.0
 ------------------------------------------------------

expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/ability/GuardianBeamAbility.java

@@ -74,6 +74,7 @@ public void update() {
         try {
             Class<? extends Goal> clazz = ReflectionHelper.findClass("net.minecraft.class_1577$class_1578");
             BEAM_GOAL_FACTORY = clazz.getConstructor(GuardianEntity.class);
+            BEAM_GOAL_FACTORY.setAccessible(true);
         } catch (ClassNotFoundException e) {
             throw new UncheckedReflectionException("Could not find the FireBeamGoal class", e);
         } catch (NoSuchMethodException e) {

gradle.properties

@@ -3,7 +3,7 @@
 org.gradle.jvmargs = -Xmx5G
 
 # Base properties
-mod_version = 1.1.1
+mod_version = 1.1.2
 maven_group = io.github.Ladysnake
 
 #General
@@ -36,4 +36,4 @@ curseforge_versions = 1.15; 1.15.1
 cf_requirements = fabric-api
 cf_embeddeds = cardinal-components; libcd
 release_type = release
-
+changelog_url = https://github.com/Ladysnake/Requiem/blob/master/changelog.md

src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java

@@ -0,0 +1,45 @@
+/*
+ * Requiem
+ * Copyright (C) 2019 Ladysnake
+ *
+ * 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>.
+ */
+package ladysnake.requiem.mixin.client.compat.healthoverlay;
+
+import ladysnake.requiem.api.v1.RequiemPlayer;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Pseudo
+@Mixin(targets = "terrails.healthoverlay.HealthRenderer")
+public class HealthRendererMixin {
+    @Shadow
+    private MinecraftClient client;
+
+    @ModifyVariable(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getMeasuringTimeMs()J"), ordinal = 1)
+    private int substituteHealth(int health) {
+        assert client.player != null;
+        LivingEntity entity = ((RequiemPlayer)client.player).asPossessor().getPossessedEntity();
+        if (entity != null) {
+            return MathHelper.ceil(entity.getHealth());
+        }
+        return health;
+    }
+}

src/main/resources/data/requiem/tags/entity_types/item_user.json

@@ -6,6 +6,19 @@
     "#requiem:zombies",
     "#requiem:skeletons",
     "#requiem:humans"
-
-  ]
+  ],
+  "libcd": {
+    "entries": [
+      {
+        "when": [
+          {
+            "libcd:mod_loaded": "thehallow"
+          }
+        ],
+        "values": [
+          "thehallow:mummy"
+        ]
+      }
+    ]
+  }
 }

src/main/resources/mixins.requiem.client.json

@@ -5,6 +5,7 @@
   "minVersion": "0.7.11-SNAPSHOT",
   "mixins": [
     "MinecraftClientMixin",
+    "compat.healthoverlay.HealthRendererMixin",
     "entity.ClientEntityMixin",
     "gui.container.BookScreenMixin",
     "gui.container.LecternScreenMixin",