Fix Litematica and MaLiLib compatibility for 0.6.3

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.3
+
+- Fixed Easy Place crashes with Litematica 0.28.x and MaLiLib 0.29.x caused by the bounding-box API transition.
+- Added runtime compatibility with both `containsPos(Vec3i)` and `contains(Vec3i)` bounding-box methods.
+- Broadened dependency metadata to accept compatible Litematica 0.27.x/0.28.x and MaLiLib 0.28.x/0.29.x releases.
+
 ## 0.6.2
 
 - Fixed `AllowInteraction` with Servux/V3 and the `SLAB_ONLY` fallback path.

README.md

@@ -83,9 +83,10 @@ EasyPlaceFix добавляет к обычному Easy Place:
 - Minecraft `26.1.2`-`26.2`
 - Java `25`
 - Fabric Loader `0.19.3+`
-- Minecraft `26.1.2`: Fabric API `0.153.0+26.1.2`, Litematica `0.27.10`, MaLiLib `0.28.9`
-- Minecraft `26.2`: Fabric API `0.153.0+26.2`, Litematica `0.28.4`, MaLiLib `0.29.3`
-- Текущая версия мода в проекте: `0.6.2`
+- Проверено на Minecraft `26.1.2`: Fabric API `0.153.0+26.1.2`, Litematica `0.27.10`, MaLiLib `0.28.9`
+- Проверено на Minecraft `26.2`: Fabric API `0.153.0+26.2`, Litematica `0.28.4`, MaLiLib `0.29.3`
+- Для соответствующих версий Minecraft адаптер допускает Litematica `>=0.27.10 <0.29` и MaLiLib `>=0.28.9 <0.30`
+- Текущая версия мода в проекте: `0.6.3`
 
 ### Сборка
 
@@ -189,9 +190,10 @@ Important:
 - Minecraft `26.1.2`-`26.2`
 - Java `25`
 - Fabric Loader `0.19.3+`
-- Minecraft `26.1.2`: Fabric API `0.153.0+26.1.2`, Litematica `0.27.10`, MaLiLib `0.28.9`
-- Minecraft `26.2`: Fabric API `0.153.0+26.2`, Litematica `0.28.4`, MaLiLib `0.29.3`
-- Current project mod version: `0.6.2`
+- Verified on Minecraft `26.1.2`: Fabric API `0.153.0+26.1.2`, Litematica `0.27.10`, MaLiLib `0.28.9`
+- Verified on Minecraft `26.2`: Fabric API `0.153.0+26.2`, Litematica `0.28.4`, MaLiLib `0.29.3`
+- For matching Minecraft builds, the adapter accepts Litematica `>=0.27.10 <0.29` and MaLiLib `>=0.28.9 <0.30`
+- Current project mod version: `0.6.3`
 
 ### Build
 

gradle.properties

@@ -5,7 +5,7 @@ loader_version=0.19.3
 loom_version=1.17.12
 
 # Mod Properties
-mod_version=0.6.2
+mod_version=0.6.3
 maven_group=org.uiop
 archives_base_name=EasyPlaceFix
 fabric_api_version_26_1_2=0.153.0+26.1.2

src/main/java/org/uiop/easyplacefix/EasyPlaceFix.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.level.block.Block;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.uiop.easyplacefix.Mixin.config.ConfigGuiTabAccessor;
+import org.uiop.easyplacefix.mixin.config.ConfigGuiTabAccessor;
 import org.uiop.easyplacefix.command.EasyPlaceFixCommands;
 import org.uiop.easyplacefix.config.Hotkeys;
 import org.uiop.easyplacefix.config.easyPlaceFixHotkeys;

src/main/java/org/uiop/easyplacefix/IBlock.java

@@ -2,7 +2,7 @@
 
 import org.uiop.easyplacefix.data.RelativeBlockHitResult;
 
-import static org.uiop.easyplacefix.until.PlayerRotationAction.limitYawRotation;
+import static org.uiop.easyplacefix.util.PlayerRotationAction.limitYawRotation;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/uiop/easyplacefix/Mixin/AccessorMixin/ClientConnectionAccessor.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.AccessorMixin;
+package org.uiop.easyplacefix.mixin.AccessorMixin;
 
 
 import io.netty.channel.Channel;

src/main/java/org/uiop/easyplacefix/Mixin/MixinClientPlayerInteractionManager.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import net.minecraft.client.multiplayer.MultiPlayerGameMode;
 import net.minecraft.client.player.LocalPlayer;

src/main/java/org/uiop/easyplacefix/Mixin/MixinClientWorld.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.prediction.BlockStatePredictionHandler;

src/main/java/org/uiop/easyplacefix/Mixin/MixinConfigs.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 
 import fi.dy.masa.litematica.config.Configs;

src/main/java/org/uiop/easyplacefix/Mixin/MixinHotkey.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import fi.dy.masa.litematica.config.Hotkeys;
 import org.apache.commons.lang3.ArrayUtils;

