From e84e25b59003707cc990fa27a375262ca0e9ef9c Mon Sep 17 00:00:00 2001 From: Andrew Grant Date: Thu, 4 Aug 2022 21:04:48 -0400 Subject: [PATCH] pull changes from 1.19.x branch --- .github/workflows/release.yml | 1 - gradle.properties | 2 +- .../Andrew6rant/stacker/StackerConfig.java | 16 ++------ .../mixin/AnvilScreenHandlerMixin.java | 4 +- .../stacker/tags/items/not_stackable.json | 40 +++++++++++++++++++ src/main/resources/fabric.mod.json | 2 +- 6 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/data/stacker/tags/items/not_stackable.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49fc251..5a82397 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,6 @@ jobs: modrinth-token: ${{ secrets.MODRINTH_TOKEN }} curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} version-type: release - github-tag: stacker-3.0.1-1.18.2 loaders: | fabric quilt \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b6f5b4d..596b8f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.14.5 # Mod Properties - mod_version = 3.0.1-1.18.2 + mod_version = 3.0.2-1.18.2 maven_group = io.github.Andrew6rant archives_base_name = stacker diff --git a/src/main/java/io/github/Andrew6rant/stacker/StackerConfig.java b/src/main/java/io/github/Andrew6rant/stacker/StackerConfig.java index 8200161..ae8c77c 100644 --- a/src/main/java/io/github/Andrew6rant/stacker/StackerConfig.java +++ b/src/main/java/io/github/Andrew6rant/stacker/StackerConfig.java @@ -1,20 +1,11 @@ package io.github.Andrew6rant.stacker; -import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; -import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; -import me.shedaniel.clothconfig2.api.ConfigBuilder; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.item.Items; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.registry.Registry; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Config(name = "stacker") public class StackerConfig implements ConfigData { @@ -32,10 +23,9 @@ public class StackerConfig implements ConfigData { @ConfigEntry.Gui.Tooltip public List itemOverride = Arrays.asList( - "minecraft:bundle:1", + "#stacker:not_stackable:1", "minecraft:totem_of_undying:16", - "#c:potions:16", - "#inmis:backpacks:1", - "#techreborn:not_stackable:1" + "#c:potions:16" ); + // #techreborn:not_stackable and #inmis:backpacks are kept for backwards compatibility with older configs } diff --git a/src/main/java/io/github/Andrew6rant/stacker/mixin/AnvilScreenHandlerMixin.java b/src/main/java/io/github/Andrew6rant/stacker/mixin/AnvilScreenHandlerMixin.java index 0b4c74e..ee07648 100644 --- a/src/main/java/io/github/Andrew6rant/stacker/mixin/AnvilScreenHandlerMixin.java +++ b/src/main/java/io/github/Andrew6rant/stacker/mixin/AnvilScreenHandlerMixin.java @@ -7,9 +7,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(AnvilScreenHandler.class) +@Mixin(value = AnvilScreenHandler.class, priority = 999) // default priority is 1000, so this applies a bit after other mod's AnvilScreenHandler mixins public class AnvilScreenHandlerMixin { - // Credit to ZoeyTheEgoist for this mixin + // Credit to ZoeyTheEgoist for the original code behind this mixin @Redirect(method = "onTakeOutput", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Inventory;setStack(ILnet/minecraft/item/ItemStack;)V", ordinal = 3)) private void setDecrementSlot1StackCount(Inventory inventory, int slot, ItemStack stack) { ItemStack newStack = inventory.getStack(1); diff --git a/src/main/resources/data/stacker/tags/items/not_stackable.json b/src/main/resources/data/stacker/tags/items/not_stackable.json new file mode 100644 index 0000000..8b069cb --- /dev/null +++ b/src/main/resources/data/stacker/tags/items/not_stackable.json @@ -0,0 +1,40 @@ +{ + "replace": false, + "values": [ + {"id": "minecraft:bundle", "required": false}, + {"id": "techreborn:quantum_helmet", "required": false}, + {"id": "techreborn:quantum_chestplate", "required": false}, + {"id": "techreborn:quantum_leggings", "required": false}, + {"id": "techreborn:quantum_boots", "required": false}, + {"id": "techreborn:red_cell_battery", "required": false}, + {"id": "techreborn:lithium_ion_battery", "required": false}, + {"id": "techreborn:lithium_ion_batpack", "required": false}, + {"id": "techreborn:energy_crystal", "required": false}, + {"id": "techreborn:lapotron_crystal", "required": false}, + {"id": "techreborn:lapotronic_orb", "required": false}, + {"id": "techreborn:lapotronic_orbpack", "required": false}, + {"id": "techreborn:basic_drill", "required": false}, + {"id": "techreborn:basic_chainsaw", "required": false}, + {"id": "techreborn:basic_jackhammer", "required": false}, + {"id": "techreborn:electric_treetap", "required": false}, + {"id": "techreborn:advanced_drill", "required": false}, + {"id": "techreborn:advanced_chainsaw", "required": false}, + {"id": "techreborn:advanced_jackhammer", "required": false}, + {"id": "techreborn:rock_cutter", "required": false}, + {"id": "techreborn:industrial_drill", "required": false}, + {"id": "techreborn:industrial_chainsaw", "required": false}, + {"id": "techreborn:industrial_jackhammer", "required": false}, + {"id": "techreborn:nanosaber", "required": false}, + {"id": "techreborn:omni_tool", "required": false}, + {"id": "techreborn:cloaking_device", "required": false}, + {"id": "inmis:ender_pouch", "required": false}, + {"id": "inmis:baby_backpack", "required": false}, + {"id": "inmis:frayed_backpack", "required": false}, + {"id": "inmis:plated_backpack", "required": false}, + {"id": "inmis:gilded_backpack", "required": false}, + {"id": "inmis:bejeweled_backpack", "required": false}, + {"id": "inmis:blazing_backpack", "required": false}, + {"id": "inmis:withered_backpack", "required": false}, + {"id": "inmis:endless_backpack", "required": false} + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b7952f9..b54b8f3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "stacker", - "version": "3.0.1-1.18.2", + "version": "${version}", "name": "Stacker", "description": "Change the stack size of all items!",