diff --git a/build.properties b/build.properties index ac8ce2bd5..2675dbf93 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ -#Fri May 31 19:23:58 UTC 2024 +#Sat Jun 01 11:22:14 UTC 2024 mapping_version=1.20.1 version=4.0 mod_name=Quark mc_version=1.20.1 mapping_channel=official mod_id=quark -build_number=451 +build_number=452 dir_output=../Build Output/Quark/ diff --git a/changelog.txt b/changelog.txt index 762b0f91d..abb8be6f8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,8 @@ -- fixed pathfinder quill duplicating when used in offhand -- fixed magnets only pushing armor items -- fixed magnets pushing players regardless of whether they have armor or not -- Rune colors are now extensible. Custom ones can be added by mods \ No newline at end of file +- Fixed pathfinder quill duplicating when used in offhand +- Fixed magnets only pushing armor items +- Fixed magnets pushing players regardless of whether they have armor or not +- Rune colors are now extensible. Custom ones can be added by mods +- Variant selector and rotation lock HUD overlays can now render similar to crosshair, Improving visibility in bright environments +- You can now middle click a block to select it with variant selector, either when you have a variant block or a hammer in hand +- Variant selector wheel wont appear anymore for blocks with no variants +- Hammer won't play swing animation when it didn't change a variant \ No newline at end of file diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java index c77c077fd..ef37c1bf4 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/magnetsystem/MagnetSystem.java @@ -6,8 +6,8 @@ import java.util.List; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.entity.BlockEntity; import org.jetbrains.annotations.Nullable; import org.violetmoon.quark.addons.oddities.block.be.MagnetBlockEntity; @@ -116,13 +116,14 @@ else if(frontState.getPistonPushReaction() == PushReaction.DESTROY) } public static boolean isItemMagnetic(Item item) { + if(item == Items.AIR)return false; return magnetizableItems.contains(item); } // Just checks if its magnetic. Not if it can be moved public static boolean isBlockMagnetic(BlockState state) { Block block = state.getBlock(); - if (block == MagnetsModule.magnet) return false; + if (block == MagnetsModule.magnet || state.isAir()) return false; return (magnetizableBlocks.contains(block) || BLOCK_MOVE_ACTIONS.containsKey(block)); } @@ -133,7 +134,7 @@ public static boolean canBlockBeMagneticallyMoved(BlockState state, BlockPos pos if (state.getValue(PistonBaseBlock.EXTENDED)) return false; } - if (block == MagnetsModule.magnet) return false; + if (block == MagnetsModule.magnet || state.isAir()) return false; IMagnetMoveAction action = getMoveAction(block); if (action != null) return action.canMagnetMove(level, pos, moveDir, state, magnet); diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java index e6f5de8af..f58c97d47 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java @@ -153,7 +153,8 @@ public static Block getVariantBlockFromOriginal(Block original, @NotNull String @Nullable public static Block getVariantBlockFromAny(Block block, @NotNull String variant) { Block originalBlock = variants.getOriginalBlock(block); - Block variantBlock = getVariantBlockFromOriginal(originalBlock, variant); + Block variantBlock = variant.isEmpty() ? originalBlock : + getVariantBlockFromOriginal(originalBlock, variant); if(variantBlock != block)return variantBlock; return null; }