From bdb69dffccd8407c18c460f13e2f2468a83e2ec7 Mon Sep 17 00:00:00 2001 From: SirRemus <82674655+SirRemus@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:20:35 -0400 Subject: [PATCH 1/5] Update LootTableMixin.java --- .../com/carpet_shadow/mixins/general/LootTableMixin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/carpet_shadow/mixins/general/LootTableMixin.java b/src/main/java/com/carpet_shadow/mixins/general/LootTableMixin.java index d4ec66a..100ac90 100644 --- a/src/main/java/com/carpet_shadow/mixins/general/LootTableMixin.java +++ b/src/main/java/com/carpet_shadow/mixins/general/LootTableMixin.java @@ -3,6 +3,7 @@ import com.carpet_shadow.CarpetShadowSettings; import net.minecraft.item.ItemStack; import net.minecraft.loot.LootTable; +import net.minecraft.loot.context.LootContext; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -13,14 +14,15 @@ @Mixin(LootTable.class) public class LootTableMixin { @Inject(method = "processStacks", at=@At("RETURN"), cancellable = true) - private static void fix_survival_shulkers(Consumer lootConsumer, CallbackInfoReturnable> cir){ + private static void fix_survival_shulkers(LootContext lootContext, Consumer lootConsumer, CallbackInfoReturnable> cir) { Consumer consumer = cir.getReturnValue(); Consumer ret = itemStack -> { if (CarpetShadowSettings.shadowItemMode != CarpetShadowSettings.Mode.UNLINK && itemStack.getCount() == itemStack.getMaxCount()) { lootConsumer.accept(itemStack); - } else - consumer.accept(itemStack); + } else { + consumer.accept(itemStack); + } }; cir.setReturnValue(ret); } From 413b3d3490c24baeffb95a88dc2e663b2eef94ca Mon Sep 17 00:00:00 2001 From: SirRemus <82674655+SirRemus@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:42:47 -0400 Subject: [PATCH 2/5] Create gradle.yml --- .github/workflows/gradle.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..370a293 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,34 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ "1.19" ] + pull_request: + branches: [ "1.19" ] + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + - name: Build with Gradle + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: build From 096a34bb89ffc4c196475f20e995ab28642b158f Mon Sep 17 00:00:00 2001 From: SirRemus <82674655+SirRemus@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:44:43 -0400 Subject: [PATCH 3/5] Delete gradle.yml --- .github/workflows/gradle.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 370a293..0000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle - -name: Java CI with Gradle - -on: - push: - branches: [ "1.19" ] - pull_request: - branches: [ "1.19" ] - -permissions: - contents: read - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - name: Build with Gradle - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: build From ffdf552c7acba6f59a93fad82e2c416698de4502 Mon Sep 17 00:00:00 2001 From: SirRemus <82674655+SirRemus@users.noreply.github.com> Date: Sat, 18 Mar 2023 06:25:13 -0400 Subject: [PATCH 4/5] Update build.properties --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index d4c4403..dd4874a 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ #Sat Feb 25 18:23:10 CET 2023 -mod_version=1.9.6 +mod_version=1.9.7 mod_buildnumber=2 From 30e177a0c87ac0305849835cf1167e05d0241fb2 Mon Sep 17 00:00:00 2001 From: SirRemus <82674655+SirRemus@users.noreply.github.com> Date: Sat, 18 Mar 2023 06:25:40 -0400 Subject: [PATCH 5/5] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index daf3612..21d3fa5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ yarn_mappings=1.19.3+build.5 loader_version=0.14.14 carpet_core_version=1.4.96+v230201 # Mod Properties -mod_version=1.9.6 +mod_version=1.9.7 mod_suffix=-MC1.19.3+ maven_group=carpet-shadow-item archives_base_name=carpet-shadow