Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java
Original file line number Diff line number Diff line change
Expand Up @@ -451,16 +451,6 @@ public void setPaintingColor(int color) {

public void onPaintingColorChanged(int color) {}

public void clearInventory(IItemHandlerModifiable inventory) {
for (int i = 0; i < inventory.getSlots(); i++) {
ItemStack stackInSlot = inventory.getStackInSlot(i);
if (!stackInSlot.isEmpty()) {
inventory.setStackInSlot(i, ItemStack.EMPTY);
Block.popResource(getLevel(), getBlockPos(), stackInSlot);
}
}
}

@Override
public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, ItemStack held,
Set<GTToolType> toolTypes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ protected void chargeBattery() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(chargerInventory);
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
clearInventory(circuitInventory.storage);
circuitInventory.dropInventoryInWorld();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public void onUnload() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(importItems.storage);
clearInventory(exportItems.storage);
importItems.dropInventoryInWorld();
exportItems.dropInventoryInWorld();
}

public void setMuffled(boolean muffled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public void onLoad() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(importItems.storage);
clearInventory(exportItems.storage);
importItems.dropInventoryInWorld();
exportItems.dropInventoryInWorld();
}

//////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ public boolean isItemValid(int slot, @NotNull ItemStack stack) {
return storage.isItemValid(slot, stack);
}

public void dropInventoryInWorld() {
storage.dropInventoryInWorld(getLevel(), getMachine().getBlockPos());
}

public static class KJSCallWrapper {

public static ItemStack applyIngredientAction(CustomItemStackHandler storage, int index,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.gregtechceu.gtceu.api.transfer.item;

import net.minecraft.core.BlockPos;
import net.minecraft.core.NonNullList;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.util.INBTSerializable;
import net.minecraftforge.items.ItemStackHandler;

Expand Down Expand Up @@ -52,4 +55,11 @@ public void clear() {
stacks.clear();
onContentsChanged.run();
}

public void dropInventoryInWorld(Level world, BlockPos pos) {
for (ItemStack stack : stacks) {
Block.popResource(world, pos, stack);
}
clear();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private List<Object> getAllBatteries() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(batteryInventory);
batteryInventory.dropInventoryInWorld(getLevel(), getBlockPos());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ public void onUnload() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(chargerInventory);
clearInventory(cache.storage);
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
cache.dropInventoryInWorld();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public int tintColor(int index) {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(chargerInventory);
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
}

//////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ public boolean shouldWeatherOrTerrainExplosion() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(chargerInventory);
clearInventory(baitHandler.storage);
clearInventory(cache.storage);
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
baitHandler.dropInventoryInWorld();
cache.dropInventoryInWorld();
}

public static int calcMaxProgress(int tier) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ public boolean shouldWeatherOrTerrainExplosion() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(chargerInventory);
clearInventory(output.storage);
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
output.dropInventoryInWorld();
}

//////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ public void onMachineDestroyed() {
super.onMachineDestroyed();
// Remove the miner pipes below this miner
getRecipeLogic().onRemove();
clearInventory(exportItems.storage);
clearInventory(chargerInventory);
exportItems.dropInventoryInWorld();
chargerInventory.dropInventoryInWorld(getLevel(), getBlockPos());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ public Widget createUIWidget() {
while (itg.hasNext()) {
MonitorGroup group = itg.next();
if (group.isEmpty()) {
clearInventory(group.getItemStackHandler());
clearInventory(group.getPlaceholderSlotsHandler());
group.getItemStackHandler().dropInventoryInWorld(getLevel(), getBlockPos());
group.getPlaceholderSlotsHandler().dropInventoryInWorld(getLevel(), getBlockPos());
itg.remove();
}
}
Expand Down Expand Up @@ -667,8 +667,8 @@ public IGuiTexture getComponentIcon() {
public void onMachineDestroyed() {
super.onMachineDestroyed();
for (MonitorGroup group : monitorGroups) {
clearInventory(group.getItemStackHandler());
clearInventory(group.getPlaceholderSlotsHandler());
group.getItemStackHandler().dropInventoryInWorld(getLevel(), getBlockPos());;
group.getPlaceholderSlotsHandler().dropInventoryInWorld(getLevel(), getBlockPos());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ protected int getInventorySize() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(importItems.storage);
importItems.dropInventoryInWorld();
}

private void rebuildData(boolean isDataBank) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static int getTankCapacity(int initialCapacity, int tier) {
public void onMachineDestroyed() {
super.onMachineDestroyed();
if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
clearInventory(circuitInventory.storage);
circuitInventory.dropInventoryInWorld();
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ public void onPaintingColorChanged(int color) {
public void addedToController(IMultiController controller) {
if (!controller.allowCircuitSlots()) {
if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
clearInventory(circuitInventory.storage);
circuitInventory.dropInventoryInWorld();
} else {
circuitInventory.setStackInSlot(0, ItemStack.EMPTY);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ protected NotifiableItemStackHandler createCircuitItemHandler(IO io) {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(getInventory().storage);
getInventory().dropInventoryInWorld();

if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
clearInventory(circuitInventory.storage);
circuitInventory.dropInventoryInWorld();
}
}

Expand Down Expand Up @@ -148,7 +148,7 @@ public void setDistinct(boolean distinct) {
public void addedToController(IMultiController controller) {
if (hasCircuitSlot && !controller.allowCircuitSlots()) {
if (!ConfigHolder.INSTANCE.machines.ghostCircuit) {
clearInventory(circuitInventory.storage);
circuitInventory.dropInventoryInWorld();
} else {
circuitInventory.setStackInSlot(0, ItemStack.EMPTY);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected NotifiableItemStackHandler createInventory() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(itemStackHandler);
itemStackHandler.dropInventoryInWorld();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private ItemStack getHeldItem(int slot, boolean remove) {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(this.heldItems.storage);
heldItems.storage.dropInventoryInWorld(getLevel(), getBlockPos());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public RotorHolderPartMachine(BlockEntityCreationInfo info, int tier) {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(inventory.storage);
inventory.dropInventoryInWorld();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ protected NotifiableFluidTank createExportFluidHandler() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(importItems.storage);
clearInventory(exportItems.storage);
importItems.dropInventoryInWorld();
exportItems.dropInventoryInWorld();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected NotifiableItemStackHandler createExportItemHandler() {
public void onMachineDestroyed() {
super.onMachineDestroyed();
getRecipeLogic().onRemove();
clearInventory(exportItems.storage);
exportItems.dropInventoryInWorld();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public ModularUI createUI(Player entityPlayer) {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(fuelHandler.storage);
clearInventory(ashHandler.storage);
fuelHandler.dropInventoryInWorld();
ashHandler.dropInventoryInWorld();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@ public Widget createUIWidget() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
clearInventory(inventory.storage);
inventory.dropInventoryInWorld();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ public boolean saveBreak() {
@Override
public void onMachineDestroyed() {
super.onMachineDestroyed();
if (!isTaped) clearInventory(inventory.storage);
if (!isTaped) inventory.dropInventoryInWorld();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ public PatternContainerGroup getTerminalGroup() {

@Override
public void onMachineDestroyed() {
clearInventory(patternInventory);
clearInventory(shareInventory);
patternInventory.dropInventoryInWorld(getLevel(), getBlockPos());
shareInventory.dropInventoryInWorld();
}

@Override
Expand Down