-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix disassembled MEGA mana cells returning the wrong housing
Closes #107
- Loading branch information
Showing
2 changed files
with
68 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
common/src/main/java/gripe/_90/megacells/integration/appbot/MEGAManaCellItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package gripe._90.megacells.integration.appbot; | ||
|
||
import org.jetbrains.annotations.NotNull; | ||
|
||
import net.minecraft.world.InteractionHand; | ||
import net.minecraft.world.InteractionResult; | ||
import net.minecraft.world.InteractionResultHolder; | ||
import net.minecraft.world.entity.player.Player; | ||
import net.minecraft.world.item.ItemStack; | ||
import net.minecraft.world.item.context.UseOnContext; | ||
import net.minecraft.world.level.ItemLike; | ||
import net.minecraft.world.level.Level; | ||
|
||
import appeng.api.storage.StorageCells; | ||
import appeng.items.storage.StorageTier; | ||
import appeng.util.InteractionUtil; | ||
|
||
import appbot.item.ManaCellItem; | ||
|
||
public class MEGAManaCellItem extends ManaCellItem { | ||
private final ItemLike coreItem; | ||
|
||
public MEGAManaCellItem(Properties properties, StorageTier tier) { | ||
super(properties, tier.componentSupplier().get(), tier.bytes() / 1024, tier.idleDrain()); | ||
this.coreItem = tier.componentSupplier().get(); | ||
} | ||
|
||
@NotNull | ||
@Override | ||
public InteractionResultHolder<ItemStack> use( | ||
@NotNull Level level, @NotNull Player player, @NotNull InteractionHand hand) { | ||
disassembleDrive(player.getItemInHand(hand), level, player); | ||
return new InteractionResultHolder<>( | ||
InteractionResult.sidedSuccess(level.isClientSide()), player.getItemInHand(hand)); | ||
} | ||
|
||
@NotNull | ||
@Override | ||
public InteractionResult onItemUseFirst(@NotNull ItemStack stack, UseOnContext context) { | ||
return disassembleDrive(stack, context.getLevel(), context.getPlayer()) | ||
? InteractionResult.sidedSuccess(context.getLevel().isClientSide()) | ||
: InteractionResult.PASS; | ||
} | ||
|
||
private boolean disassembleDrive(ItemStack stack, Level level, Player player) { | ||
if (InteractionUtil.isInAlternateUseMode(player)) { | ||
if (level.isClientSide()) { | ||
return false; | ||
} | ||
|
||
var playerInventory = player.getInventory(); | ||
var inv = StorageCells.getCellInventory(stack, null); | ||
if (inv != null && playerInventory.getSelected() == stack) { | ||
var list = inv.getAvailableStacks(); | ||
|
||
if (list.isEmpty()) { | ||
playerInventory.setItem(playerInventory.selected, ItemStack.EMPTY); | ||
playerInventory.placeItemBackInInventory(coreItem.asItem().getDefaultInstance()); | ||
playerInventory.placeItemBackInInventory(AppBotItems.MEGA_MANA_CELL_HOUSING.stack()); | ||
return true; | ||
} | ||
} | ||
} | ||
|
||
return false; | ||
} | ||
} |