Skip to content
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

Fix/machine inventory drop #4271

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

Fix/machine inventory drop #4271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ecbf88
Add static constructor machine implementation in SimpleBlockBreakHandler
Intybyte Dec 12, 2024
584afa0
Better move this to its own class, creating MachineBlockBreakHandler
Intybyte Dec 12, 2024
fb13699
Use MachineBlockBreakHandler
Intybyte Dec 12, 2024
99b7f5f
Fix Typo
Intybyte Jan 11, 2025
9913377
Add more nullable notations and add precondition check
Intybyte Jan 11, 2025
9be2602
Repetition unnecessary, type must always extend MachineOperation by d…
Intybyte Jan 11, 2025
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
Prev Previous commit
Next Next commit
Use MachineBlockBreakHandler
  • Loading branch information
@Intybyte
Intybyte committed Dec 12, 2024
commit fb136999fb9445c148060661858d9042043a2d46
13 changes: 2 additions & 11 deletions ...ava/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/AbstractFilterNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -52,17 +53,7 @@ public boolean hasItemFilter() {

@Nonnull
private BlockBreakHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(@Nonnull Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), SLOTS);
}
}
};
return new MachineBlockBreakHandler(SLOTS);
}

@Nonnull
Expand Down
15 changes: 2 additions & 13 deletions ...java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/ReactorAccessPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -117,19 +118,7 @@ public int[] getSlotsAccessedByItemTransport(DirtyChestMenu menu, ItemTransportF

@Nonnull
private BlockBreakHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(@Nonnull Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getFuelSlots());
inv.dropItems(b.getLocation(), getCoolantSlots());
inv.dropItems(b.getLocation(), getOutputSlots());
}
}
};
return new MachineBlockBreakHandler(getFuelSlots(), getCoolantSlots(), getOutputSlots());
}

private void constructMenu(@Nonnull BlockMenuPreset preset) {
Expand Down
14 changes: 2 additions & 12 deletions .../io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -70,18 +71,7 @@ public FluidPump(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeT

@Nonnull
private BlockBreakHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getInputSlots());
inv.dropItems(b.getLocation(), getOutputSlots());
}
}
};
return new MachineBlockBreakHandler(getOutputSlots(), getOutputSlots());
Intybyte marked this conversation as resolved.
Show resolved Hide resolved
}

private void constructMenu(@Nonnull BlockMenuPreset preset) {
Expand Down
13 changes: 2 additions & 11 deletions ...mefun4/implementation/items/electric/machines/accelerators/AbstractGrowthAccelerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.inventory.ItemStack;
Expand Down Expand Up @@ -39,17 +40,7 @@ protected AbstractGrowthAccelerator(ItemGroup itemGroup, SlimefunItemStack item,

@Nonnull
private BlockBreakHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getInputSlots());
}
}
};
return new MachineBlockBreakHandler(getInputSlots());
}

private void constructMenu(BlockMenuPreset preset) {
Expand Down
13 changes: 2 additions & 11 deletions ...thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/AutoBreeder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -50,17 +51,7 @@ public AutoBreeder(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recip

@Nonnull
private ItemHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getInputSlots());
}
}
};
return new MachineBlockBreakHandler(getInputSlots());
}

protected void constructMenu(BlockMenuPreset preset) {
Expand Down
13 changes: 2 additions & 11 deletions ...hebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -77,17 +78,7 @@ public void onPlayerPlace(@Nonnull BlockPlaceEvent e) {
}

private @Nonnull ItemHandler onBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(@Nonnull Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getOutputSlots());
}
}
};
return new MachineBlockBreakHandler(getOutputSlots());
}

@Override
Expand Down
15 changes: 3 additions & 12 deletions ...va/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -122,19 +123,9 @@ public MachineProcessor<FuelOperation> getMachineProcessor() {

@Nonnull
private BlockBreakHandler onBreak() {
return new SimpleBlockBreakHandler() {

return new MachineBlockBreakHandler(processor, getFuelSlots(), getCoolantSlots(), getOutputSlots()) {
@Override
public void onBlockBreak(@Nonnull Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getFuelSlots());
inv.dropItems(b.getLocation(), getCoolantSlots());
inv.dropItems(b.getLocation(), getOutputSlots());
}

processor.endOperation(b);
public void afterBreak(@Nonnull Block b) {
removeHologram(b);
}
};
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.apache.commons.lang.Validate;
import org.bukkit.ChatColor;
import org.bukkit.Material;
Expand Down Expand Up @@ -197,18 +198,10 @@ public void onPlayerPlace(BlockPlaceEvent e) {

@Nonnull
private BlockBreakHandler onBlockBreak() {
return new SimpleBlockBreakHandler() {

return new MachineBlockBreakHandler(OUTPUT_SLOTS) {
@Override
public void onBlockBreak(@Nonnull Block b) {
protected void beforeBreak(@Nonnull Block b) {
removeHologram(b);
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), OUTPUT_SLOTS);
}

processor.endOperation(b);
}
};
}
Expand Down
17 changes: 2 additions & 15 deletions src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -67,21 +68,7 @@ protected AContainer(ItemGroup itemGroup, SlimefunItemStack item, RecipeType rec

@Nonnull
protected BlockBreakHandler onBlockBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getInputSlots());
inv.dropItems(b.getLocation(), getOutputSlots());
}

processor.endOperation(b);
}

};
return new MachineBlockBreakHandler(processor, getOutputSlots(), getInputSlots());
}

@ParametersAreNonnullByDefault
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;

import io.github.thebusybiscuit.slimefun4.implementation.handlers.MachineBlockBreakHandler;
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -89,20 +90,7 @@ public MachineProcessor<FuelOperation> getMachineProcessor() {

@Nonnull
protected BlockBreakHandler onBlockBreak() {
return new SimpleBlockBreakHandler() {

@Override
public void onBlockBreak(Block b) {
BlockMenu inv = BlockStorage.getInventory(b);

if (inv != null) {
inv.dropItems(b.getLocation(), getInputSlots());
inv.dropItems(b.getLocation(), getOutputSlots());
}

processor.endOperation(b);
}
};
return new MachineBlockBreakHandler(processor, getInputSlots(), getOutputSlots());
}

private void constructMenu(BlockMenuPreset preset) {
Expand Down
Loading