Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.2…

…0-lts
CyclopsMC · Dec 28, 2024 · 7496f3b · 7496f3b
2 parents 29f3312 + 86c7b2b
commit 7496f3b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/resources/changelog/1.19.2-1.24.3.txt b/resources/changelog/1.19.2-1.24.3.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.2 or higher.
+
+Fixes:
+* Reduce number of network events during init to improve performance, #1439
+  Modifying very large networks is a lot faster now.
diff --git a/resources/changelog/1.19.2-1.24.4.txt b/resources/changelog/1.19.2-1.24.4.txt
@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.2 or higher.
+
+Additions:
+* Add lossy recipe to clear a facade in a crafting grid, Closes #1424
+
+Fixes:
+* Fix client-server desync when applying part offsets, Closes #1448
+* Fix offset items only being applicable to 28 instead of 32, #1448
diff --git a/src/main/java/org/cyclops/integrateddynamics/item/ItemEnhancement.java b/src/main/java/org/cyclops/integrateddynamics/item/ItemEnhancement.java
@@ -36,12 +36,12 @@ public <P extends IPartType<P, S>, S extends IPartState<P>> InteractionResult ap
                 if (partType.supportsOffsets()) {
                     int value = getEnhancementValue(itemStack);
                     int newValue = partState.getMaxOffset() + value;
-                    if (newValue < GeneralConfig.maxPartOffset) {
+                    if (newValue <= GeneralConfig.maxPartOffset) {
                         if (!player.level().isClientSide()) {
                             partState.setMaxOffset(newValue);
+                            itemStack.shrink(1);
+                            player.displayClientMessage(Component.translatable("item.integrateddynamics.enhancement_offset.increased", newValue), true);
                         }
-                        itemStack.shrink(1);
-                        player.displayClientMessage(Component.translatable("item.integrateddynamics.enhancement_offset.increased", newValue), true);
                         return InteractionResult.SUCCESS;
                     }
                     player.displayClientMessage(Component.translatable("item.integrateddynamics.enhancement_offset.limit", GeneralConfig.maxPartOffset), true);

diff --git a/src/main/resources/data/integrateddynamics/recipes/special/clear_facade.json b/src/main/resources/data/integrateddynamics/recipes/special/clear_facade.json
@@ -0,0 +1,4 @@
+{
+  "type": "integrateddynamics:crafting_special_nbt_clear",
+  "item": "integrateddynamics:facade"
+}