src/main/java/org/uiop/easyplacefix/Mixin/MixinMinecraftClient.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -7,7 +7,7 @@
 import com.tick_ins.tick.TickThread;
 import net.minecraft.client.Minecraft;
 import org.uiop.easyplacefix.EasyPlaceFix;
-import org.uiop.easyplacefix.until.PlayerBlockAction;
+import org.uiop.easyplacefix.util.PlayerBlockAction;
 
 @Mixin(Minecraft.class)
 public class MixinMinecraftClient {

src/main/java/org/uiop/easyplacefix/Mixin/MixinPistonBlock.java

@@ -1,13 +1,13 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.minecraft.world.level.block.piston.PistonBaseBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.modifyBoolean;
-import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.pistonBlockState;
+import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.modifyBoolean;
+import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.pistonBlockState;
 
 @Mixin(PistonBaseBlock.class)
 public class MixinPistonBlock {//Sync piston client placement state to avoid client/server desync during placement.

src/main/java/org/uiop/easyplacefix/Mixin/MixinWorldUtils.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin;
+package org.uiop.easyplacefix.mixin;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import fi.dy.masa.litematica.config.Configs;
@@ -15,8 +15,8 @@
 import org.uiop.easyplacefix.config.easyPlacefixConfig;
 
 import static fi.dy.masa.litematica.util.WorldUtils.getValidBlockRange;
-import static org.uiop.easyplacefix.until.doEasyPlace.doEasyPlace2;
-import static org.uiop.easyplacefix.until.doEasyPlace.shouldAllowVanillaInteraction;
+import static org.uiop.easyplacefix.util.EasyPlaceHandler.doEasyPlace2;
+import static org.uiop.easyplacefix.util.EasyPlaceHandler.shouldAllowVanillaInteraction;
 
 @Mixin(WorldUtils.class)
 public abstract class MixinWorldUtils {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractChestBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.uiop.easyplacefix.IBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractFurnaceBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.AbstractFurnaceBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractPlantPartBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.GrowingPlantBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRailBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.BaseRailBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRedstoneGateBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.DiodeBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractTorchBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -14,8 +14,8 @@
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.ICanUse;
 import org.uiop.easyplacefix.data.RelativeBlockHitResult;
-import org.uiop.easyplacefix.until.PlayerBlockAction;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerBlockAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(BaseTorchBlock.class)
 public abstract class MixinAbstractTorchBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAnvilBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.AnvilBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBannerBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBarrelBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.uiop.easyplacefix.IBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBedBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBeehiveBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.BeehiveBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBellBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -17,7 +17,7 @@
 import org.uiop.easyplacefix.ICanUse;
 import org.uiop.easyplacefix.LookAt;
 import org.uiop.easyplacefix.data.RelativeBlockHitResult;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(BellBlock.class)
 public abstract class MixinBellBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.BigDripleafBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafStemBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.BigDripleafStemBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinButtonBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.block.ButtonBlock;
@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.ICanUse;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(ButtonBlock.class)
 public class MixinButtonBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCakeBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCampfireBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.CampfireBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCandleBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -15,8 +15,8 @@
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.ICanUse;
 import org.uiop.easyplacefix.data.RelativeBlockHitResult;
-import org.uiop.easyplacefix.until.PlayerBlockAction;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerBlockAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(CandleBlock.class)
 public abstract class MixinCandleBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCarvedPumpkinBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.CarvedPumpkinBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChestBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -19,7 +19,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.data.RelativeBlockHitResult;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(ChestBlock.class)
 public class MixinChestBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChiseledBookshelfBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.ChiseledBookShelfBlock;
@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.LookAt;
-import org.uiop.easyplacefix.until.PlayerInputAction;
+import org.uiop.easyplacefix.util.PlayerInputAction;
 
 @Mixin(ChiseledBookShelfBlock.class)
 public class MixinChiseledBookshelfBlock implements IBlock {

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCocoaBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCommandBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.block.CommandBlock;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinComparatorBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCrafterBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import com.tick_ins.tick.RunnableWithCountDown;
 import com.tick_ins.tick.TickThread;
@@ -26,7 +26,7 @@
 import org.uiop.easyplacefix.IBlock;
 import org.uiop.easyplacefix.IClientWorld;
 import org.uiop.easyplacefix.LookAt;
-import org.uiop.easyplacefix.until.PlayerBlockAction;
+import org.uiop.easyplacefix.util.PlayerBlockAction;
 
 import static org.uiop.easyplacefix.EasyPlaceFix.crafterOperation;
 import static org.uiop.easyplacefix.EasyPlaceFix.crafterSlot;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCreakingHeartBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDeadCoralWallFanBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDispenserBlock.java

@@ -1,4 +1,4 @@
-package org.uiop.easyplacefix.Mixin.block;
+package org.uiop.easyplacefix.mixin.block;
 
 import net.minecraft.core.Direction;
 import net.minecraft.util.Tuple;