From f67608488019271eb18c95387d6239225094ea67 Mon Sep 17 00:00:00 2001 From: Nicholas Smit Date: Tue, 29 Oct 2024 00:07:46 -0400 Subject: [PATCH] Fix client disconnects Fix client disconnects on servers with multiple players due to a datapack object syncing issue. Additionally includes a locally built version of CustomPortalsAPI which fixes portal placement issues. PR is currently pending on the CPAPI repository. Bump versions and prepare for release. --- RELEASE_NOTES.md | 16 ++-------------- gradle.properties | 4 ++-- optimization_utils.gradle | 2 +- .../entity/npc/trading/SimpleItemListing.java | 2 +- update.json | 5 +++-- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e9223d18..684b569d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,17 +1,5 @@ -This minor update fixes several bugs. - -### Feature Changes / Additions - -- Add Celestial Altar block - - Effectively replaces the Skygazer enchantment upgrade trades - - This fixes several issues related to the way trades are handled in MC 1.21, due to them not having stack - context - - Acquired via a trade with a Skygazer +This minor update fixes one major bug. ### Bugfixes -- Fix Super Hans being killable before defeating the Champion Tower -- Fix Super Hans not being respawnable by tossing a Hans' Blessing into fire on a Champion Tower -- Fix random bear trap `NullPointerException` crashes with some entities -- Fix max enchant color not applying correctly -- Fix a trade for the Skeleton Merchant being zero-cost and therefore not being able to save properly when it is rolled \ No newline at end of file +- Fix client disconnects on servers with multiple people due to datapack object syncing \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fe0c8ffe..427c92d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=true org.gradle.caching=true org.gradle.parallel=true mod_id=immersiveweapons -mod_version=1.21.1-1.30.4 +mod_version=1.21.1-1.30.5 mod_group_id=tech.anonymoushacker1279.immersiveweapons neogradle.subsystems.parchment.minecraftVersion=1.21 neogradle.subsystems.parchment.mappingsVersion=2024.07.28 @@ -13,7 +13,7 @@ neoforge_version=21.1.72 neoforge_version_range=[21.1.0,) loader_version_range=[4.0,) biomesquisher_version=0.4.1 -custom_portals_api_version=1.0.10 +custom_portals_api_version=1.0.11-beta1 iwcb_version=1.21.1-1.10.1 jei_version=19.21.0.246 wthit_version=12.4.2 diff --git a/optimization_utils.gradle b/optimization_utils.gradle index 6c612901..fb0e69c1 100644 --- a/optimization_utils.gradle +++ b/optimization_utils.gradle @@ -35,7 +35,7 @@ processResources { int bytesProcessed = 0 println("Discovering JSON files in %s...".formatted(outputs.files.asPath)) - ConfigurableFileTree jsonFiles = fileTree(dir: outputs.files.asPath, include: '**/*.json') + ConfigurableFileTree jsonFiles = fileTree(dir: outputs.files.asPath, include: ['**/*.json', '**/*.mcmeta']) int totalFiles = jsonFiles.size() println("Found %s JSON files in %sms.".formatted(totalFiles, (System.currentTimeMillis() - minifyStart))) int processedFiles = 0 diff --git a/src/main/java/tech/anonymoushacker1279/immersiveweapons/entity/npc/trading/SimpleItemListing.java b/src/main/java/tech/anonymoushacker1279/immersiveweapons/entity/npc/trading/SimpleItemListing.java index 4b8c07fc..8007b385 100644 --- a/src/main/java/tech/anonymoushacker1279/immersiveweapons/entity/npc/trading/SimpleItemListing.java +++ b/src/main/java/tech/anonymoushacker1279/immersiveweapons/entity/npc/trading/SimpleItemListing.java @@ -43,7 +43,7 @@ public SimpleItemListing(int emeralds, ItemStack result, int maxUses) { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ItemStack.STREAM_CODEC, SimpleItemListing::item1, - ItemStack.STREAM_CODEC, + ItemStack.OPTIONAL_STREAM_CODEC, SimpleItemListing::item2, ItemStack.STREAM_CODEC, SimpleItemListing::result, diff --git a/update.json b/update.json index 9791fbe7..338a9c95 100644 --- a/update.json +++ b/update.json @@ -1,8 +1,8 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/immersive-weapons", "promos": { - "1.21.1-latest": "1.21.1-1.30.4", - "1.21.1-recommended": "1.21.1-1.30.4", + "1.21.1-latest": "1.21.1-1.30.5", + "1.21.1-recommended": "1.21.1-1.30.5", "1.20.4-latest": "1.20.4-1.29.2", "1.20.4-recommended": "1.20.4-1.29.2", "1.20.2-latest": "1.20.2-1.28.0", @@ -29,6 +29,7 @@ "1.16.4-recommended": "1.16.5-1.1.1" }, "1.21.1": { + "1.21.1-1.30.5": "Bugfixes - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.30.5", "1.21.1-1.30.4": "Bugfixes and improvements - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.30.4", "1.21.1-1.30.3": "Bugfixes and improvements - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.30.3", "1.21.1-1.30.2": "Bugfixes and improvements - https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.30.2",