From fd4c2b970d41fad8bcc2321d2c4ab1d99212542c Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 22 Dec 2019 19:06:37 +0100 Subject: [PATCH 01/12] Fix release action --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8391bbcd5..02cf88308 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,13 +3,13 @@ name: Requiem Release on: pull_request: types: [closed] - branches: + branches: - master jobs: 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 From 2dc829b3f7aadd0bc054e516296ce7fb55eb4ad1 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 22 Dec 2019 19:48:52 +0100 Subject: [PATCH 02/12] Fix github release --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 474cac72d..cf6f21727 100644 --- a/build.gradle +++ b/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 } From 656a0f8ed47233e4212633a63757d906ba1de048 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 22 Dec 2019 21:42:07 +0100 Subject: [PATCH 03/12] Add action check for release PR --- .github/workflows/release.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02cf88308..8fbdc167d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,24 @@ name: Requiem Release on: pull_request: - types: [closed] + 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 && contains(github.event.pull_request.labels.nodes.*.name, "release")) From 6ff95b6073ce5dacd965b9d9e3f35bf9d11f85af Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 22 Dec 2019 21:46:24 +0100 Subject: [PATCH 04/12] Add a build check github action --- .github/workflows/build_check.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/build_check.yml diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml new file mode 100644 index 000000000..155c5bd87 --- /dev/null +++ b/.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 From ac26f3b0fb15ac351d49c1a095435746ceafe33c Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 22 Dec 2019 21:47:04 +0100 Subject: [PATCH 05/12] Add changelog url for CF and GH releases --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ca597c3df..cb2b03aa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 From fe05fa281d038c08355e0fd0212fe05765940a3a Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Mon, 23 Dec 2019 21:24:29 +0100 Subject: [PATCH 06/12] Allow hallow's mummy possession, closes #166 --- .../requiem/tags/entity_types/item_user.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data/requiem/tags/entity_types/item_user.json b/src/main/resources/data/requiem/tags/entity_types/item_user.json index 10273a449..fc2114d4d 100644 --- a/src/main/resources/data/requiem/tags/entity_types/item_user.json +++ b/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" + ] + } + ] + } } From 33d283fe9cbe2a4e682056db5c53c1847c191333 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Mon, 23 Dec 2019 22:38:12 +0100 Subject: [PATCH 07/12] Fix crash when possessing guardians --- .../pandemonium/common/entity/ability/GuardianBeamAbility.java | 1 + 1 file changed, 1 insertion(+) diff --git a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/ability/GuardianBeamAbility.java b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/ability/GuardianBeamAbility.java index 7f2f16b1c..6e05a327d 100644 --- a/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/ability/GuardianBeamAbility.java +++ b/expansions/pandemonium/src/main/java/ladysnake/pandemonium/common/entity/ability/GuardianBeamAbility.java @@ -74,6 +74,7 @@ public void update() { try { Class 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) { From 095071b49bf2e86a28210ee81412fb97204b4352 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 24 Dec 2019 01:21:28 +0100 Subject: [PATCH 08/12] Add some compatibility for health overlay, fixes #167 --- .../healthoverlay/HealthRendererMixin.java | 28 +++++++++++++++++++ src/main/resources/mixins.requiem.client.json | 1 + 2 files changed, 29 insertions(+) create mode 100644 src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java diff --git a/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java b/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java new file mode 100644 index 000000000..7b3fed874 --- /dev/null +++ b/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java @@ -0,0 +1,28 @@ +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; + } +} diff --git a/src/main/resources/mixins.requiem.client.json b/src/main/resources/mixins.requiem.client.json index 67beaf199..6d3e9daf2 100644 --- a/src/main/resources/mixins.requiem.client.json +++ b/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", From f2e52039d091eb76c09a98e6ee1dd79881c07f80 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 24 Dec 2019 01:27:55 +0100 Subject: [PATCH 09/12] Bump version and fill in changelog --- changelog.md | 9 +++++++++ expansions/pandemonium/changelog.md | 6 ++++++ gradle.properties | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 69a84c3a8..5caa01602 100644 --- a/changelog.md +++ b/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 ------------------------------------------------------ diff --git a/expansions/pandemonium/changelog.md b/expansions/pandemonium/changelog.md index bc22bc5a8..1187515b6 100644 --- a/expansions/pandemonium/changelog.md +++ b/expansions/pandemonium/changelog.md @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 1.1.2 +------------------------------------------------------ +Bug Fixes +- Fixed crash when possessing guardians + ------------------------------------------------------ Version 0.1.0 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index cb2b03aa6..80de8b7d3 100644 --- a/gradle.properties +++ b/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 From 1b463d7b74fdff4c0d6c200164343c50f81a3e63 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 24 Dec 2019 01:32:02 +0100 Subject: [PATCH 10/12] Use single quotes in github action --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8fbdc167d..0d6bafbb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: jobs: check_release: runs-on: ubuntu-latest - if: contains(github.event.pull_request.labels.nodes.*.name, "release")) + if: contains(github.event.pull_request.labels.nodes.*.name, 'release')) steps: - uses: actions/checkout@v1 From 47c782ffe6ff6b6d2fa241680d8c7084fc478d43 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 24 Dec 2019 01:33:35 +0100 Subject: [PATCH 11/12] Fix parens in github action --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d6bafbb7..1834680d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: jobs: check_release: runs-on: ubuntu-latest - if: contains(github.event.pull_request.labels.nodes.*.name, 'release')) + if: contains(github.event.pull_request.labels.nodes.*.name, 'release') steps: - uses: actions/checkout@v1 @@ -22,7 +22,7 @@ jobs: release: runs-on: ubuntu-latest - if: github.event.pull_request.merged && contains(github.event.pull_request.labels.nodes.*.name, "release")) + if: github.event.pull_request.merged && contains(github.event.pull_request.labels.nodes.*.name, 'release') steps: - uses: actions/checkout@v1 From 70a921b46b5eac705f6fa9cef476a7c923998acc Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Tue, 24 Dec 2019 01:44:34 +0100 Subject: [PATCH 12/12] Update license headers --- .../healthoverlay/HealthRendererMixin.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java b/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java index 7b3fed874..60177c64b 100644 --- a/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java +++ b/src/main/java/ladysnake/requiem/mixin/client/compat/healthoverlay/HealthRendererMixin.java @@ -1,3 +1,20 @@ +/* + * 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 . + */ package ladysnake.requiem.mixin.client.compat.healthoverlay; import ladysnake.requiem.api.v1.RequiemPlayer;