From d2fd3f4692d6f4210b7ef34b8e89d737eadd49f2 Mon Sep 17 00:00:00 2001 From: ProperSAMA <997794945@qq.com> Date: Sun, 30 Aug 2026 15:09:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E5=B0=86retrofuturagradle?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=87=B31.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 远端已无法获取到1.4.0和1.4.1 --- build.gradle.kts | 4 ++-- gradlew | 0 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle.kts b/build.gradle.kts index b5da34a4..b757e366 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { id("maven-publish") id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7" id("eclipse") - id("com.gtnewhorizons.retrofuturagradle") version "1.4.0" + id("com.gtnewhorizons.retrofuturagradle") version "1.4.2" } // Project properties @@ -343,4 +343,4 @@ idea { tasks.processIdeaSettings.configure { dependsOn(tasks.injectTags) -} \ No newline at end of file +} diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 2d73cdecc7e1aad718e047ae1a28bdcf6d0565e8 Mon Sep 17 00:00:00 2001 From: ProperSAMA <997794945@qq.com> Date: Sun, 30 Aug 2026 15:32:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BB=84=E8=A3=85=E8=A6=86=E7=9B=96=E6=9C=BA=E5=99=A8=E6=96=B9?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ikx/mmce/common/assembly/MachineAssembly.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/ink/ikx/mmce/common/assembly/MachineAssembly.java b/src/main/java/ink/ikx/mmce/common/assembly/MachineAssembly.java index 4b6caa1f..964448e3 100644 --- a/src/main/java/ink/ikx/mmce/common/assembly/MachineAssembly.java +++ b/src/main/java/ink/ikx/mmce/common/assembly/MachineAssembly.java @@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.world.BlockEvent; @@ -320,10 +319,15 @@ public static boolean replaceCheck(final BlockPos realPos, final World world, fi IBlockState blockState = world.getBlockState(realPos); Block block = blockState.getBlock(); - if (world.isAirBlock(realPos) || - block instanceof IPlantable || - block instanceof BlockLiquid || - block instanceof IFluidBlock) { + if (world.isAirBlock(realPos)) { + return true; + } + + // Never replace blocks with TileEntities, since doing so may destroy machine or inventory data. + if (world.getTileEntity(realPos) == null && + (block.isReplaceable(world, realPos) || + block instanceof BlockLiquid || + block instanceof IFluidBlock)) { return true; }