mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-04-16 20:11:24 +00:00
Code Issues Releases Wiki Activity

Correctly register turtle refuel handlers

Browse Source 
And actually test them! Along with a whole load of other turtle tests.

Fixes #1202
This commit is contained in:
Jonathan Coates
2022-11-03 20:25:59 +00:00
parent c919011a7e
commit 45c5de73bb
18 changed files with 1601 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/impl/TurtleRefuelHandlers.java
View File

@@ -39,7 +39,7 @@ public final class TurtleRefuelHandlers
{
}
public static void register( TurtleRefuelHandler handler )
public static synchronized void register( TurtleRefuelHandler handler )
{
Objects.requireNonNull( handler, "handler cannot be null" );
handlers.add( handler );

3
src/main/java/dan200/computercraft/shared/Registry.java
View File

@@ -68,6 +68,7 @@ import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
import dan200.computercraft.shared.pocket.peripherals.PocketModem;
import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
import dan200.computercraft.shared.turtle.FurnaceRefuelHandler;
import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
import dan200.computercraft.shared.turtle.blocks.TileTurtle;
import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
@@ -394,6 +395,8 @@ public final class Registry
ComputerCraftAPI.registerGenericSource( new InventoryMethods() );
ComputerCraftAPI.registerGenericSource( new FluidMethods() );
ComputerCraftAPI.registerGenericSource( new EnergyMethods() );
ComputerCraftAPI.registerRefuelHandler( new FurnaceRefuelHandler() );
}
private static void registerProviders()

6
src/main/java/dan200/computercraft/shared/turtle/FurnaceRefuelHandler.java
View File

@@ -15,12 +15,6 @@ import java.util.OptionalInt;
public final class FurnaceRefuelHandler implements TurtleRefuelHandler
{
private static final FurnaceRefuelHandler INSTANCE = new FurnaceRefuelHandler();
private FurnaceRefuelHandler()
{
}
@Override
public OptionalInt refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack currentStack, int slot, int limit )
{