From 62da9e3afb1fd9d7a3baf9c1897ceac5f37155d0 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Fri, 17 Mar 2023 19:20:50 +0100 Subject: [PATCH] version 1.19.4 --- gradle.properties | 8 ++-- .../container/BackpackScreenHandler.java | 38 ++++++++++--------- .../quickiefabric/init/RegistryManager.java | 2 +- src/main/resources/fabric.mod.json | 4 +- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index b0205ce..6a3b2b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.19.4-pre3 - yarn_mappings=1.19.4-pre3+build.4 - loader_version=0.14.14 + minecraft_version=1.19.4 + yarn_mappings=1.19.4+build.1 + loader_version=0.14.17 # Mod Properties mod_version = 1.19.4.0 @@ -14,7 +14,7 @@ archives_base_name = quickiefabric # Dependencies - fabric_version=0.75.2+1.19.4 + fabric_version=0.76.0+1.19.4 # for ExtendedLeavesBlock terraform_wood_api_version=5.0.0-beta.1 diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java index d6c58fb..bf5acb5 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java @@ -60,29 +60,30 @@ public class BackpackScreenHandler extends ScreenHandler { } @Override - public void close(PlayerEntity player) { + public void onClosed(PlayerEntity player) { this.backpackInventory.setHand(hand); this.backpackInventory.onClose(player); - super.close(player); + super.onClosed(player); } @Override public ItemStack quickMove(PlayerEntity player, int index) { - ItemStack itemStack = ItemStack.EMPTY; - Slot slot = (Slot) this.slots.get(index); - if (slot != null && slot.hasStack()) { - ItemStack itemStack2 = slot.getStack(); - itemStack = itemStack2.copy(); - if (index < 54 ? !this.insertItem(itemStack2, 54, this.slots.size(), true) : !this.insertItem(itemStack2, 0, 54, false)) { - return ItemStack.EMPTY; - } - if (itemStack2.isEmpty()) { - slot.setStack(ItemStack.EMPTY); - } else { - slot.markDirty(); - } - } - return itemStack; + ItemStack itemStack = ItemStack.EMPTY; + Slot slot = (Slot) this.slots.get(index); + if (slot != null && slot.hasStack()) { + ItemStack itemStack2 = slot.getStack(); + itemStack = itemStack2.copy(); + if (index < 54 ? !this.insertItem(itemStack2, 54, this.slots.size(), true) + : !this.insertItem(itemStack2, 0, 54, false)) { + return ItemStack.EMPTY; + } + if (itemStack2.isEmpty()) { + slot.setStack(ItemStack.EMPTY); + } else { + slot.markDirty(); + } + } + return itemStack; } @Override @@ -100,7 +101,8 @@ public class BackpackScreenHandler extends ScreenHandler { } } else { if (playerEntity.world.isClient) { - playerEntity.world.playSound(null, new BlockPos(playerEntity.getPos()), SoundEvents.ENTITY_VILLAGER_NO, SoundCategory.PLAYERS, 1f, 1f); + playerEntity.world.playSound(null, BlockPos.ofFloored(playerEntity.getPos()), SoundEvents.ENTITY_VILLAGER_NO, + SoundCategory.PLAYERS, 1f, 1f); } } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index f1dc2e6..8f15fa3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -69,7 +69,7 @@ public class RegistryManager { public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroup.builder(new Identifier(QUICKIEFABRIC, "all")) .displayName(Text.literal(QUICKIEFABRIC)) .icon(() -> new ItemStack(QuickieItems.SPEEDPOWDER)) - .entries((enabledFeatures, stacks, operatorEnabled) -> { + .entries((enabledFeatures, stacks) -> { stacks.add(new ItemStack(QuickieItems.SALPETER)); stacks.add(new ItemStack(QuickieItems.SULPHOR)); stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER)); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 44eba09..258a1df 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,9 +26,9 @@ "quickiefabric.mixins.json" ], "depends": { - "fabricloader": ">=0.14.14", + "fabricloader": ">=0.14.17", "fabric": "*", - "minecraft": "23w06a", + "minecraft": "1.19.4", "java": ">=17" }, "suggests": {