fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric-1.16

Browse Source 
# Conflicts:
#	src/main/java/appeng/block/AEBaseBlockItem.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/parts/PartPlacement.java
This commit is contained in:
Sebastian Hartte
2020-07-02 01:15:30 +02:00
parent 3b4302583d f573b52b1b
commit dd9346e53f
5 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/PartPlacement.java
+9 -13
View File
@@ -20,7 +20,6 @@ package appeng.parts;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IItems;
import appeng.api.parts.*;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
@@ -51,7 +50,6 @@ import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
public class PartPlacement {
@@ -215,24 +213,22 @@ public class PartPlacement {
host = (IPartHost) tile;
}
final Optional<ItemStack> maybeMultiPartStack = multiPart.maybeStack(1);
final Optional<Block> maybeMultiPartBlock = multiPart.maybeBlock();
final Optional<BlockItem> maybeMultiPartBlockItem = multiPart.maybeBlockItem();
ItemStack multiPartStack = multiPart.stack(1);
Block multiPartBlock = multiPart.block();
BlockItem multiPartBlockItem = multiPart.blockItem();
final boolean hostIsNotPresent = host == null;
final boolean multiPartPresent = maybeMultiPartBlock.isPresent() && maybeMultiPartStack.isPresent()
&& maybeMultiPartBlockItem.isPresent();
BlockState multiPartBlockState = maybeMultiPartBlock.get().getDefaultState();
final boolean canMultiPartBePlaced = multiPartBlockState.canPlaceAt(world, te_pos);
boolean hostIsNotPresent = host == null;
BlockState multiPartBlockState = multiPartBlock.getDefaultState();
boolean canMultiPartBePlaced = multiPartBlockState.canPlaceAt(world, te_pos);
// We cannot override the item stack of normal use context, so we use this hack
ItemPlacementContext mpUseCtx = new ItemPlacementContext(
new AutomaticItemPlacementContext(world, te_pos, side, maybeMultiPartStack.get(), side));
new AutomaticItemPlacementContext(world, te_pos, side, multiPartStack, side));
// FIXME: This is super-fishy and all needs to be re-checked. what does this
// even do???
if (hostIsNotPresent && multiPartPresent && canMultiPartBePlaced
&& maybeMultiPartBlockItem.get().place(mpUseCtx) == ActionResult.SUCCESS) {
if (hostIsNotPresent && canMultiPartBePlaced
&& multiPartBlockItem.place(mpUseCtx).isAccepted()) {
if (!world.isClient) {
tile = world.getBlockEntity(te_pos);