diff --git a/CHANGELOG.md b/CHANGELOG.md index ef7590c..905216f 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index 8fd4233..2401a84 100644 --- a/README.md +++ b/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 diff --git a/gradle.properties b/gradle.properties index 95de49a..05fe97b 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/org/uiop/easyplacefix/EasyPlaceFix.java b/src/main/java/org/uiop/easyplacefix/EasyPlaceFix.java index 430e03c..261a778 100644 --- a/src/main/java/org/uiop/easyplacefix/EasyPlaceFix.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/IBlock.java b/src/main/java/org/uiop/easyplacefix/IBlock.java index 7dcd5a9..0ccc21c 100644 --- a/src/main/java/org/uiop/easyplacefix/IBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/AccessorMixin/ClientConnectionAccessor.java b/src/main/java/org/uiop/easyplacefix/Mixin/AccessorMixin/ClientConnectionAccessor.java index 91553e1..6edf65e 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/AccessorMixin/ClientConnectionAccessor.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientPlayerInteractionManager.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientPlayerInteractionManager.java index d3a45df..c6da135 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientPlayerInteractionManager.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientWorld.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientWorld.java index 2807409..51e31de 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinClientWorld.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinConfigs.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinConfigs.java index 0921884..e5127db 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinConfigs.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinHotkey.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinHotkey.java index 3c2242d..087b374 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinHotkey.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinMinecraftClient.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinMinecraftClient.java index e87a51d..4df43d4 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinMinecraftClient.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinPistonBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinPistonBlock.java index a3172df..1d83541 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinPistonBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/MixinPistonBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin; +package org.uiop.easyplacefix.mixin; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.world.level.block.piston.PistonBaseBlock; @@ -6,8 +6,8 @@ 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. diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/MixinWorldUtils.java b/src/main/java/org/uiop/easyplacefix/Mixin/MixinWorldUtils.java index 47464e9..3846499 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/MixinWorldUtils.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractChestBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractChestBlock.java index 8701456..56830be 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractChestBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractFurnaceBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractFurnaceBlock.java index 902167d..3d67434 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractFurnaceBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractPlantPartBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractPlantPartBlock.java index dc8d886..3b69a88 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractPlantPartBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRailBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRailBlock.java index e886e15..4fa7207 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRailBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRedstoneGateBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRedstoneGateBlock.java index 4ae4a93..2a05477 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractRedstoneGateBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractTorchBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractTorchBlock.java index f3cb43e..a2cecb1 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAbstractTorchBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAnvilBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAnvilBlock.java index 0374a08..a64f941 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinAnvilBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBannerBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBannerBlock.java index 276ba3f..b718a86 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBannerBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBarrelBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBarrelBlock.java index 3fede9f..ba9e69a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBarrelBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBedBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBedBlock.java index f6c2f53..ba6d938 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBedBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBeehiveBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBeehiveBlock.java index 1d03695..532741c 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBeehiveBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBellBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBellBlock.java index 9a5e4df..34c9d84 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBellBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafBlock.java index 0b24d5d..fed113b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafStemBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafStemBlock.java index 12773e0..4f3b1e1 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBigDripleafStemBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBlock.java index 4e1c8f2..3876be8 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinButtonBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinButtonBlock.java index 2e0d867..50f096f 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinButtonBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCakeBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCakeBlock.java index 3f05a2b..a22fc9e 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCakeBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCampfireBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCampfireBlock.java index c9b8c0e..0f033d7 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCampfireBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCandleBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCandleBlock.java index 06e61e9..80d9bf2 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCandleBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCarvedPumpkinBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCarvedPumpkinBlock.java index 4c7b12c..581c365 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCarvedPumpkinBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChestBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChestBlock.java index 71483a9..c5e2ccf 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChestBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChiseledBookshelfBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChiseledBookshelfBlock.java index 4415948..5909203 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinChiseledBookshelfBlock.java +++ b/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 { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCocoaBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCocoaBlock.java index 75cb1c7..631b764 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCocoaBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCommandBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCommandBlock.java index f3187c8..629a368 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCommandBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinComparatorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinComparatorBlock.java index a8e0eb0..567179c 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinComparatorBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCrafterBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCrafterBlock.java index 671a292..43ac340 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCrafterBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCreakingHeartBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCreakingHeartBlock.java index f703785..ab1dca1 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinCreakingHeartBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDeadCoralWallFanBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDeadCoralWallFanBlock.java index 914d1f8..36db2ed 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDeadCoralWallFanBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDispenserBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDispenserBlock.java index ef725b7..adf8f52 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDispenserBlock.java +++ b/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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDoorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDoorBlock.java index 8dab38e..da41ef0 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDoorBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinDoorBlock.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; @@ -20,8 +20,8 @@ import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.LookAt; 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(DoorBlock.class) public abstract class MixinDoorBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinEndPortalFrameBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinEndPortalFrameBlock.java index ae2a3e0..b889f2b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinEndPortalFrameBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinEndPortalFrameBlock.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.EndPortalFrameBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFenceGateBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFenceGateBlock.java index 2e309e3..8856009 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFenceGateBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFenceGateBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFlowerPotBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFlowerPotBlock.java index 8b3632f..8586d27 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFlowerPotBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinFlowerPotBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import fi.dy.masa.litematica.materials.MaterialCache; import fi.dy.masa.litematica.util.EntityUtils; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGlazedTerracottaBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGlazedTerracottaBlock.java index 6fb4a3a..b8f651a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGlazedTerracottaBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGlazedTerracottaBlock.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.GlazedTerracottaBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGrindstoneBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGrindstoneBlock.java index 0caec85..d63c3fd 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGrindstoneBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinGrindstoneBlock.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(GrindstoneBlock.class) public abstract class MixinGrindstoneBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHopperBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHopperBlock.java index 1f8430b..2c0bd26 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHopperBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHopperBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHorizontalFacingBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHorizontalFacingBlock.java index c3ef57d..9efc620 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHorizontalFacingBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinHorizontalFacingBlock.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.HorizontalDirectionalBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLadderBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLadderBlock.java index 4e4f0e3..cc9f8b6 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLadderBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLadderBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLecternBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLecternBlock.java index 650dbc1..14735aa 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLecternBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLecternBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.util.Tuple; @@ -11,9 +11,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.LookAt; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; -import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; +import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; @Mixin(LecternBlock.class) public class MixinLecternBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLeverBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLeverBlock.java index cec6a1c..948bed6 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLeverBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLeverBlock.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.IBlock; import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; @Mixin(LeverBlock.class) public abstract class MixinLeverBlock extends MixinWallMountedBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLoomBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLoomBlock.java index 5abf852..e4d44d3 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLoomBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinLoomBlock.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.LoomBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinMultifaceBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinMultifaceBlock.java index f598035..65977e4 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinMultifaceBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinMultifaceBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinObserverBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinObserverBlock.java index a098752..a5dca3f 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinObserverBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinObserverBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import fi.dy.masa.litematica.world.SchematicWorldHandler; import fi.dy.masa.litematica.world.WorldSchematic; @@ -15,7 +15,7 @@ import org.uiop.easyplacefix.LookAt; import static org.uiop.easyplacefix.config.easyPlacefixConfig.OBSERVER_DETECT; -import static org.uiop.easyplacefix.until.doEasyPlace.isSchematicBlock; +import static org.uiop.easyplacefix.util.EasyPlaceHandler.isSchematicBlock; @Mixin(ObserverBlock.class) public class MixinObserverBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPillarBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPillarBlock.java index 96dcb8f..04a4223 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPillarBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPillarBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPiston.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPiston.java index 1833ce6..0fa0102 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPiston.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPiston.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPlantBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPlantBlock.java index 2d51c77..c970a5a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPlantBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinPlantBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRailBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRailBlock.java index 85e0a44..929cf3c 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRailBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRailBlock.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.RailBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRedstoneWireBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRedstoneWireBlock.java index 6bdc2e9..85c38e2 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRedstoneWireBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRedstoneWireBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRepeaterBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRepeaterBlock.java index df6ecc4..64dd36e 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRepeaterBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRepeaterBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRodBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRodBlock.java index 8b8b0af..63e4a60 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRodBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinRodBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSeaPickleBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSeaPickleBlock.java index 4f97582..64584fb 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSeaPickleBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSeaPickleBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShelfBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShelfBlock.java index 4277390..f911e53 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShelfBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShelfBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.util.Tuple; @@ -11,9 +11,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.LookAt; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; -import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; +import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; @Mixin(ShelfBlock.class) public class MixinShelfBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShulkerBoxBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShulkerBoxBlock.java index 184035d..0df9c28 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShulkerBoxBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinShulkerBoxBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSkullBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSkullBlock.java index 60b7b6c..981900d 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSkullBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSkullBlock.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.ICanUse; import org.uiop.easyplacefix.LookAt; 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(SkullBlock.class) public class MixinSkullBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSlabBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSlabBlock.java index bbe5d0f..9a1bc55 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSlabBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinSlabBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStairsBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStairsBlock.java index 0ac1aeb..ae44698 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStairsBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStairsBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.core.BlockPos; @@ -16,7 +16,7 @@ import org.uiop.easyplacefix.LookAt; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; +import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; @Mixin(StairBlock.class) public class MixinStairsBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStonecutterBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStonecutterBlock.java index 526eb5f..1295441 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStonecutterBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinStonecutterBlock.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.StonecutterBlock; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTrapdoorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTrapdoorBlock.java index bad64a0..fe42e30 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTrapdoorBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTrapdoorBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.core.BlockPos; @@ -18,7 +18,7 @@ import org.uiop.easyplacefix.LookAt; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; +import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.consumePlacementStateOverrideFor; @Mixin(TrapDoorBlock.class) public class MixinTrapdoorBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTripwireHookBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTripwireHookBlock.java index 65fe50c..bfefd40 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTripwireHookBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTripwireHookBlock.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; @@ -13,7 +13,7 @@ import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; @Mixin(TripWireHookBlock.class) public class MixinTripwireHookBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTurtleEggBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTurtleEggBlock.java index 56d6a57..9707b74 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTurtleEggBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinTurtleEggBlock.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; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallBannerBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallBannerBlock.java index 16875d4..d185b37 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallBannerBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallBannerBlock.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,7 +15,7 @@ import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; @Mixin(WallBannerBlock.class) public abstract class MixinWallBannerBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallMountedBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallMountedBlock.java index 873ea9e..3a8516e 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallMountedBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallMountedBlock.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; @@ -16,8 +16,8 @@ import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.LookAt; 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(FaceAttachedHorizontalDirectionalBlock.class)//Lever,button public abstract class MixinWallMountedBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallRedstoneTorchBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallRedstoneTorchBlock.java index 65f81fa..0563e7f 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallRedstoneTorchBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallRedstoneTorchBlock.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,7 +15,7 @@ import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; @Mixin(RedstoneWallTorchBlock.class) public abstract class MixinWallRedstoneTorchBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallSkullBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallSkullBlock.java index ce78dc0..5b2b050 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallSkullBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallSkullBlock.java @@ -1,11 +1,11 @@ -package org.uiop.easyplacefix.Mixin.block; +package org.uiop.easyplacefix.mixin.block; import org.spongepowered.asm.mixin.Mixin; import org.uiop.easyplacefix.IBlock; 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; import static net.minecraft.world.level.block.WallTorchBlock.canSurvive; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallTorchBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallTorchBlock.java index 61e6bef..aaf9d33 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallTorchBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/MixinWallTorchBlock.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,7 +15,7 @@ import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.data.RelativeBlockHitResult; -import org.uiop.easyplacefix.until.PlayerInputAction; +import org.uiop.easyplacefix.util.PlayerInputAction; @Mixin(WallTorchBlock.class) public abstract class MixinWallTorchBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseAnvilBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseAnvilBlock.java index c703afc..4bf31d7 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseAnvilBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseAnvilBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.AnvilBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseBedBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseBedBlock.java index 7d31210..5657752 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseBedBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseBedBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.BedBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCakeBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCakeBlock.java index becba43..eb5276a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCakeBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCakeBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.CakeBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseChestBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseChestBlock.java index 18acd45..1d3e4eb 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseChestBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseChestBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.ChestBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCrafterBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCrafterBlock.java index 5f94391..6ae10b7 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCrafterBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseCrafterBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.CrafterBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDispenserBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDispenserBlock.java index ebea5cf..4c47449 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDispenserBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDispenserBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.DispenserBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDoorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDoorBlock.java index f6829d2..00e8b04 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDoorBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseDoorBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.DoorBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseFenceGateBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseFenceGateBlock.java index b17d570..fc7523a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseFenceGateBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseFenceGateBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.FenceGateBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseGrindstoneBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseGrindstoneBlock.java index be5e605..43dd6c7 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseGrindstoneBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseGrindstoneBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.GrindstoneBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseHopperBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseHopperBlock.java index 127f11b..fe1527b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseHopperBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseHopperBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.HopperBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLecternBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLecternBlock.java index d14711e..b607c90 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLecternBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLecternBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.LecternBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLoomBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLoomBlock.java index cdb301a..e519266 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLoomBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseLoomBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.LoomBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseRespawnAnchorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseRespawnAnchorBlock.java index 9f23f3a..cac32a0 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseRespawnAnchorBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseRespawnAnchorBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.RespawnAnchorBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShelfBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShelfBlock.java index 43004d0..585ea3f 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShelfBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShelfBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.ShelfBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShulkerBoxBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShulkerBoxBlock.java index a8026bd..4f24c60 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShulkerBoxBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseShulkerBoxBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.ShulkerBoxBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseTrapdoorBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseTrapdoorBlock.java index 235fd40..8d34c3e 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseTrapdoorBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/iCanUse/ICanUseTrapdoorBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.iCanUse; +package org.uiop.easyplacefix.mixin.block.iCanUse; import net.minecraft.world.level.block.TrapDoorBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinAbstractSignBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinAbstractSignBlock.java index 8320533..51f2c2b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinAbstractSignBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinAbstractSignBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.signBlock; +package org.uiop.easyplacefix.mixin.block.signBlock; import com.tick_ins.tick.RunnableWithCountDown; import com.tick_ins.tick.TickThread; @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.IClientWorld; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(SignBlock.class) public class MixinAbstractSignBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinHangingSignBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinHangingSignBlock.java index 8e29fe4..9490154 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinHangingSignBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinHangingSignBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.signBlock; +package org.uiop.easyplacefix.mixin.block.signBlock; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -15,8 +15,8 @@ import org.uiop.easyplacefix.IBlock; import org.uiop.easyplacefix.LookAt; 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(CeilingHangingSignBlock.class) public abstract class MixinHangingSignBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinSignBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinSignBlock.java index eafb0dd..c9d84e3 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinSignBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinSignBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.signBlock; +package org.uiop.easyplacefix.mixin.block.signBlock; import com.tick_ins.tick.RunnableWithCountDown; import com.tick_ins.tick.TickThread; @@ -19,8 +19,8 @@ import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.LookAt; 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(StandingSignBlock.class) public abstract class MixinSignBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallHangingSignBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallHangingSignBlock.java index ec7f2cd..19a27a3 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallHangingSignBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallHangingSignBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.signBlock; +package org.uiop.easyplacefix.mixin.block.signBlock; import fi.dy.masa.litematica.world.SchematicWorldHandler; import net.minecraft.client.Minecraft; @@ -16,8 +16,8 @@ import org.uiop.easyplacefix.ICanUse; import org.uiop.easyplacefix.LookAt; 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(WallHangingSignBlock.class) public abstract class MixinWallHangingSignBlock implements IBlock { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallSignBlock.java b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallSignBlock.java index 716d65e..94ea252 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallSignBlock.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/block/signBlock/MixinWallSignBlock.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.block.signBlock; +package org.uiop.easyplacefix.mixin.block.signBlock; import fi.dy.masa.litematica.world.SchematicWorldHandler; import net.minecraft.client.Minecraft; @@ -16,8 +16,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(WallSignBlock.class) diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/byteBuf/MixinWriteBlockHitResult.java b/src/main/java/org/uiop/easyplacefix/Mixin/byteBuf/MixinWriteBlockHitResult.java index d02343a..bbaa061 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/byteBuf/MixinWriteBlockHitResult.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/byteBuf/MixinWriteBlockHitResult.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.byteBuf; +package org.uiop.easyplacefix.mixin.byteBuf; import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/config/ConfigGuiTabAccessor.java b/src/main/java/org/uiop/easyplacefix/Mixin/config/ConfigGuiTabAccessor.java index f24e3df..b5654b7 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/config/ConfigGuiTabAccessor.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/config/ConfigGuiTabAccessor.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.config; +package org.uiop.easyplacefix.mixin.config; import fi.dy.masa.litematica.gui.GuiConfigs; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinConfigGuiTab.java b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinConfigGuiTab.java index 8e1784c..b6f77e5 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinConfigGuiTab.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinConfigGuiTab.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.config; +package org.uiop.easyplacefix.mixin.config; import fi.dy.masa.litematica.gui.GuiConfigs; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiConfigs.java b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiConfigs.java index 9e8fe54..b82913c 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiConfigs.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiConfigs.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.config; +package org.uiop.easyplacefix.mixin.config; import fi.dy.masa.litematica.data.DataManager; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiRenderLayer.java b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiRenderLayer.java index 56f1925..92c2d5a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiRenderLayer.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/config/MixinGuiRenderLayer.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.config; +package org.uiop.easyplacefix.mixin.config; import fi.dy.masa.litematica.gui.GuiRenderLayer; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinCloseScreenS2CPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinCloseScreenS2CPacket.java index c20b9a9..043cf55 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinCloseScreenS2CPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinCloseScreenS2CPacket.java @@ -1,11 +1,11 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundContainerClosePacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(ClientboundContainerClosePacket.class) diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinInventoryS2CPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinInventoryS2CPacket.java index 7a92c37..f294a39 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinInventoryS2CPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinInventoryS2CPacket.java @@ -1,11 +1,11 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(ClientboundContainerSetContentPacket.class) public class MixinInventoryS2CPacket {//Packet sends inventory slot contents diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinOpenScreenS2CPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinOpenScreenS2CPacket.java index 1011287..e8bc081 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinOpenScreenS2CPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinOpenScreenS2CPacket.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.network.protocol.game.ClientGamePacketListener; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.uiop.easyplacefix.EasyPlaceFix; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(ClientboundOpenScreenPacket.class) public class MixinOpenScreenS2CPacket { diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerInteractBlockC2SPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerInteractBlockC2SPacket.java index 6a3a947..0fa919b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerInteractBlockC2SPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerInteractBlockC2SPacket.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerMoveC2SPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerMoveC2SPacket.java index 67a4457..e1334cc 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerMoveC2SPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinPlayerMoveC2SPacket.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinScreenHandlerPropertyUpdateS2CPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinScreenHandlerPropertyUpdateS2CPacket.java index 2587b23..f4edc5b 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinScreenHandlerPropertyUpdateS2CPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinScreenHandlerPropertyUpdateS2CPacket.java @@ -1,11 +1,11 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundContainerSetDataPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(ClientboundContainerSetDataPacket.class) public class MixinScreenHandlerPropertyUpdateS2CPacket {//Packet updates screen handler properties diff --git a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinSignEditorOpenS2CPacket.java b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinSignEditorOpenS2CPacket.java index 4035df6..1bbb39a 100644 --- a/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinSignEditorOpenS2CPacket.java +++ b/src/main/java/org/uiop/easyplacefix/Mixin/packet/MixinSignEditorOpenS2CPacket.java @@ -1,11 +1,11 @@ -package org.uiop.easyplacefix.Mixin.packet; +package org.uiop.easyplacefix.mixin.packet; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.uiop.easyplacefix.until.PlayerBlockAction; +import org.uiop.easyplacefix.util.PlayerBlockAction; @Mixin(ClientboundOpenSignEditorPacket.class) public class MixinSignEditorOpenS2CPacket { diff --git a/src/main/java/org/uiop/easyplacefix/command/EasyPlaceFixCommands.java b/src/main/java/org/uiop/easyplacefix/command/EasyPlaceFixCommands.java index 8c23fc5..7e73199 100644 --- a/src/main/java/org/uiop/easyplacefix/command/EasyPlaceFixCommands.java +++ b/src/main/java/org/uiop/easyplacefix/command/EasyPlaceFixCommands.java @@ -10,7 +10,7 @@ import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.chat.Component; import org.uiop.easyplacefix.config.PlacementPreset; -import org.uiop.easyplacefix.until.PlacementDiagnostics; +import org.uiop.easyplacefix.util.PlacementDiagnostics; import java.util.List; diff --git a/src/main/java/org/uiop/easyplacefix/until/doEasyPlace.java b/src/main/java/org/uiop/easyplacefix/util/EasyPlaceHandler.java similarity index 90% rename from src/main/java/org/uiop/easyplacefix/until/doEasyPlace.java rename to src/main/java/org/uiop/easyplacefix/util/EasyPlaceHandler.java index d33e6dc..f3c3c10 100644 --- a/src/main/java/org/uiop/easyplacefix/until/doEasyPlace.java +++ b/src/main/java/org/uiop/easyplacefix/util/EasyPlaceHandler.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import com.tick_ins.tick.RunnableWithLast; import com.tick_ins.tick.TickThread; @@ -34,6 +34,8 @@ import java.util.HashSet; import java.util.List; import java.lang.reflect.Method; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; @@ -43,29 +45,57 @@ import static org.uiop.easyplacefix.EasyPlaceFix.LOGGER; import static org.uiop.easyplacefix.config.easyPlacefixConfig.*; import static org.uiop.easyplacefix.data.LoosenModeData.items; -import static org.uiop.easyplacefix.until.PlacementDiagnostics.report; -import static org.uiop.easyplacefix.until.PlacementInventory.pickItem; -import static org.uiop.easyplacefix.until.PlayerBlockAction.useItemOnAction.*; - -public class doEasyPlace { - private static final Method PLACEMENT_PART_GET_BOX = findMethod( - SchematicPlacementManager.PlacementPart.class, "getBox"); - private static final Method BOX_CONTAINS = findMethod( - PLACEMENT_PART_GET_BOX.getReturnType(), "contains", BlockPos.class); +import static org.uiop.easyplacefix.util.PlacementDiagnostics.report; +import static org.uiop.easyplacefix.util.PlacementInventory.pickItem; +import static org.uiop.easyplacefix.util.PlayerBlockAction.useItemOnAction.*; + +public class EasyPlaceHandler { + private static final String[] BOX_CONTAINS_METHOD_NAMES = {"contains", "containsPos"}; + private static final Method PLACEMENT_PART_GET_BOX = findNoArgMethod( + SchematicPlacementManager.PlacementPart.class, "getBox", "getBoundingBox"); + private static final ConcurrentMap, Method> BOX_CONTAINS_METHODS = new ConcurrentHashMap<>(); + + private static Method findNoArgMethod(Class owner, String... methodNames) { + for (String methodName : methodNames) { + try { + return owner.getMethod(methodName); + } catch (NoSuchMethodException ignored) { + // Try the name used by another supported Litematica version. + } + } + throw unsupportedApi(owner, methodNames); + } - private static Method findMethod(Class owner, String name, Class... parameterTypes) { - try { - return owner.getMethod(name, parameterTypes); - } catch (NoSuchMethodException exception) { - throw new IllegalStateException("Unsupported Litematica/MaLiLib API: " + owner.getName() + "#" + name, - exception); + private static Method findBoxContainsMethod(Class boxClass) { + for (String methodName : BOX_CONTAINS_METHOD_NAMES) { + for (Method method : boxClass.getMethods()) { + Class[] parameterTypes = method.getParameterTypes(); + if (method.getName().equals(methodName) + && parameterTypes.length == 1 + && parameterTypes[0].isAssignableFrom(BlockPos.class) + && (method.getReturnType() == boolean.class || method.getReturnType() == Boolean.class)) { + return method; + } + } } + throw unsupportedApi(boxClass, BOX_CONTAINS_METHOD_NAMES); + } + + private static IllegalStateException unsupportedApi(Class owner, String... methodNames) { + return new IllegalStateException( + "Unsupported Litematica/MaLiLib API: " + owner.getName() + "#" + + String.join("/", methodNames)); } private static boolean placementContains(SchematicPlacementManager.PlacementPart placementPart, BlockPos pos) { try { Object box = PLACEMENT_PART_GET_BOX.invoke(placementPart); - return box != null && (boolean) BOX_CONTAINS.invoke(box, pos); + if (box == null) { + return false; + } + Method containsMethod = BOX_CONTAINS_METHODS.computeIfAbsent( + box.getClass(), EasyPlaceHandler::findBoxContainsMethod); + return Boolean.TRUE.equals(containsMethod.invoke(box, pos)); } catch (ReflectiveOperationException exception) { throw new IllegalStateException("Could not inspect a Litematica placement bounding box", exception); } diff --git a/src/main/java/org/uiop/easyplacefix/until/ExtraInteractionRunner.java b/src/main/java/org/uiop/easyplacefix/util/ExtraInteractionRunner.java similarity index 98% rename from src/main/java/org/uiop/easyplacefix/until/ExtraInteractionRunner.java rename to src/main/java/org/uiop/easyplacefix/util/ExtraInteractionRunner.java index 9eea355..89f9ec5 100644 --- a/src/main/java/org/uiop/easyplacefix/until/ExtraInteractionRunner.java +++ b/src/main/java/org/uiop/easyplacefix/util/ExtraInteractionRunner.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import com.tick_ins.tick.RunnableWithCountDown; import com.tick_ins.tick.TickThread; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlacementDiagnostics.java b/src/main/java/org/uiop/easyplacefix/util/PlacementDiagnostics.java similarity index 98% rename from src/main/java/org/uiop/easyplacefix/until/PlacementDiagnostics.java rename to src/main/java/org/uiop/easyplacefix/util/PlacementDiagnostics.java index 7785bca..cee24ff 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlacementDiagnostics.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlacementDiagnostics.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlacementInventory.java b/src/main/java/org/uiop/easyplacefix/util/PlacementInventory.java similarity index 98% rename from src/main/java/org/uiop/easyplacefix/until/PlacementInventory.java rename to src/main/java/org/uiop/easyplacefix/util/PlacementInventory.java index bd8ad1b..ee216a3 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlacementInventory.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlacementInventory.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import fi.dy.masa.litematica.config.Configs; import fi.dy.masa.litematica.util.EntityUtils; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlacementItemResolver.java b/src/main/java/org/uiop/easyplacefix/util/PlacementItemResolver.java similarity index 96% rename from src/main/java/org/uiop/easyplacefix/until/PlacementItemResolver.java rename to src/main/java/org/uiop/easyplacefix/util/PlacementItemResolver.java index 0ced779..3b0bace 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlacementItemResolver.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlacementItemResolver.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlacementStateMatcher.java b/src/main/java/org/uiop/easyplacefix/util/PlacementStateMatcher.java similarity index 98% rename from src/main/java/org/uiop/easyplacefix/until/PlacementStateMatcher.java rename to src/main/java/org/uiop/easyplacefix/util/PlacementStateMatcher.java index f3fd464..c31abce 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlacementStateMatcher.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlacementStateMatcher.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import net.minecraft.world.level.block.LecternBlock; import net.minecraft.world.level.block.ShelfBlock; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlayerBlockAction.java b/src/main/java/org/uiop/easyplacefix/util/PlayerBlockAction.java similarity index 99% rename from src/main/java/org/uiop/easyplacefix/until/PlayerBlockAction.java rename to src/main/java/org/uiop/easyplacefix/util/PlayerBlockAction.java index 2a6165a..2b5679b 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlayerBlockAction.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlayerBlockAction.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import com.tick_ins.packet.Ping2Server; import org.uiop.easyplacefix.config.easyPlacefixConfig; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlayerInputAction.java b/src/main/java/org/uiop/easyplacefix/util/PlayerInputAction.java similarity index 95% rename from src/main/java/org/uiop/easyplacefix/until/PlayerInputAction.java rename to src/main/java/org/uiop/easyplacefix/util/PlayerInputAction.java index 926f3c5..3f26158 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlayerInputAction.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlayerInputAction.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import net.minecraft.client.Minecraft; import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket; diff --git a/src/main/java/org/uiop/easyplacefix/until/PlayerRotationAction.java b/src/main/java/org/uiop/easyplacefix/util/PlayerRotationAction.java similarity index 98% rename from src/main/java/org/uiop/easyplacefix/until/PlayerRotationAction.java rename to src/main/java/org/uiop/easyplacefix/util/PlayerRotationAction.java index 07210e0..f18b535 100644 --- a/src/main/java/org/uiop/easyplacefix/until/PlayerRotationAction.java +++ b/src/main/java/org/uiop/easyplacefix/util/PlayerRotationAction.java @@ -1,4 +1,4 @@ -package org.uiop.easyplacefix.until; +package org.uiop.easyplacefix.util; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; diff --git a/src/main/resources/easyplacefix.mixins.json b/src/main/resources/easyplacefix.mixins.json index 52d920e..74c6575 100644 --- a/src/main/resources/easyplacefix.mixins.json +++ b/src/main/resources/easyplacefix.mixins.json @@ -1,6 +1,6 @@ { "minVersion": "0.8", - "package": "org.uiop.easyplacefix.Mixin", + "package": "org.uiop.easyplacefix.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "MixinConfigs", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8d8b48b..493eed9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,8 +27,8 @@ "java": ">=25", "fabricloader": ">=0.19.3", "fabric-api": "*", - "litematica": ">=0.27.10 <=0.28.4", - "malilib": ">=0.28.9 <=0.29.3", + "litematica": ">=0.27.10 <0.29", + "malilib": ">=0.28.9 <0.30", "minecraft": ">=26.1.2 <=26.2" } }