Skip to content

更新 RetroFuturaGradle 并修复自动组装覆盖机器方块 #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProperSAMA wants to merge 2 commits into
base: master
Choose a base branch
from
Open

更新 RetroFuturaGradle 并修复自动组装覆盖机器方块 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2fd3f4
chore: 将retrofuturagradle版本更新至1.4.2
ProperSAMA Aug 30, 2026
2d73cde
fix: 避免自动组装覆盖机器方块
ProperSAMA Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -343,4 +343,4 @@ idea {

tasks.processIdeaSettings.configure {
dependsOn(tasks.injectTags)
}
}
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
14 changes: 9 additions & 5 deletions src/main/java/ink/ikx/mmce/common/assembly/MachineAssembly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
Loading