mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-10-30 13:13:00 +00:00
move remappedSrc to src/main/java
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[](https://github.com/Merith-TK/cc-restitched/actions "Current build status")
|
[](https://github.com/Merith-TK/cc-restitched/actions "Current build status")
|
||||||
[](https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC: Restitched on CurseForge")
|
[](https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC: Restitched on CurseForge")
|
||||||
[](https://gitpod.io/#https://github.com/Merith-TK/cc-restitched)
|
[](https://gitpod.io/#https://github.com/Merith-TK/cc-restitched/tree/1.17-alpha)
|
||||||
|
|
||||||
# CC: R Version VS CC: T Version
|
# CC: R Version VS CC: T Version
|
||||||
CC: R Strives to maintain perfect pairity with CC: T, however in some cases this is not possible, so CC: R might have a "newer" version than what CC: T has, these newer versions will be primarily bugfixes and the like because fabric is "weird" when porting a forge mod.
|
CC: R Strives to maintain perfect pairity with CC: T, however in some cases this is not possible, so CC: R might have a "newer" version than what CC: T has, these newer versions will be primarily bugfixes and the like because fabric is "weird" when porting a forge mod.
|
||||||
|
|||||||
@@ -1,138 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.event.TurtleAction;
|
|
||||||
import dan200.computercraft.core.apis.http.options.Action;
|
|
||||||
import dan200.computercraft.core.apis.http.options.AddressRule;
|
|
||||||
import dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
|
|
||||||
import dan200.computercraft.shared.common.ColourableRecipe;
|
|
||||||
import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
|
|
||||||
import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
|
|
||||||
import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
|
|
||||||
import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
|
|
||||||
import dan200.computercraft.shared.data.HasComputerIdLootCondition;
|
|
||||||
import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
|
|
||||||
import dan200.computercraft.shared.media.recipes.DiskRecipe;
|
|
||||||
import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
|
|
||||||
import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
|
|
||||||
import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
|
|
||||||
import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
|
|
||||||
import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
|
|
||||||
import dan200.computercraft.shared.util.ImpostorRecipe;
|
|
||||||
import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
|
||||||
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
|
|
||||||
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
|
|
||||||
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
import net.minecraft.item.ItemGroup;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.EnumSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import static dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
|
|
||||||
import static dan200.computercraft.shared.ComputerCraftRegistry.init;
|
|
||||||
|
|
||||||
public final class ComputerCraft implements ModInitializer
|
|
||||||
{
|
|
||||||
public static final String MOD_ID = "computercraft";
|
|
||||||
|
|
||||||
// Configuration fields
|
|
||||||
public static int computerSpaceLimit = 1000 * 1000;
|
|
||||||
public static int floppySpaceLimit = 125 * 1000;
|
|
||||||
public static int maximumFilesOpen = 128;
|
|
||||||
public static boolean disableLua51Features = false;
|
|
||||||
public static String defaultComputerSettings = "";
|
|
||||||
public static boolean debugEnable = true;
|
|
||||||
public static boolean logComputerErrors = true;
|
|
||||||
public static boolean commandRequireCreative = true;
|
|
||||||
|
|
||||||
public static int computerThreads = 1;
|
|
||||||
public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
|
|
||||||
public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
|
|
||||||
|
|
||||||
public static boolean httpEnabled = true;
|
|
||||||
public static boolean httpWebsocketEnabled = true;
|
|
||||||
public static List<AddressRule> httpRules = Collections.unmodifiableList( Arrays.asList(
|
|
||||||
AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
|
|
||||||
AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
|
|
||||||
) );
|
|
||||||
public static int httpMaxRequests = 16;
|
|
||||||
public static int httpMaxWebsockets = 4;
|
|
||||||
|
|
||||||
public static boolean enableCommandBlock = false;
|
|
||||||
public static int modemRange = 64;
|
|
||||||
public static int modemHighAltitudeRange = 384;
|
|
||||||
public static int modemRangeDuringStorm = 64;
|
|
||||||
public static int modemHighAltitudeRangeDuringStorm = 384;
|
|
||||||
public static int maxNotesPerTick = 8;
|
|
||||||
public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
|
|
||||||
public static double monitorDistanceSq = 4096;
|
|
||||||
public static long monitorBandwidth = 1_000_000;
|
|
||||||
|
|
||||||
public static boolean turtlesNeedFuel = true;
|
|
||||||
public static int turtleFuelLimit = 20000;
|
|
||||||
public static int advancedTurtleFuelLimit = 100000;
|
|
||||||
public static boolean turtlesObeyBlockProtection = true;
|
|
||||||
public static boolean turtlesCanPush = true;
|
|
||||||
public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );
|
|
||||||
|
|
||||||
public static int computerTermWidth = 51;
|
|
||||||
public static int computerTermHeight = 19;
|
|
||||||
|
|
||||||
public static final int turtleTermWidth = 39;
|
|
||||||
public static final int turtleTermHeight = 13;
|
|
||||||
|
|
||||||
public static int pocketTermWidth = 26;
|
|
||||||
public static int pocketTermHeight = 20;
|
|
||||||
public static int monitorWidth = 8;
|
|
||||||
public static int monitorHeight = 6;
|
|
||||||
|
|
||||||
// Registries
|
|
||||||
public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
|
|
||||||
public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
|
|
||||||
|
|
||||||
// Logging
|
|
||||||
public static final Logger log = LogManager.getLogger( MOD_ID );
|
|
||||||
|
|
||||||
public static ItemGroup MAIN_GROUP = FabricItemGroupBuilder.build( new Identifier( MOD_ID, "main" ), () -> new ItemStack( ModBlocks.COMPUTER_NORMAL ) );
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInitialize()
|
|
||||||
{
|
|
||||||
ComputerCraftProxyCommon.init();
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "colour" ), ColourableRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "computer_upgrade" ), ComputerUpgradeRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER,
|
|
||||||
new Identifier( ComputerCraft.MOD_ID, "pocket_computer_upgrade" ),
|
|
||||||
PocketComputerUpgradeRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "disk" ), DiskRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "printout" ), PrintoutRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "turtle" ), TurtleRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "turtle_upgrade" ), TurtleUpgradeRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "impostor_shaped" ), ImpostorRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "impostor_shapeless" ), ImpostorShapelessRecipe.SERIALIZER );
|
|
||||||
Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "block_named" ), BlockNamedEntityLootCondition.TYPE );
|
|
||||||
Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "player_creative" ), PlayerCreativeLootCondition.TYPE );
|
|
||||||
Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "has_id" ), HasComputerIdLootCondition.TYPE );
|
|
||||||
init();
|
|
||||||
FabricLoader.getInstance().getModContainer( MOD_ID ).ifPresent( modContainer -> {
|
|
||||||
ResourceManagerHelper.registerBuiltinResourcePack( new Identifier( MOD_ID, "classic" ), modContainer, ResourcePackActivationType.NORMAL );
|
|
||||||
ResourceManagerHelper.registerBuiltinResourcePack( new Identifier( MOD_ID, "overhaul" ), modContainer, ResourcePackActivationType.NORMAL );
|
|
||||||
} );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,204 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.filesystem.IMount;
|
|
||||||
import dan200.computercraft.api.filesystem.IWritableMount;
|
|
||||||
import dan200.computercraft.api.lua.GenericSource;
|
|
||||||
import dan200.computercraft.api.lua.ILuaAPIFactory;
|
|
||||||
import dan200.computercraft.api.media.IMediaProvider;
|
|
||||||
import dan200.computercraft.api.network.IPacketNetwork;
|
|
||||||
import dan200.computercraft.api.network.wired.IWiredElement;
|
|
||||||
import dan200.computercraft.api.network.wired.IWiredNode;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheralProvider;
|
|
||||||
import dan200.computercraft.api.pocket.IPocketUpgrade;
|
|
||||||
import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import dan200.computercraft.core.apis.ApiFactories;
|
|
||||||
import dan200.computercraft.core.asm.GenericMethod;
|
|
||||||
import dan200.computercraft.core.filesystem.FileMount;
|
|
||||||
import dan200.computercraft.core.filesystem.ResourceMount;
|
|
||||||
import dan200.computercraft.fabric.mixin.MinecraftServerAccess;
|
|
||||||
import dan200.computercraft.shared.*;
|
|
||||||
import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
|
|
||||||
import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
|
|
||||||
import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
|
|
||||||
import dan200.computercraft.shared.util.IDAssigner;
|
|
||||||
import dan200.computercraft.shared.wired.WiredNode;
|
|
||||||
import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
import net.minecraft.block.entity.BlockEntity;
|
|
||||||
import net.minecraft.resource.ReloadableResourceManager;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.world.BlockView;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
public final class ComputerCraftAPIImpl implements IComputerCraftAPI
|
|
||||||
{
|
|
||||||
public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
|
|
||||||
|
|
||||||
private String version;
|
|
||||||
|
|
||||||
private ComputerCraftAPIImpl()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static InputStream getResourceFile( String domain, String subPath )
|
|
||||||
{
|
|
||||||
MinecraftServer server = GameInstanceUtils.getServer();
|
|
||||||
if( server != null )
|
|
||||||
{
|
|
||||||
ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) server).getServerResourceManager().getResourceManager();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return manager.getResource( new Identifier( domain, subPath ) )
|
|
||||||
.getInputStream();
|
|
||||||
}
|
|
||||||
catch( IOException ignored )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public String getInstalledVersion()
|
|
||||||
{
|
|
||||||
if( version != null )
|
|
||||||
{
|
|
||||||
return version;
|
|
||||||
}
|
|
||||||
return version = FabricLoader.getInstance()
|
|
||||||
.getModContainer( ComputerCraft.MOD_ID )
|
|
||||||
.map( x -> x.getMetadata()
|
|
||||||
.getVersion()
|
|
||||||
.toString() )
|
|
||||||
.orElse( "unknown" );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
|
|
||||||
{
|
|
||||||
return IDAssigner.getNextId( parentSubPath );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
|
|
||||||
}
|
|
||||||
catch( Exception e )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
|
|
||||||
{
|
|
||||||
MinecraftServer server = GameInstanceUtils.getServer();
|
|
||||||
if( server != null )
|
|
||||||
{
|
|
||||||
ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) server).getServerResourceManager().getResourceManager();
|
|
||||||
ResourceMount mount = ResourceMount.get( domain, subPath, manager );
|
|
||||||
return mount.exists( "" ) ? mount : null;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
|
|
||||||
{
|
|
||||||
Peripherals.register( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
|
|
||||||
{
|
|
||||||
TurtleUpgrades.register( upgrade );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
|
|
||||||
{
|
|
||||||
BundledRedstone.register( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
|
|
||||||
{
|
|
||||||
return BundledRedstone.getDefaultOutput( world, pos, side );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerMediaProvider( @Nonnull IMediaProvider provider )
|
|
||||||
{
|
|
||||||
MediaProviders.register( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
|
|
||||||
{
|
|
||||||
PocketUpgrades.register( upgrade );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerGenericSource( @Nonnull GenericSource source )
|
|
||||||
{
|
|
||||||
GenericMethod.register( source );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public IPacketNetwork getWirelessNetwork()
|
|
||||||
{
|
|
||||||
return WirelessNetwork.getUniversal();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
|
|
||||||
{
|
|
||||||
ApiFactories.register( factory );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
|
|
||||||
{
|
|
||||||
return new WiredNode( element );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side )
|
|
||||||
{
|
|
||||||
BlockEntity tile = world.getBlockEntity( pos );
|
|
||||||
if( tile instanceof TileCable )
|
|
||||||
{
|
|
||||||
return ((TileCable) tile).getElement( side );
|
|
||||||
}
|
|
||||||
else if( tile instanceof TileWiredModemFull )
|
|
||||||
{
|
|
||||||
return ((TileWiredModemFull) tile).getElement();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,297 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.filesystem.IMount;
|
|
||||||
import dan200.computercraft.api.filesystem.IWritableMount;
|
|
||||||
import dan200.computercraft.api.lua.GenericSource;
|
|
||||||
import dan200.computercraft.api.lua.ILuaAPIFactory;
|
|
||||||
import dan200.computercraft.api.media.IMedia;
|
|
||||||
import dan200.computercraft.api.media.IMediaProvider;
|
|
||||||
import dan200.computercraft.api.network.IPacketNetwork;
|
|
||||||
import dan200.computercraft.api.network.wired.IWiredElement;
|
|
||||||
import dan200.computercraft.api.network.wired.IWiredNode;
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheralProvider;
|
|
||||||
import dan200.computercraft.api.pocket.IPocketUpgrade;
|
|
||||||
import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.world.BlockView;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The static entry point to the ComputerCraft API.
|
|
||||||
*
|
|
||||||
* Members in this class must be called after mod_ComputerCraft has been initialised, but may be called before it is fully loaded.
|
|
||||||
*/
|
|
||||||
public final class ComputerCraftAPI
|
|
||||||
{
|
|
||||||
private static IComputerCraftAPI instance;
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Deprecated
|
|
||||||
public static String getAPIVersion()
|
|
||||||
{
|
|
||||||
return getInstalledVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
public static String getInstalledVersion()
|
|
||||||
{
|
|
||||||
return getInstance().getInstalledVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
private static IComputerCraftAPI getInstance()
|
|
||||||
{
|
|
||||||
if( instance != null )
|
|
||||||
{
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
|
|
||||||
.getField( "INSTANCE" )
|
|
||||||
.get( null );
|
|
||||||
}
|
|
||||||
catch( ReflectiveOperationException e )
|
|
||||||
{
|
|
||||||
throw new IllegalStateException( "Cannot find ComputerCraft API", e );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a numbered directory in a subfolder of the save directory for a given world, and returns that number.
|
|
||||||
*
|
|
||||||
* Use in conjunction with createSaveDirMount() to create a unique place for your peripherals or media items to store files.
|
|
||||||
*
|
|
||||||
* @param world The world for which the save dir should be created. This should be the server side world object.
|
|
||||||
* @param parentSubPath The folder path within the save directory where the new directory should be created. eg: "computercraft/disk"
|
|
||||||
* @return The numerical value of the name of the new folder, or -1 if the folder could not be created for some reason.
|
|
||||||
*
|
|
||||||
* eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now available for writing.
|
|
||||||
* @see #createSaveDirMount(World, String, long)
|
|
||||||
*/
|
|
||||||
public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
|
|
||||||
{
|
|
||||||
return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a file system mount that maps to a subfolder of the save directory for a given world, and returns it.
|
|
||||||
*
|
|
||||||
* Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a folder from the users save directory onto a computers
|
|
||||||
* file system.
|
|
||||||
*
|
|
||||||
* @param world The world for which the save dir can be found. This should be the server side world object.
|
|
||||||
* @param subPath The folder path within the save directory that the mount should map to. eg: "computer/disk/42". Use createUniqueNumberedSaveDir()
|
|
||||||
* to create a new numbered folder to use.
|
|
||||||
* @param capacity The amount of data that can be stored in the directory before it fills up, in bytes.
|
|
||||||
* @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable() to mount this on a
|
|
||||||
* Computers' file system.
|
|
||||||
* @see #createUniqueNumberedSaveDir(World, String)
|
|
||||||
* @see IComputerAccess#mount(String, IMount)
|
|
||||||
* @see IComputerAccess#mountWritable(String, IWritableMount)
|
|
||||||
* @see IMount
|
|
||||||
* @see IWritableMount
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
|
|
||||||
{
|
|
||||||
return getInstance().createSaveDirMount( world, subPath, capacity );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a file system mount to a resource folder, and returns it.
|
|
||||||
*
|
|
||||||
* Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a resource folder onto a computer's file
|
|
||||||
* system.
|
|
||||||
*
|
|
||||||
* The files in this mount will be a combination of files in all mod jar, and data packs that contain
|
|
||||||
* resources with the same domain and path. For instance, ComputerCraft's resources are stored in
|
|
||||||
* "/data/computercraft/lua/rom". We construct a mount for that with
|
|
||||||
* {@code createResourceMount("computercraft", "lua/rom")}.
|
|
||||||
*
|
|
||||||
* @param domain The domain under which to look for resources. eg: "mymod".
|
|
||||||
* @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
|
|
||||||
* @return The mount, or {@code null} if it could be created for some reason.
|
|
||||||
* @see IComputerAccess#mount(String, IMount)
|
|
||||||
* @see IComputerAccess#mountWritable(String, IWritableMount)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
|
|
||||||
{
|
|
||||||
return getInstance().createResourceMount( domain, subPath );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
|
|
||||||
*
|
|
||||||
* @param provider The peripheral provider to register.
|
|
||||||
* @see IPeripheral
|
|
||||||
* @see IPeripheralProvider
|
|
||||||
*/
|
|
||||||
public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
|
|
||||||
{
|
|
||||||
getInstance().registerPeripheralProvider( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a method source for generic peripherals.
|
|
||||||
*
|
|
||||||
* @param source The method source to register.
|
|
||||||
* @see GenericSource
|
|
||||||
*/
|
|
||||||
public static void registerGenericSource( @Nonnull GenericSource source )
|
|
||||||
{
|
|
||||||
getInstance().registerGenericSource( source );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a new turtle turtle for use in ComputerCraft. After calling this, users should be able to craft Turtles with your new turtle. It is
|
|
||||||
* recommended to call this during the load() method of your mod.
|
|
||||||
*
|
|
||||||
* @param upgrade The turtle upgrade to register.
|
|
||||||
* @see ITurtleUpgrade
|
|
||||||
*/
|
|
||||||
public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
|
|
||||||
{
|
|
||||||
getInstance().registerTurtleUpgrade( upgrade );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a bundled redstone provider to provide bundled redstone output for blocks.
|
|
||||||
*
|
|
||||||
* @param provider The bundled redstone provider to register.
|
|
||||||
* @see IBundledRedstoneProvider
|
|
||||||
*/
|
|
||||||
public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
|
|
||||||
{
|
|
||||||
getInstance().registerBundledRedstoneProvider( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If there is a Computer or Turtle at a certain position in the world, get it's bundled redstone output.
|
|
||||||
*
|
|
||||||
* @param world The world this block is in.
|
|
||||||
* @param pos The position this block is at.
|
|
||||||
* @param side The side to extract the bundled redstone output from.
|
|
||||||
* @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned. If there is no block
|
|
||||||
* capable of emitting bundled redstone at the location, -1 will be returned.
|
|
||||||
* @see IBundledRedstoneProvider
|
|
||||||
*/
|
|
||||||
public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
|
|
||||||
{
|
|
||||||
return getInstance().getBundledRedstoneOutput( world, pos, side );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers a media provider to provide {@link IMedia} implementations for Items.
|
|
||||||
*
|
|
||||||
* @param provider The media provider to register.
|
|
||||||
* @see IMediaProvider
|
|
||||||
*/
|
|
||||||
public static void registerMediaProvider( @Nonnull IMediaProvider provider )
|
|
||||||
{
|
|
||||||
getInstance().registerMediaProvider( provider );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
|
|
||||||
{
|
|
||||||
getInstance().registerPocketUpgrade( upgrade );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Attempt to get the game-wide wireless network.
|
|
||||||
*
|
|
||||||
* @return The global wireless network, or {@code null} if it could not be fetched.
|
|
||||||
*/
|
|
||||||
public static IPacketNetwork getWirelessNetwork()
|
|
||||||
{
|
|
||||||
return getInstance().getWirelessNetwork();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
|
|
||||||
{
|
|
||||||
getInstance().registerAPIFactory( factory );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a new wired node for a given wired element.
|
|
||||||
*
|
|
||||||
* @param element The element to construct it for
|
|
||||||
* @return The element's node
|
|
||||||
* @see IWiredElement#getNode()
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
|
|
||||||
{
|
|
||||||
return getInstance().createWiredNodeForElement( element );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the wired network element for a block in world.
|
|
||||||
*
|
|
||||||
* @param world The world the block exists in
|
|
||||||
* @param pos The position the block exists in
|
|
||||||
* @param side The side to extract the network element from
|
|
||||||
* @return The element's node
|
|
||||||
* @see IWiredElement#getNode()
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public static IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side )
|
|
||||||
{
|
|
||||||
return getInstance().getWiredElementAt( world, pos, side );
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface IComputerCraftAPI
|
|
||||||
{
|
|
||||||
@Nonnull
|
|
||||||
String getInstalledVersion();
|
|
||||||
|
|
||||||
int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
|
|
||||||
|
|
||||||
void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
|
|
||||||
|
|
||||||
void registerGenericSource( @Nonnull GenericSource source );
|
|
||||||
|
|
||||||
void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
|
|
||||||
|
|
||||||
void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
|
|
||||||
|
|
||||||
int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
|
|
||||||
|
|
||||||
void registerMediaProvider( @Nonnull IMediaProvider provider );
|
|
||||||
|
|
||||||
void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
IPacketNetwork getWirelessNetwork();
|
|
||||||
|
|
||||||
void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.api;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.pocket.IPocketUpgrade;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NbtCompound;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Common functionality between {@link ITurtleUpgrade} and {@link IPocketUpgrade}.
|
|
||||||
*/
|
|
||||||
public interface IUpgradeBase
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem"
|
|
||||||
* or "my_mod:my_upgrade".
|
|
||||||
*
|
|
||||||
* You should use a unique resource domain to ensure this upgrade is uniquely identified.
|
|
||||||
* The upgrade will fail registration if an already used ID is specified.
|
|
||||||
*
|
|
||||||
* @return The unique ID for this upgrade.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Identifier getUpgradeID();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return an unlocalised string to describe this type of computer in item names.
|
|
||||||
*
|
|
||||||
* Examples of built-in adjectives are "Wireless", "Mining" and "Crafty".
|
|
||||||
*
|
|
||||||
* @return The localisation key for this upgrade's adjective.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String getUnlocalisedAdjective();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return an item stack representing the type of item that a computer must be crafted
|
|
||||||
* with to create a version which holds this upgrade. This item stack is also used
|
|
||||||
* to determine the upgrade given by {@code turtle.equipLeft()} or {@code pocket.equipBack()}
|
|
||||||
*
|
|
||||||
* This should be constant over a session (or at least a datapack reload). It is recommended
|
|
||||||
* that you cache the stack too, in order to prevent constructing it every time the method
|
|
||||||
* is called.
|
|
||||||
*
|
|
||||||
* @return The item stack to craft with, or {@link ItemStack#EMPTY} if it cannot be crafted.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
ItemStack getCraftingItem();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if an item is suitable for being used for this upgrade.
|
|
||||||
*
|
|
||||||
* When un-equipping an upgrade, we return {@link #getCraftingItem()} rather than
|
|
||||||
* the original stack. In order to prevent people losing items with enchantments (or
|
|
||||||
* repairing items with non-0 damage), we impose additional checks on the item.
|
|
||||||
*
|
|
||||||
* The default check requires that any non-capability NBT is exactly the same as the
|
|
||||||
* crafting item, but this may be relaxed for your upgrade.
|
|
||||||
*
|
|
||||||
* @param stack The stack to check. This is guaranteed to be non-empty and have the same item as
|
|
||||||
* {@link #getCraftingItem()}.
|
|
||||||
* @return If this stack may be used to equip this upgrade.
|
|
||||||
* @see net.minecraftforge.common.crafting.NBTIngredient#test(ItemStack) For the implementation of the default
|
|
||||||
* check.
|
|
||||||
*/
|
|
||||||
default boolean isItemSuitable( @Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
ItemStack crafting = getCraftingItem();
|
|
||||||
|
|
||||||
// A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
|
|
||||||
// null one.
|
|
||||||
NbtCompound shareTag = stack.getNbt();
|
|
||||||
NbtCompound craftingShareTag = crafting.getNbt();
|
|
||||||
if( shareTag == craftingShareTag ) return true;
|
|
||||||
if( shareTag == null ) return craftingShareTag.isEmpty();
|
|
||||||
if( craftingShareTag == null ) return shareTag.isEmpty();
|
|
||||||
return shareTag.equals( craftingShareTag );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.client;
|
|
||||||
|
|
||||||
import dan200.computercraft.fabric.mixin.AffineTransformationAccess;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.BakedModelManager;
|
|
||||||
import net.minecraft.client.util.ModelIdentifier;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.math.AffineTransformation;
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A model to render, combined with a transformation matrix to apply.
|
|
||||||
*/
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class TransformedModel
|
|
||||||
{
|
|
||||||
private final BakedModel model;
|
|
||||||
private final AffineTransformation matrix;
|
|
||||||
|
|
||||||
public TransformedModel( @Nonnull BakedModel model, @Nonnull AffineTransformation matrix )
|
|
||||||
{
|
|
||||||
this.model = Objects.requireNonNull( model );
|
|
||||||
this.matrix = Objects.requireNonNull( matrix );
|
|
||||||
}
|
|
||||||
|
|
||||||
public TransformedModel( @Nonnull BakedModel model )
|
|
||||||
{
|
|
||||||
this.model = Objects.requireNonNull( model );
|
|
||||||
matrix = AffineTransformation.identity();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TransformedModel of( @Nonnull ModelIdentifier location )
|
|
||||||
{
|
|
||||||
BakedModelManager modelManager = MinecraftClient.getInstance()
|
|
||||||
.getBakedModelManager();
|
|
||||||
return new TransformedModel( modelManager.getModel( location ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TransformedModel of( @Nonnull ItemStack item, @Nonnull AffineTransformation transform )
|
|
||||||
{
|
|
||||||
BakedModel model = MinecraftClient.getInstance()
|
|
||||||
.getItemRenderer()
|
|
||||||
.getModels()
|
|
||||||
.getModel( item );
|
|
||||||
return new TransformedModel( model, transform );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
public BakedModel getModel()
|
|
||||||
{
|
|
||||||
return model;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
public AffineTransformation getMatrix()
|
|
||||||
{
|
|
||||||
return matrix;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void push( MatrixStack matrixStack )
|
|
||||||
{
|
|
||||||
matrixStack.push();
|
|
||||||
|
|
||||||
AffineTransformationAccess access = (AffineTransformationAccess) (Object) matrix;
|
|
||||||
if( access.getTranslation() != null )
|
|
||||||
{
|
|
||||||
matrixStack.translate( access.getTranslation().getX(), access.getTranslation().getY(), access.getTranslation().getZ() );
|
|
||||||
}
|
|
||||||
|
|
||||||
matrixStack.multiply( matrix.getRotation2() );
|
|
||||||
|
|
||||||
if( access.getScale() != null )
|
|
||||||
{
|
|
||||||
matrixStack.scale( access.getScale().getX(), access.getScale().getY(), access.getScale().getZ() );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( access.getRotation1() != null )
|
|
||||||
{
|
|
||||||
matrixStack.multiply( access.getRotation1() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.filesystem;
|
|
||||||
|
|
||||||
import java.nio.file.attribute.BasicFileAttributes;
|
|
||||||
import java.nio.file.attribute.FileTime;
|
|
||||||
import java.time.Instant;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple version of {@link BasicFileAttributes}, which provides what information a {@link IMount} already exposes.
|
|
||||||
*/
|
|
||||||
final class FileAttributes implements BasicFileAttributes
|
|
||||||
{
|
|
||||||
private static final FileTime EPOCH = FileTime.from( Instant.EPOCH );
|
|
||||||
|
|
||||||
private final boolean isDirectory;
|
|
||||||
private final long size;
|
|
||||||
|
|
||||||
FileAttributes( boolean isDirectory, long size )
|
|
||||||
{
|
|
||||||
this.isDirectory = isDirectory;
|
|
||||||
this.size = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public FileTime lastModifiedTime()
|
|
||||||
{
|
|
||||||
return EPOCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public FileTime lastAccessTime()
|
|
||||||
{
|
|
||||||
return EPOCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public FileTime creationTime()
|
|
||||||
{
|
|
||||||
return EPOCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isRegularFile()
|
|
||||||
{
|
|
||||||
return !isDirectory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isDirectory()
|
|
||||||
{
|
|
||||||
return isDirectory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSymbolicLink()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isOther()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long size()
|
|
||||||
{
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object fileKey()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.filesystem;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An {@link IOException} which occurred on a specific file.
|
|
||||||
*
|
|
||||||
* This may be thrown from a {@link IMount} or {@link IWritableMount} to give more information about a failure.
|
|
||||||
*/
|
|
||||||
public class FileOperationException extends IOException
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = -8809108200853029849L;
|
|
||||||
|
|
||||||
private final String filename;
|
|
||||||
|
|
||||||
public FileOperationException( @Nullable String filename, @Nonnull String message )
|
|
||||||
{
|
|
||||||
super( Objects.requireNonNull( message, "message cannot be null" ) );
|
|
||||||
this.filename = filename;
|
|
||||||
}
|
|
||||||
|
|
||||||
public FileOperationException( @Nonnull String message )
|
|
||||||
{
|
|
||||||
super( Objects.requireNonNull( message, "message cannot be null" ) );
|
|
||||||
filename = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
public String getFilename()
|
|
||||||
{
|
|
||||||
return filename;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.filesystem;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides a mount of the entire computer's file system.
|
|
||||||
*
|
|
||||||
* This exists for use by various APIs - one should not attempt to mount it.
|
|
||||||
*/
|
|
||||||
public interface IFileSystem extends IWritableMount
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Combine two paths together, reducing them into a normalised form.
|
|
||||||
*
|
|
||||||
* @param path The main path.
|
|
||||||
* @param child The path to append.
|
|
||||||
* @return The combined, normalised path.
|
|
||||||
*/
|
|
||||||
String combine( String path, String child );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy files from one location to another.
|
|
||||||
*
|
|
||||||
* @param from The location to copy from.
|
|
||||||
* @param to The location to copy to. This should not exist.
|
|
||||||
* @throws IOException If the copy failed.
|
|
||||||
*/
|
|
||||||
void copy( String from, String to ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Move files from one location to another.
|
|
||||||
*
|
|
||||||
* @param from The location to move from.
|
|
||||||
* @param to The location to move to. This should not exist.
|
|
||||||
* @throws IOException If the move failed.
|
|
||||||
*/
|
|
||||||
void move( String from, String to ) throws IOException;
|
|
||||||
}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.filesystem;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.channels.ReadableByteChannel;
|
|
||||||
import java.nio.file.attribute.BasicFileAttributes;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a read only part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)}.
|
|
||||||
*
|
|
||||||
* Ready made implementations of this interface can be created using {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or {@link
|
|
||||||
* ComputerCraftAPI#createResourceMount(String, String)}, or you're free to implement it yourselves!
|
|
||||||
*
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
* @see IComputerAccess#mount(String, IMount)
|
|
||||||
* @see IWritableMount
|
|
||||||
*/
|
|
||||||
public interface IMount
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Returns the file names of all the files in a directory.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
|
|
||||||
* @param contents A list of strings. Add all the file names to this list.
|
|
||||||
* @throws IOException If the file was not a directory, or could not be listed.
|
|
||||||
*/
|
|
||||||
void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a file with a given path, and returns an {@link ReadableByteChannel} representing its contents.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
|
|
||||||
* @return A channel representing the contents of the file. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to
|
|
||||||
* seek to arbitrary positions when using binary mode.
|
|
||||||
* @throws IOException If the file does not exist, or could not be opened.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
ReadableByteChannel openForRead( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get attributes about the given file.
|
|
||||||
*
|
|
||||||
* @param path The path to query.
|
|
||||||
* @return File attributes for the given file.
|
|
||||||
* @throws IOException If the file does not exist, or attributes could not be fetched.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
|
|
||||||
{
|
|
||||||
if( !exists( path ) )
|
|
||||||
{
|
|
||||||
throw new FileOperationException( path, "No such file" );
|
|
||||||
}
|
|
||||||
return new FileAttributes( isDirectory( path ), getSize( path ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether a file with a given path exists or not.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram"
|
|
||||||
* @return If the file exists.
|
|
||||||
* @throws IOException If an error occurs when checking the existence of the file.
|
|
||||||
*/
|
|
||||||
boolean exists( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether a file with a given path is a directory or not.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
|
|
||||||
* @return If the file exists and is a directory
|
|
||||||
* @throws IOException If an error occurs when checking whether the file is a directory.
|
|
||||||
*/
|
|
||||||
boolean isDirectory( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the size of a file with a given path, in bytes.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
|
|
||||||
* @return The size of the file, in bytes.
|
|
||||||
* @throws IOException If the file does not exist, or its size could not be determined.
|
|
||||||
*/
|
|
||||||
long getSize( @Nonnull String path ) throws IOException;
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.filesystem;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.nio.channels.WritableByteChannel;
|
|
||||||
import java.util.OptionalLong;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)} or {@link
|
|
||||||
* IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
|
|
||||||
*
|
|
||||||
* Ready made implementations of this interface can be created using {@link ComputerCraftAPI#createSaveDirMount(World, String, long)}, or you're free to
|
|
||||||
* implement it yourselves!
|
|
||||||
*
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see IComputerAccess#mount(String, IMount)
|
|
||||||
* @see IComputerAccess#mountWritable(String, IWritableMount)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
public interface IWritableMount extends IMount
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Creates a directory at a given path inside the virtual file system.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/mynewprograms".
|
|
||||||
* @throws IOException If the directory already exists or could not be created.
|
|
||||||
*/
|
|
||||||
void makeDirectory( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes a directory at a given path inside the virtual file system.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myoldprograms".
|
|
||||||
* @throws IOException If the file does not exist or could not be deleted.
|
|
||||||
*/
|
|
||||||
void delete( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a file with a given path, and returns an {@link OutputStream} for writing to it.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
|
|
||||||
* @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
|
|
||||||
* positions when using binary mode.
|
|
||||||
* @throws IOException If the file could not be opened for writing.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
WritableByteChannel openForWrite( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a file with a given path, and returns an {@link OutputStream} for appending to it.
|
|
||||||
*
|
|
||||||
* @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
|
|
||||||
* @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
|
|
||||||
* positions when using binary mode.
|
|
||||||
* @throws IOException If the file could not be opened for writing.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
WritableByteChannel openForAppend( @Nonnull String path ) throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the amount of free space on the mount, in bytes. You should decrease this value as the user writes to the mount, and write operations should fail
|
|
||||||
* once it reaches zero.
|
|
||||||
*
|
|
||||||
* @return The amount of free space, in bytes.
|
|
||||||
* @throws IOException If the remaining space could not be computed.
|
|
||||||
*/
|
|
||||||
long getRemainingSpace() throws IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the capacity of this mount. This should be equal to the size of all files/directories on this mount, minus the {@link #getRemainingSpace()}.
|
|
||||||
*
|
|
||||||
* @return The capacity of this mount, in bytes.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default OptionalLong getCapacity()
|
|
||||||
{
|
|
||||||
return OptionalLong.empty();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheralProvider;
|
|
||||||
import dan200.computercraft.core.asm.LuaMethod;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A generic source of {@link LuaMethod} functions.
|
|
||||||
*
|
|
||||||
* Unlike normal objects ({@link IDynamicLuaObject} or {@link IPeripheral}), methods do not target this object but
|
|
||||||
* instead are defined as {@code static} and accept their target as the first parameter. This allows you to inject
|
|
||||||
* methods onto objects you do not own, as well as declaring methods for a specific "trait" (for instance, a
|
|
||||||
* {@link Capability}).
|
|
||||||
*
|
|
||||||
* Currently the "generic peripheral" system is incompatible with normal peripherals. Normal {@link IPeripheralProvider}
|
|
||||||
* or {@link IPeripheral} implementations take priority. Tile entities which use this system are given a peripheral name
|
|
||||||
* determined by their id, rather than any peripheral provider. This will hopefully change in the future, once a suitable
|
|
||||||
* design has been established.
|
|
||||||
*
|
|
||||||
* For example, the main CC: Tweaked mod defines a generic source for inventories, which works on {@link IItemHandler}s:
|
|
||||||
*
|
|
||||||
* <pre>{@code
|
|
||||||
* public class InventoryMethods implements GenericSource {
|
|
||||||
* \@LuaFunction( mainThread = true )
|
|
||||||
* public static int size(IItemHandler inventory) {
|
|
||||||
* return inventory.getSlots();
|
|
||||||
* }
|
|
||||||
*
|
|
||||||
* // ...
|
|
||||||
* }
|
|
||||||
* }</pre>
|
|
||||||
*
|
|
||||||
* @see ComputerCraftAPI#registerGenericSource(GenericSource)
|
|
||||||
* @see ComputerCraftAPI#registerGenericCapability(Capability) New capabilities (those not built into Forge) must be
|
|
||||||
* explicitly given to the generic peripheral system, as there is no way to enumerate all capabilities.
|
|
||||||
*/
|
|
||||||
public interface GenericSource
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* A unique identifier for this generic source.
|
|
||||||
*
|
|
||||||
* This is currently unused, but may be used in the future to allow disabling specific sources. It is recommended
|
|
||||||
* to return an identifier using your mod's ID.
|
|
||||||
*
|
|
||||||
* @return This source's identifier.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Identifier id();
|
|
||||||
}
|
|
||||||
@@ -1,461 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static dan200.computercraft.api.lua.LuaValues.checkFinite;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The arguments passed to a function.
|
|
||||||
*/
|
|
||||||
public interface IArguments
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Drop a number of arguments. The returned arguments instance will access arguments at position {@code i + count}, rather than {@code i}. However,
|
|
||||||
* errors will still use the given argument index.
|
|
||||||
*
|
|
||||||
* @param count The number of arguments to drop.
|
|
||||||
* @return The new {@link IArguments} instance.
|
|
||||||
*/
|
|
||||||
IArguments drop( int count );
|
|
||||||
|
|
||||||
default Object[] getAll()
|
|
||||||
{
|
|
||||||
Object[] result = new Object[count()];
|
|
||||||
for( int i = 0; i < result.length; i++ )
|
|
||||||
{
|
|
||||||
result[i] = get( i );
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the number of arguments passed to this function.
|
|
||||||
*
|
|
||||||
* @return The number of passed arguments.
|
|
||||||
*/
|
|
||||||
int count();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the argument at the specific index. The returned value must obey the following conversion rules:
|
|
||||||
*
|
|
||||||
* <ul>
|
|
||||||
* <li>Lua values of type "string" will be represented by a {@link String}.</li>
|
|
||||||
* <li>Lua values of type "number" will be represented by a {@link Number}.</li>
|
|
||||||
* <li>Lua values of type "boolean" will be represented by a {@link Boolean}.</li>
|
|
||||||
* <li>Lua values of type "table" will be represented by a {@link Map}.</li>
|
|
||||||
* <li>Lua values of any other type will be represented by a {@code null} value.</li>
|
|
||||||
* </ul>
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@code null} if not present.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
Object get( int index );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as an integer.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not an integer.
|
|
||||||
*/
|
|
||||||
default int getInt( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
return (int) getLong( index );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a long.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a long.
|
|
||||||
*/
|
|
||||||
default long getLong( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( !(value instanceof Number) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "number", value );
|
|
||||||
}
|
|
||||||
return LuaValues.checkFiniteNum( index, (Number) value )
|
|
||||||
.longValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a finite number (not infinite or NaN).
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not finite.
|
|
||||||
*/
|
|
||||||
default double getFiniteDouble( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
return checkFinite( index, getDouble( index ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a double.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
* @see #getFiniteDouble(int) if you require this to be finite (i.e. not infinite or NaN).
|
|
||||||
*/
|
|
||||||
default double getDouble( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( !(value instanceof Number) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "number", value );
|
|
||||||
}
|
|
||||||
return ((Number) value).doubleValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a boolean.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a boolean.
|
|
||||||
*/
|
|
||||||
default boolean getBoolean( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( !(value instanceof Boolean) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "boolean", value );
|
|
||||||
}
|
|
||||||
return (Boolean) value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string argument as a byte array.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value. This is a <em>read only</em> buffer.
|
|
||||||
* @throws LuaException If the value is not a string.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default ByteBuffer getBytes( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
return LuaValues.encode( getString( index ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a string.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a string.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default String getString( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( !(value instanceof String) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "string", value );
|
|
||||||
}
|
|
||||||
return (String) value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string argument as an enum value.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param klass The type of enum to parse.
|
|
||||||
* @param <T> The type of enum to parse.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a string or not a valid option for this enum.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default <T extends Enum<T>> T getEnum( int index, Class<T> klass ) throws LuaException
|
|
||||||
{
|
|
||||||
return LuaValues.checkEnum( index, klass, getString( index ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a table.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a table.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default Map<?, ?> getTable( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( !(value instanceof Map) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "table", value );
|
|
||||||
}
|
|
||||||
return (Map<?, ?>) value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string argument as a byte array.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present. This is a <em>read only</em> buffer.
|
|
||||||
* @throws LuaException If the value is not a string.
|
|
||||||
*/
|
|
||||||
default Optional<ByteBuffer> optBytes( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
return optString( index ).map( LuaValues::encode );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a string.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a string.
|
|
||||||
*/
|
|
||||||
default Optional<String> optString( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
if( !(value instanceof String) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "string", value );
|
|
||||||
}
|
|
||||||
return Optional.of( (String) value );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string argument as an enum value.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param klass The type of enum to parse.
|
|
||||||
* @param <T> The type of enum to parse.
|
|
||||||
* @return The argument's value.
|
|
||||||
* @throws LuaException If the value is not a string or not a valid option for this enum.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default <T extends Enum<T>> Optional<T> optEnum( int index, Class<T> klass ) throws LuaException
|
|
||||||
{
|
|
||||||
Optional<String> str = optString( index );
|
|
||||||
return str.isPresent() ? Optional.of( LuaValues.checkEnum( index, klass, str.get() ) ) : Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a double.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
default double optDouble( int index, double def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optDouble( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a double.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default Optional<Double> optDouble( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
if( !(value instanceof Number) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "number", value );
|
|
||||||
}
|
|
||||||
return Optional.of( ((Number) value).doubleValue() );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as an int.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
default int optInt( int index, int def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optInt( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as an int.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default Optional<Integer> optInt( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
return optLong( index ).map( Long::intValue );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a long.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
default Optional<Long> optLong( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
if( !(value instanceof Number) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "number", value );
|
|
||||||
}
|
|
||||||
return Optional.of( LuaValues.checkFiniteNum( index, (Number) value )
|
|
||||||
.longValue() );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a long.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a number.
|
|
||||||
*/
|
|
||||||
default long optLong( int index, long def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optLong( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a finite number (not infinite or NaN).
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not finite.
|
|
||||||
*/
|
|
||||||
default double optFiniteDouble( int index, double def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optFiniteDouble( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a finite number (not infinite or NaN).
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not finite.
|
|
||||||
*/
|
|
||||||
default Optional<Double> optFiniteDouble( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Optional<Double> value = optDouble( index );
|
|
||||||
if( value.isPresent() )
|
|
||||||
{
|
|
||||||
LuaValues.checkFiniteNum( index, value.get() );
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a boolean.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a boolean.
|
|
||||||
*/
|
|
||||||
default boolean optBoolean( int index, boolean def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optBoolean( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a boolean.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a boolean.
|
|
||||||
*/
|
|
||||||
default Optional<Boolean> optBoolean( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
if( !(value instanceof Boolean) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "boolean", value );
|
|
||||||
}
|
|
||||||
return Optional.of( (Boolean) value );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a string.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a string.
|
|
||||||
*/
|
|
||||||
default String optString( int index, String def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optString( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a table.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @param def The default value, if this argument is not given.
|
|
||||||
* @return The argument's value, or {@code def} if none was provided.
|
|
||||||
* @throws LuaException If the value is not a table.
|
|
||||||
*/
|
|
||||||
default Map<?, ?> optTable( int index, Map<Object, Object> def ) throws LuaException
|
|
||||||
{
|
|
||||||
return optTable( index ).orElse( def );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an argument as a table.
|
|
||||||
*
|
|
||||||
* @param index The argument number.
|
|
||||||
* @return The argument's value, or {@link Optional#empty()} if not present.
|
|
||||||
* @throws LuaException If the value is not a table.
|
|
||||||
*/
|
|
||||||
default Optional<Map<?, ?>> optTable( int index ) throws LuaException
|
|
||||||
{
|
|
||||||
Object value = get( index );
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
if( !(value instanceof Map) )
|
|
||||||
{
|
|
||||||
throw LuaValues.badArgumentOf( index, "map", value );
|
|
||||||
}
|
|
||||||
return Optional.of( (Map<?, ?>) value );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.filesystem.IFileSystem;
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An interface passed to {@link ILuaAPIFactory} in order to provide additional information about a computer.
|
|
||||||
*/
|
|
||||||
public interface IComputerSystem extends IComputerAccess
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the file system for this computer.
|
|
||||||
*
|
|
||||||
* @return The computer's file system, or {@code null} if it is not initialised.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IFileSystem getFileSystem();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the label for this computer.
|
|
||||||
*
|
|
||||||
* @return This computer's label, or {@code null} if it is not set.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
String getLabel();
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IDynamicPeripheral;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An interface for representing custom objects returned by peripherals or other Lua objects.
|
|
||||||
*
|
|
||||||
* Generally, one does not need to implement this type - it is sufficient to return an object with some methods annotated with {@link LuaFunction}. {@link
|
|
||||||
* IDynamicLuaObject} is useful when you wish your available methods to change at runtime.
|
|
||||||
*/
|
|
||||||
public interface IDynamicLuaObject
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the names of the methods that this object implements. This should not change over the course of the object's lifetime.
|
|
||||||
*
|
|
||||||
* @return The method names this object provides.
|
|
||||||
* @see IDynamicPeripheral#getMethodNames()
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String[] getMethodNames();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when a user calls one of the methods that this object implements.
|
|
||||||
*
|
|
||||||
* @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
|
|
||||||
* @param method An integer identifying which method index from {@link #getMethodNames()} the computer wishes to call.
|
|
||||||
* @param arguments The arguments for this method.
|
|
||||||
* @return The result of this function. Either an immediate value ({@link MethodResult#of(Object...)} or an instruction to yield.
|
|
||||||
* @throws LuaException If the function threw an exception.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
MethodResult callMethod( @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a Lua object which is stored as a global variable on computer startup. This must either provide {@link LuaFunction} annotated functions or
|
|
||||||
* implement {@link IDynamicLuaObject}.
|
|
||||||
*
|
|
||||||
* Before implementing this interface, consider alternative methods of providing methods. It is generally preferred to use peripherals to provide
|
|
||||||
* functionality to users.
|
|
||||||
*
|
|
||||||
* @see ILuaAPIFactory
|
|
||||||
* @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
|
|
||||||
*/
|
|
||||||
public interface ILuaAPI
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the globals this API will be assigned to. This will override any other global, so you should
|
|
||||||
*
|
|
||||||
* @return A list of globals this API will be assigned to.
|
|
||||||
*/
|
|
||||||
String[] getNames();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when the computer is turned on.
|
|
||||||
*
|
|
||||||
* One should only interact with the file system.
|
|
||||||
*/
|
|
||||||
default void startup()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called every time the computer is ticked. This can be used to process various.
|
|
||||||
*/
|
|
||||||
default void update()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when the computer is turned off or unloaded.
|
|
||||||
*
|
|
||||||
* This should reset the state of the object, disposing any remaining file handles, or other resources.
|
|
||||||
*/
|
|
||||||
default void shutdown()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct an {@link ILuaAPI} for a specific computer.
|
|
||||||
*
|
|
||||||
* @see ILuaAPI
|
|
||||||
* @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface ILuaAPIFactory
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Create a new API instance for a given computer.
|
|
||||||
*
|
|
||||||
* @param computer The computer this API is for.
|
|
||||||
* @return The created API, or {@code null} if one should not be injected.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
ILuaAPI create( @Nonnull IComputerSystem computer );
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A continuation which is called when this coroutine is resumed.
|
|
||||||
*
|
|
||||||
* @see MethodResult#yield(Object[], ILuaCallback)
|
|
||||||
*/
|
|
||||||
public interface ILuaCallback
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Resume this coroutine.
|
|
||||||
*
|
|
||||||
* @param args The result of resuming this coroutine. These will have the same form as described in {@link LuaFunction}.
|
|
||||||
* @return The result of this continuation. Either the result to return to the callee, or another yield.
|
|
||||||
* @throws LuaException On an error.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
MethodResult resume( Object[] args ) throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An interface passed to peripherals and {@link IDynamicLuaObject}s by computers or turtles, providing methods that allow the peripheral call to interface
|
|
||||||
* with the computer.
|
|
||||||
*/
|
|
||||||
public interface ILuaContext
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Queue a task to be executed on the main server thread at the beginning of next tick, but do not wait for it to complete. This should be used when you
|
|
||||||
* need to interact with the world in a thread-safe manner but do not care about the result or you wish to run asynchronously.
|
|
||||||
*
|
|
||||||
* When the task has finished, it will enqueue a {@code task_completed} event, which takes the task id, a success value and the return values, or an
|
|
||||||
* error message if it failed.
|
|
||||||
*
|
|
||||||
* @param task The task to execute on the main thread.
|
|
||||||
* @return The "id" of the task. This will be the first argument to the {@code task_completed} event.
|
|
||||||
* @throws LuaException If the task could not be queued.
|
|
||||||
* @see LuaFunction#mainThread() To run functions on the main thread and return their results synchronously.
|
|
||||||
*/
|
|
||||||
long issueMainThreadTask( @Nonnull ILuaTask task ) throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A function, which can be called from Lua. If you need to return a table of functions, it is recommended to use an object with {@link LuaFunction}
|
|
||||||
* methods, or implement {@link IDynamicLuaObject}.
|
|
||||||
*
|
|
||||||
* @see MethodResult#of(Object)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface ILuaFunction
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Call this function with a series of arguments. Note, this will <em>always</em> be called on the computer thread, and so its implementation must be
|
|
||||||
* thread-safe.
|
|
||||||
*
|
|
||||||
* @param arguments The arguments for this function
|
|
||||||
* @return The result of calling this function.
|
|
||||||
* @throws LuaException Upon Lua errors.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
MethodResult call( @Nonnull IArguments arguments ) throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
public interface ILuaObject
|
|
||||||
{
|
|
||||||
@Nonnull
|
|
||||||
String[] getMethodNames();
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
Object[] callMethod( @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException;
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A task which can be executed via {@link ILuaContext#issueMainThreadTask(ILuaTask)} This will be run on the main thread, at the beginning of the next
|
|
||||||
* tick.
|
|
||||||
*
|
|
||||||
* @see ILuaContext#issueMainThreadTask(ILuaTask)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface ILuaTask
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Execute this task.
|
|
||||||
*
|
|
||||||
* @return The arguments to add to the {@code task_completed} event.
|
|
||||||
* @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
|
|
||||||
* to throw appropriate errors if the wrong arguments are supplied to your method.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
Object[] execute() throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An exception representing an error in Lua, like that raised by the {@code error()} function.
|
|
||||||
*/
|
|
||||||
public class LuaException extends Exception
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = -6136063076818512651L;
|
|
||||||
private final boolean hasLevel;
|
|
||||||
private final int level;
|
|
||||||
|
|
||||||
public LuaException( @Nullable String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
hasLevel = false;
|
|
||||||
level = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LuaException( @Nullable String message, int level )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
hasLevel = true;
|
|
||||||
this.level = level;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether a level was explicitly specified when constructing. This is used to determine
|
|
||||||
*
|
|
||||||
* @return Whether this has an explicit level.
|
|
||||||
*/
|
|
||||||
public boolean hasLevel()
|
|
||||||
{
|
|
||||||
return hasLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The level this error is raised at. Level 1 is the function's caller, level 2 is that function's caller, and so on.
|
|
||||||
*
|
|
||||||
* @return The level to raise the error at.
|
|
||||||
*/
|
|
||||||
public int getLevel()
|
|
||||||
{
|
|
||||||
return level;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used to mark a Java function which is callable from Lua.
|
|
||||||
*
|
|
||||||
* Methods annotated with {@link LuaFunction} must be public final instance methods. They can have any number of parameters, but they must be of the
|
|
||||||
* following types:
|
|
||||||
*
|
|
||||||
* <ul>
|
|
||||||
* <li>{@link ILuaContext} (and {@link IComputerAccess} if on a {@link IPeripheral})</li>
|
|
||||||
* <li>{@link IArguments}: The arguments supplied to this function.</li>
|
|
||||||
* <li>
|
|
||||||
* Alternatively, one may specify the desired arguments as normal parameters and the argument parsing code will
|
|
||||||
* be generated automatically.
|
|
||||||
*
|
|
||||||
* Each parameter must be one of the given types supported by {@link IArguments} (for instance, {@link int} or
|
|
||||||
* {@link Map}). Optional values are supported by accepting a parameter of type {@link Optional}.
|
|
||||||
* </li>
|
|
||||||
* </ul>
|
|
||||||
*
|
|
||||||
* This function may return {@link MethodResult}. However, if you simply return a value (rather than having to yield),
|
|
||||||
* you may return {@code void}, a single value (either an object or a primitive like {@code int}) or array of objects.
|
|
||||||
* These will be treated the same as {@link MethodResult#of()}, {@link MethodResult#of(Object)} and
|
|
||||||
* {@link MethodResult#of(Object...)}.
|
|
||||||
*/
|
|
||||||
@Documented
|
|
||||||
@Retention( RetentionPolicy.RUNTIME )
|
|
||||||
@Target( ElementType.METHOD )
|
|
||||||
public @interface LuaFunction
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Explicitly specify the method names of this function. If not given, it uses the name of the annotated method.
|
|
||||||
*
|
|
||||||
* @return This function's name(s).
|
|
||||||
*/
|
|
||||||
String[] value() default {};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run this function on the main server thread. This should be specified for any method which interacts with Minecraft in a thread-unsafe manner.
|
|
||||||
*
|
|
||||||
* @return Whether this functi
|
|
||||||
* @see ILuaContext#issueMainThreadTask(ILuaTask)
|
|
||||||
*/
|
|
||||||
boolean mainThread() default false;
|
|
||||||
}
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Various utility functions for operating with Lua values.
|
|
||||||
*
|
|
||||||
* @see IArguments
|
|
||||||
*/
|
|
||||||
public final class LuaValues
|
|
||||||
{
|
|
||||||
private LuaValues()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Encode a Lua string into a read-only {@link ByteBuffer}.
|
|
||||||
*
|
|
||||||
* @param string The string to encode.
|
|
||||||
* @return The encoded string.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static ByteBuffer encode( @Nonnull String string )
|
|
||||||
{
|
|
||||||
byte[] chars = new byte[string.length()];
|
|
||||||
for( int i = 0; i < chars.length; i++ )
|
|
||||||
{
|
|
||||||
char c = string.charAt( i );
|
|
||||||
chars[i] = c < 256 ? (byte) c : 63;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ByteBuffer.wrap( chars )
|
|
||||||
.asReadOnlyBuffer();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a "bad argument" exception, from an expected type and the actual value provided.
|
|
||||||
*
|
|
||||||
* @param index The argument number, starting from 0.
|
|
||||||
* @param expected The expected type for this argument.
|
|
||||||
* @param actual The actual value provided for this argument.
|
|
||||||
* @return The constructed exception, which should be thrown immediately.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static LuaException badArgumentOf( int index, @Nonnull String expected, @Nullable Object actual )
|
|
||||||
{
|
|
||||||
return badArgument( index, expected, getType( actual ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a "bad argument" exception, from an expected and actual type.
|
|
||||||
*
|
|
||||||
* @param index The argument number, starting from 0.
|
|
||||||
* @param expected The expected type for this argument.
|
|
||||||
* @param actual The provided type for this argument.
|
|
||||||
* @return The constructed exception, which should be thrown immediately.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static LuaException badArgument( int index, @Nonnull String expected, @Nonnull String actual )
|
|
||||||
{
|
|
||||||
return new LuaException( "bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")" );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string representation of the given value's type.
|
|
||||||
*
|
|
||||||
* @param value The value whose type we are trying to compute.
|
|
||||||
* @return A string representation of the given value's type, in a similar format to that provided by Lua's {@code type} function.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static String getType( @Nullable Object value )
|
|
||||||
{
|
|
||||||
if( value == null )
|
|
||||||
{
|
|
||||||
return "nil";
|
|
||||||
}
|
|
||||||
if( value instanceof String )
|
|
||||||
{
|
|
||||||
return "string";
|
|
||||||
}
|
|
||||||
if( value instanceof Boolean )
|
|
||||||
{
|
|
||||||
return "boolean";
|
|
||||||
}
|
|
||||||
if( value instanceof Number )
|
|
||||||
{
|
|
||||||
return "number";
|
|
||||||
}
|
|
||||||
if( value instanceof Map )
|
|
||||||
{
|
|
||||||
return "table";
|
|
||||||
}
|
|
||||||
return "userdata";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure a numeric argument is finite (i.e. not infinite or {@link Double#NaN}.
|
|
||||||
*
|
|
||||||
* @param index The argument index to check.
|
|
||||||
* @param value The value to check.
|
|
||||||
* @return The input {@code value}.
|
|
||||||
* @throws LuaException If this is not a finite number.
|
|
||||||
*/
|
|
||||||
public static Number checkFiniteNum( int index, Number value ) throws LuaException
|
|
||||||
{
|
|
||||||
checkFinite( index, value.doubleValue() );
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure a numeric argument is finite (i.e. not infinite or {@link Double#NaN}.
|
|
||||||
*
|
|
||||||
* @param index The argument index to check.
|
|
||||||
* @param value The value to check.
|
|
||||||
* @return The input {@code value}.
|
|
||||||
* @throws LuaException If this is not a finite number.
|
|
||||||
*/
|
|
||||||
public static double checkFinite( int index, double value ) throws LuaException
|
|
||||||
{
|
|
||||||
if( !Double.isFinite( value ) )
|
|
||||||
{
|
|
||||||
throw badArgument( index, "number", getNumericType( value ) );
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a more detailed representation of this number's type. If this is finite, it will just return "number", otherwise it returns whether it is
|
|
||||||
* infinite or NaN.
|
|
||||||
*
|
|
||||||
* @param value The value to extract the type for.
|
|
||||||
* @return This value's numeric type.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static String getNumericType( double value )
|
|
||||||
{
|
|
||||||
if( Double.isNaN( value ) )
|
|
||||||
{
|
|
||||||
return "nan";
|
|
||||||
}
|
|
||||||
if( value == Double.POSITIVE_INFINITY )
|
|
||||||
{
|
|
||||||
return "inf";
|
|
||||||
}
|
|
||||||
if( value == Double.NEGATIVE_INFINITY )
|
|
||||||
{
|
|
||||||
return "-inf";
|
|
||||||
}
|
|
||||||
return "number";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure a string is a valid enum value.
|
|
||||||
*
|
|
||||||
* @param index The argument index to check.
|
|
||||||
* @param klass The class of the enum instance.
|
|
||||||
* @param value The value to extract.
|
|
||||||
* @param <T> The type of enum we are extracting.
|
|
||||||
* @return The parsed enum value.
|
|
||||||
* @throws LuaException If this is not a known enum value.
|
|
||||||
*/
|
|
||||||
public static <T extends Enum<T>> T checkEnum( int index, Class<T> klass, String value ) throws LuaException
|
|
||||||
{
|
|
||||||
for( T possibility : klass.getEnumConstants() )
|
|
||||||
{
|
|
||||||
if( possibility.name()
|
|
||||||
.equalsIgnoreCase( value ) )
|
|
||||||
{
|
|
||||||
return possibility;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new LuaException( "bad argument #" + (index + 1) + " (unknown option " + value + ")" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,177 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The result of invoking a Lua method.
|
|
||||||
*
|
|
||||||
* Method results either return a value immediately ({@link #of(Object...)} or yield control to the parent coroutine. When the current coroutine is resumed,
|
|
||||||
* we invoke the provided {@link ILuaCallback#resume(Object[])} callback.
|
|
||||||
*/
|
|
||||||
public final class MethodResult
|
|
||||||
{
|
|
||||||
private static final MethodResult empty = new MethodResult( null, null );
|
|
||||||
|
|
||||||
private final Object[] result;
|
|
||||||
private final ILuaCallback callback;
|
|
||||||
private final int adjust;
|
|
||||||
|
|
||||||
private MethodResult( Object[] arguments, ILuaCallback callback )
|
|
||||||
{
|
|
||||||
result = arguments;
|
|
||||||
this.callback = callback;
|
|
||||||
adjust = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
|
|
||||||
{
|
|
||||||
result = arguments;
|
|
||||||
this.callback = callback;
|
|
||||||
this.adjust = adjust;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return no values immediately.
|
|
||||||
*
|
|
||||||
* @return A method result which returns immediately with no values.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult of()
|
|
||||||
{
|
|
||||||
return empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a single value immediately.
|
|
||||||
*
|
|
||||||
* Integers, doubles, floats, strings, booleans, {@link Map}, {@link Collection}s, arrays and {@code null} will be converted to their corresponding Lua
|
|
||||||
* type. {@code byte[]} and {@link ByteBuffer} will be treated as binary strings. {@link ILuaFunction} will be treated as a function.
|
|
||||||
*
|
|
||||||
* In order to provide a custom object with methods, one may return a {@link IDynamicLuaObject}, or an arbitrary class with {@link LuaFunction}
|
|
||||||
* annotations. Anything else will be converted to {@code nil}.
|
|
||||||
*
|
|
||||||
* @param value The value to return to the calling Lua function.
|
|
||||||
* @return A method result which returns immediately with the given value.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult of( @Nullable Object value )
|
|
||||||
{
|
|
||||||
return new MethodResult( new Object[] { value }, null );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return any number of values immediately.
|
|
||||||
*
|
|
||||||
* @param values The values to return. See {@link #of(Object)} for acceptable values.
|
|
||||||
* @return A method result which returns immediately with the given values.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult of( @Nullable Object... values )
|
|
||||||
{
|
|
||||||
return values == null || values.length == 0 ? empty : new MethodResult( values, null );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wait for an event to occur on the computer, suspending the thread until it arises. This method is exactly equivalent to {@code os.pullEvent()} in
|
|
||||||
* lua.
|
|
||||||
*
|
|
||||||
* @param filter A specific event to wait for, or null to wait for any event.
|
|
||||||
* @param callback The callback to resume with the name of the event that occurred, and any event parameters.
|
|
||||||
* @return The method result which represents this yield.
|
|
||||||
* @see IComputerAccess#queueEvent(String, Object[])
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult pullEvent( @Nullable String filter, @Nonnull ILuaCallback callback )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( callback, "callback cannot be null" );
|
|
||||||
return new MethodResult( new Object[] { filter }, results -> {
|
|
||||||
if( results.length >= 1 && results[0].equals( "terminate" ) )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Terminated", 0 );
|
|
||||||
}
|
|
||||||
return callback.resume( results );
|
|
||||||
} );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The same as {@link #pullEvent(String, ILuaCallback)}, except "terminated" events are ignored. Only use this if you want to prevent program
|
|
||||||
* termination, which is not recommended. This method is exactly equivalent to {@code os.pullEventRaw()} in Lua.
|
|
||||||
*
|
|
||||||
* @param filter A specific event to wait for, or null to wait for any event.
|
|
||||||
* @param callback The callback to resume with the name of the event that occurred, and any event parameters.
|
|
||||||
* @return The method result which represents this yield.
|
|
||||||
* @see #pullEvent(String, ILuaCallback)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult pullEventRaw( @Nullable String filter, @Nonnull ILuaCallback callback )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( callback, "callback cannot be null" );
|
|
||||||
return new MethodResult( new Object[] { filter }, callback );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to {@code coroutine.yield()} in lua. Use
|
|
||||||
* {@code pullEvent()} if you wish to wait for events.
|
|
||||||
*
|
|
||||||
* @param arguments An object array containing the arguments to pass to coroutine.yield()
|
|
||||||
* @param callback The callback to resume with an array containing the return values from coroutine.yield()
|
|
||||||
* @return The method result which represents this yield.
|
|
||||||
* @see #pullEvent(String, ILuaCallback)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static MethodResult yield( @Nullable Object[] arguments, @Nonnull ILuaCallback callback )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( callback, "callback cannot be null" );
|
|
||||||
return new MethodResult( arguments, callback );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
public Object[] getResult()
|
|
||||||
{
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
public ILuaCallback getCallback()
|
|
||||||
{
|
|
||||||
return callback;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getErrorAdjust()
|
|
||||||
{
|
|
||||||
return adjust;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Increase the Lua error by a specific amount. One should never need to use this function - it largely exists for some CC internal code.
|
|
||||||
*
|
|
||||||
* @param adjust The amount to increase the level by.
|
|
||||||
* @return The new {@link MethodResult} with an adjusted error. This has no effect on immediate results.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public MethodResult adjustError( int adjust )
|
|
||||||
{
|
|
||||||
if( adjust < 0 )
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException( "cannot adjust by a negative amount" );
|
|
||||||
}
|
|
||||||
if( adjust == 0 || callback == null )
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
return new MethodResult( result, callback, this.adjust + adjust );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.lua;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An implementation of {@link IArguments} which wraps an array of {@link Object}.
|
|
||||||
*/
|
|
||||||
public final class ObjectArguments implements IArguments
|
|
||||||
{
|
|
||||||
private static final IArguments EMPTY = new ObjectArguments();
|
|
||||||
private final List<Object> args;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
@SuppressWarnings( "unused" )
|
|
||||||
public ObjectArguments( IArguments arguments )
|
|
||||||
{
|
|
||||||
throw new IllegalStateException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ObjectArguments( Object... args )
|
|
||||||
{
|
|
||||||
this.args = Arrays.asList( args );
|
|
||||||
}
|
|
||||||
|
|
||||||
public ObjectArguments( List<Object> args )
|
|
||||||
{
|
|
||||||
this.args = Objects.requireNonNull( args );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IArguments drop( int count )
|
|
||||||
{
|
|
||||||
if( count < 0 )
|
|
||||||
{
|
|
||||||
throw new IllegalStateException( "count cannot be negative" );
|
|
||||||
}
|
|
||||||
if( count == 0 )
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
if( count >= args.size() )
|
|
||||||
{
|
|
||||||
return EMPTY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new ObjectArguments( args.subList( count, args.size() ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object[] getAll()
|
|
||||||
{
|
|
||||||
return args.toArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int count()
|
|
||||||
{
|
|
||||||
return args.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public Object get( int index )
|
|
||||||
{
|
|
||||||
return index >= args.size() ? null : args.get( index );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.media;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.filesystem.IMount;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.sound.SoundEvent;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents an item that can be placed in a disk drive and used by a Computer.
|
|
||||||
*
|
|
||||||
* Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register a {@link IMediaProvider}.
|
|
||||||
*/
|
|
||||||
public interface IMedia
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get a string representing the label of this item. Will be called via {@code disk.getLabel()} in lua.
|
|
||||||
*
|
|
||||||
* @param stack The {@link ItemStack} to inspect.
|
|
||||||
* @return The label. ie: "Dan's Programs".
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
String getLabel( @Nonnull ItemStack stack );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set a string representing the label of this item. Will be called vi {@code disk.setLabel()} in lua.
|
|
||||||
*
|
|
||||||
* @param stack The {@link ItemStack} to modify.
|
|
||||||
* @param label The string to set the label to.
|
|
||||||
* @return true if the label was updated, false if the label may not be modified.
|
|
||||||
*/
|
|
||||||
default boolean setLabel( @Nonnull ItemStack stack, @Nullable String label )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If this disk represents an item with audio (like a record), get the readable name of the audio track. ie: "Jonathan Coulton - Still Alive"
|
|
||||||
*
|
|
||||||
* @param stack The {@link ItemStack} to modify.
|
|
||||||
* @return The name, or null if this item does not represent an item with audio.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default String getAudioTitle( @Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If this disk represents an item with audio (like a record), get the resource name of the audio track to play.
|
|
||||||
*
|
|
||||||
* @param stack The {@link ItemStack} to modify.
|
|
||||||
* @return The name, or null if this item does not represent an item with audio.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default SoundEvent getAudio( @Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If this disk represents an item with data (like a floppy disk), get a mount representing it's contents. This will be mounted onto the filesystem of
|
|
||||||
* the computer while the media is in the disk drive.
|
|
||||||
*
|
|
||||||
* @param stack The {@link ItemStack} to modify.
|
|
||||||
* @param world The world in which the item and disk drive reside.
|
|
||||||
* @return The mount, or null if this item does not represent an item with data. If the mount returned also implements {@link
|
|
||||||
* dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
|
|
||||||
* @see IMount
|
|
||||||
* @see dan200.computercraft.api.filesystem.IWritableMount
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default IMount createDataMount( @Nonnull ItemStack stack, @Nonnull World world )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.media;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This interface is used to provide {@link IMedia} implementations for {@link ItemStack}.
|
|
||||||
*
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface IMediaProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Produce an IMedia implementation from an ItemStack.
|
|
||||||
*
|
|
||||||
* @param stack The stack from which to extract the media information.
|
|
||||||
* @return An {@link IMedia} implementation, or {@code null} if the item is not something you wish to handle
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IMedia getMedia( @Nonnull ItemStack stack );
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A packet network represents a collection of devices which can send and receive packets.
|
|
||||||
*
|
|
||||||
* @see Packet
|
|
||||||
* @see IPacketReceiver
|
|
||||||
*/
|
|
||||||
public interface IPacketNetwork
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Add a receiver to the network.
|
|
||||||
*
|
|
||||||
* @param receiver The receiver to register to the network.
|
|
||||||
*/
|
|
||||||
void addReceiver( @Nonnull IPacketReceiver receiver );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove a receiver from the network.
|
|
||||||
*
|
|
||||||
* @param receiver The device to remove from the network.
|
|
||||||
*/
|
|
||||||
void removeReceiver( @Nonnull IPacketReceiver receiver );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether this network is wireless.
|
|
||||||
*
|
|
||||||
* @return Whether this network is wireless.
|
|
||||||
*/
|
|
||||||
boolean isWireless();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Submit a packet for transmitting across the network. This will route the packet through the network, sending it to all receivers within range (or any
|
|
||||||
* interdimensional ones).
|
|
||||||
*
|
|
||||||
* @param packet The packet to send.
|
|
||||||
* @param range The maximum distance this packet will be sent.
|
|
||||||
* @see #transmitInterdimensional(Packet)
|
|
||||||
* @see IPacketReceiver#receiveSameDimension(Packet, double)
|
|
||||||
*/
|
|
||||||
void transmitSameDimension( @Nonnull Packet packet, double range );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Submit a packet for transmitting across the network. This will route the packet through the network, sending it to all receivers across all
|
|
||||||
* dimensions.
|
|
||||||
*
|
|
||||||
* @param packet The packet to send.
|
|
||||||
* @see #transmitSameDimension(Packet, double)
|
|
||||||
* @see IPacketReceiver#receiveDifferentDimension(Packet)
|
|
||||||
*/
|
|
||||||
void transmitInterdimensional( @Nonnull Packet packet );
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network;
|
|
||||||
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object on an {@link IPacketNetwork}, capable of receiving packets.
|
|
||||||
*/
|
|
||||||
public interface IPacketReceiver
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the world in which this packet receiver exists.
|
|
||||||
*
|
|
||||||
* @return The receivers's world.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
World getWorld();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the position in the world at which this receiver exists.
|
|
||||||
*
|
|
||||||
* @return The receiver's position.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Vec3d getPosition();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the maximum distance this receiver can send and receive messages.
|
|
||||||
*
|
|
||||||
* When determining whether a receiver can receive a message, the largest distance of the packet and receiver is used - ensuring it is within range. If
|
|
||||||
* the packet or receiver is inter-dimensional, then the packet will always be received.
|
|
||||||
*
|
|
||||||
* @return The maximum distance this device can send and receive messages.
|
|
||||||
* @see #isInterdimensional()
|
|
||||||
* @see #receiveSameDimension(Packet packet, double)
|
|
||||||
* @see IPacketNetwork#transmitInterdimensional(Packet)
|
|
||||||
*/
|
|
||||||
double getRange();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether this receiver can receive packets from other dimensions.
|
|
||||||
*
|
|
||||||
* A device will receive an inter-dimensional packet if either it or the sending device is inter-dimensional.
|
|
||||||
*
|
|
||||||
* @return Whether this receiver receives packets from other dimensions.
|
|
||||||
* @see #getRange()
|
|
||||||
* @see #receiveDifferentDimension(Packet)
|
|
||||||
* @see IPacketNetwork#transmitInterdimensional(Packet)
|
|
||||||
*/
|
|
||||||
boolean isInterdimensional();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Receive a network packet from the same dimension.
|
|
||||||
*
|
|
||||||
* @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
|
|
||||||
* modem event.
|
|
||||||
* @param distance The distance this packet has travelled from the source.
|
|
||||||
* @see Packet
|
|
||||||
* @see #getRange()
|
|
||||||
* @see IPacketNetwork#transmitSameDimension(Packet, double)
|
|
||||||
* @see IPacketNetwork#transmitInterdimensional(Packet)
|
|
||||||
*/
|
|
||||||
void receiveSameDimension( @Nonnull Packet packet, double distance );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Receive a network packet from a different dimension.
|
|
||||||
*
|
|
||||||
* @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
|
|
||||||
* modem event.
|
|
||||||
* @see Packet
|
|
||||||
* @see IPacketNetwork#transmitInterdimensional(Packet)
|
|
||||||
* @see IPacketNetwork#transmitSameDimension(Packet, double)
|
|
||||||
* @see #isInterdimensional()
|
|
||||||
*/
|
|
||||||
void receiveDifferentDimension( @Nonnull Packet packet );
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network;
|
|
||||||
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object on a {@link IPacketNetwork}, capable of sending packets.
|
|
||||||
*/
|
|
||||||
public interface IPacketSender
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the world in which this packet sender exists.
|
|
||||||
*
|
|
||||||
* @return The sender's world.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
World getWorld();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the position in the world at which this sender exists.
|
|
||||||
*
|
|
||||||
* @return The sender's position.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Vec3d getPosition();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get some sort of identification string for this sender. This does not strictly need to be unique, but you should be able to extract some identifiable
|
|
||||||
* information from it.
|
|
||||||
*
|
|
||||||
* @return This device's id.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String getSenderID();
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a packet which may be sent across a {@link IPacketNetwork}.
|
|
||||||
*
|
|
||||||
* @see IPacketSender
|
|
||||||
* @see IPacketNetwork#transmitSameDimension(Packet, double)
|
|
||||||
* @see IPacketNetwork#transmitInterdimensional(Packet)
|
|
||||||
* @see IPacketReceiver#receiveDifferentDimension(Packet)
|
|
||||||
* @see IPacketReceiver#receiveSameDimension(Packet, double)
|
|
||||||
*/
|
|
||||||
public class Packet
|
|
||||||
{
|
|
||||||
private final int channel;
|
|
||||||
private final int replyChannel;
|
|
||||||
private final Object payload;
|
|
||||||
|
|
||||||
private final IPacketSender sender;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new packet, ready for transmitting across the network.
|
|
||||||
*
|
|
||||||
* @param channel The channel to send the packet along. Receiving devices should only process packets from on channels they are listening to.
|
|
||||||
* @param replyChannel The channel to reply on.
|
|
||||||
* @param payload The contents of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral
|
|
||||||
* call.
|
|
||||||
* @param sender The object which sent this packet.
|
|
||||||
*/
|
|
||||||
public Packet( int channel, int replyChannel, @Nullable Object payload, @Nonnull IPacketSender sender )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( sender, "sender cannot be null" );
|
|
||||||
|
|
||||||
this.channel = channel;
|
|
||||||
this.replyChannel = replyChannel;
|
|
||||||
this.payload = payload;
|
|
||||||
this.sender = sender;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the channel this packet is sent along. Receivers should generally only process packets from on channels they are listening to.
|
|
||||||
*
|
|
||||||
* @return This packet's channel.
|
|
||||||
*/
|
|
||||||
public int getChannel()
|
|
||||||
{
|
|
||||||
return channel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The channel to reply on. Objects which will reply should send it along this channel.
|
|
||||||
*
|
|
||||||
* @return This channel to reply on.
|
|
||||||
*/
|
|
||||||
public int getReplyChannel()
|
|
||||||
{
|
|
||||||
return replyChannel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The actual data of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral call.
|
|
||||||
*
|
|
||||||
* @return The packet's payload
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public Object getPayload()
|
|
||||||
{
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The object which sent this message.
|
|
||||||
*
|
|
||||||
* @return The sending object.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public IPacketSender getSender()
|
|
||||||
{
|
|
||||||
return sender;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode()
|
|
||||||
{
|
|
||||||
int result;
|
|
||||||
result = channel;
|
|
||||||
result = 31 * result + replyChannel;
|
|
||||||
result = 31 * result + (payload != null ? payload.hashCode() : 0);
|
|
||||||
result = 31 * result + sender.hashCode();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals( Object o )
|
|
||||||
{
|
|
||||||
if( this == o )
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if( o == null || getClass() != o.getClass() )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Packet packet = (Packet) o;
|
|
||||||
|
|
||||||
if( channel != packet.channel )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if( replyChannel != packet.replyChannel )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if( !Objects.equals( payload, packet.payload ) )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return sender.equals( packet.sender );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network.wired;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object which may be part of a wired network.
|
|
||||||
*
|
|
||||||
* Elements should construct a node using {@link ComputerCraftAPI#createWiredNodeForElement(IWiredElement)}. This acts as a proxy for all network objects.
|
|
||||||
* Whilst the node may change networks, an element's node should remain constant for its lifespan.
|
|
||||||
*
|
|
||||||
* Elements are generally tied to a block or tile entity in world. In such as case, one should provide the {@link IWiredElement} capability for the
|
|
||||||
* appropriate sides.
|
|
||||||
*/
|
|
||||||
public interface IWiredElement extends IWiredSender
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Called when objects on the network change. This may occur when network nodes are added or removed, or when peripherals change.
|
|
||||||
*
|
|
||||||
* @param change The change which occurred.
|
|
||||||
* @see IWiredNetworkChange
|
|
||||||
*/
|
|
||||||
default void networkChanged( @Nonnull IWiredNetworkChange change )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network.wired;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A wired network is composed of one of more {@link IWiredNode}s, a set of connections between them, and a series of peripherals.
|
|
||||||
*
|
|
||||||
* Networks from a connected graph. This means there is some path between all nodes on the network. Further more, if there is some path between two nodes
|
|
||||||
* then they must be on the same network. {@link IWiredNetwork} will automatically handle the merging and splitting of networks (and thus changing of
|
|
||||||
* available nodes and peripherals) as connections change.
|
|
||||||
*
|
|
||||||
* This does mean one can not rely on the network remaining consistent between subsequent operations. Consequently, it is generally preferred to use the
|
|
||||||
* methods provided by {@link IWiredNode}.
|
|
||||||
*
|
|
||||||
* @see IWiredNode#getNetwork()
|
|
||||||
*/
|
|
||||||
public interface IWiredNetwork
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Create a connection between two nodes.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread.
|
|
||||||
*
|
|
||||||
* @param left The first node to connect
|
|
||||||
* @param right The second node to connect
|
|
||||||
* @return {@code true} if a connection was created or {@code false} if the connection already exists.
|
|
||||||
* @throws IllegalStateException If neither node is on the network.
|
|
||||||
* @throws IllegalArgumentException If {@code left} and {@code right} are equal.
|
|
||||||
* @see IWiredNode#connectTo(IWiredNode)
|
|
||||||
* @see IWiredNetwork#connect(IWiredNode, IWiredNode)
|
|
||||||
*/
|
|
||||||
boolean connect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Destroy a connection between this node and another.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread.
|
|
||||||
*
|
|
||||||
* @param left The first node in the connection.
|
|
||||||
* @param right The second node in the connection.
|
|
||||||
* @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
|
|
||||||
* @throws IllegalArgumentException If either node is not on the network.
|
|
||||||
* @throws IllegalArgumentException If {@code left} and {@code right} are equal.
|
|
||||||
* @see IWiredNode#disconnectFrom(IWiredNode)
|
|
||||||
* @see IWiredNetwork#connect(IWiredNode, IWiredNode)
|
|
||||||
*/
|
|
||||||
boolean disconnect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sever all connections this node has, removing it from this network.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread. You should only call this on nodes that your network element owns.
|
|
||||||
*
|
|
||||||
* @param node The node to remove
|
|
||||||
* @return Whether this node was removed from the network. One cannot remove a node from a network where it is the only element.
|
|
||||||
* @throws IllegalArgumentException If the node is not in the network.
|
|
||||||
* @see IWiredNode#remove()
|
|
||||||
*/
|
|
||||||
boolean remove( @Nonnull IWiredNode node );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update the peripherals a node provides.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread. You should only call this on nodes that your network element owns.
|
|
||||||
*
|
|
||||||
* @param node The node to attach peripherals for.
|
|
||||||
* @param peripherals The new peripherals for this node.
|
|
||||||
* @throws IllegalArgumentException If the node is not in the network.
|
|
||||||
* @see IWiredNode#updatePeripherals(Map)
|
|
||||||
*/
|
|
||||||
void updatePeripherals( @Nonnull IWiredNode node, @Nonnull Map<String, IPeripheral> peripherals );
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network.wired;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a change to the objects on a wired network.
|
|
||||||
*
|
|
||||||
* @see IWiredElement#networkChanged(IWiredNetworkChange)
|
|
||||||
*/
|
|
||||||
public interface IWiredNetworkChange
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* A set of peripherals which have been removed. Note that there may be entries with the same name in the added and removed set, but with a different
|
|
||||||
* peripheral.
|
|
||||||
*
|
|
||||||
* @return The set of removed peripherals.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Map<String, IPeripheral> peripheralsRemoved();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A set of peripherals which have been added. Note that there may be entries with the same name in the added and removed set, but with a different
|
|
||||||
* peripheral.
|
|
||||||
*
|
|
||||||
* @return The set of added peripherals.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Map<String, IPeripheral> peripheralsAdded();
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network.wired;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.network.IPacketNetwork;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wired nodes act as a layer between {@link IWiredElement}s and {@link IWiredNetwork}s.
|
|
||||||
*
|
|
||||||
* Firstly, a node acts as a packet network, capable of sending and receiving modem messages to connected nodes. These methods may be safely used on any
|
|
||||||
* thread.
|
|
||||||
*
|
|
||||||
* When sending a packet, the system will attempt to find the shortest path between the two nodes based on their element's position. Note that packet
|
|
||||||
* senders and receivers can have different locations from their associated element: the distance between the two will be added to the total packet's
|
|
||||||
* distance.
|
|
||||||
*
|
|
||||||
* Wired nodes also provide several convenience methods for interacting with a wired network. These should only ever be used on the main server thread.
|
|
||||||
*/
|
|
||||||
public interface IWiredNode extends IPacketNetwork
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The associated element for this network node.
|
|
||||||
*
|
|
||||||
* @return This node's element.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
IWiredElement getElement();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a connection from this node to another.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread.
|
|
||||||
*
|
|
||||||
* @param node The other node to connect to.
|
|
||||||
* @return {@code true} if a connection was created or {@code false} if the connection already exists.
|
|
||||||
* @see IWiredNetwork#connect(IWiredNode, IWiredNode)
|
|
||||||
* @see IWiredNode#disconnectFrom(IWiredNode)
|
|
||||||
*/
|
|
||||||
default boolean connectTo( @Nonnull IWiredNode node )
|
|
||||||
{
|
|
||||||
return getNetwork().connect( this, node );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The network this node is currently connected to. Note that this may change after any network operation, so it should not be cached.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread.
|
|
||||||
*
|
|
||||||
* @return This node's network.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
IWiredNetwork getNetwork();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Destroy a connection between this node and another.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread.
|
|
||||||
*
|
|
||||||
* @param node The other node to disconnect from.
|
|
||||||
* @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
|
|
||||||
* @throws IllegalArgumentException If {@code node} is not on the same network.
|
|
||||||
* @see IWiredNetwork#disconnect(IWiredNode, IWiredNode)
|
|
||||||
* @see IWiredNode#connectTo(IWiredNode)
|
|
||||||
*/
|
|
||||||
default boolean disconnectFrom( @Nonnull IWiredNode node )
|
|
||||||
{
|
|
||||||
return getNetwork().disconnect( this, node );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sever all connections this node has, removing it from this network.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread. You should only call this on nodes that your network element owns.
|
|
||||||
*
|
|
||||||
* @return Whether this node was removed from the network. One cannot remove a node from a network where it is the only element.
|
|
||||||
* @throws IllegalArgumentException If the node is not in the network.
|
|
||||||
* @see IWiredNetwork#remove(IWiredNode)
|
|
||||||
*/
|
|
||||||
default boolean remove()
|
|
||||||
{
|
|
||||||
return getNetwork().remove( this );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mark this node's peripherals as having changed.
|
|
||||||
*
|
|
||||||
* This should only be used on the server thread. You should only call this on nodes that your network element owns.
|
|
||||||
*
|
|
||||||
* @param peripherals The new peripherals for this node.
|
|
||||||
* @see IWiredNetwork#updatePeripherals(IWiredNode, Map)
|
|
||||||
*/
|
|
||||||
default void updatePeripherals( @Nonnull Map<String, IPeripheral> peripherals )
|
|
||||||
{
|
|
||||||
getNetwork().updatePeripherals( this, peripherals );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.network.wired;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.network.IPacketSender;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An object on a {@link IWiredNetwork} capable of sending packets.
|
|
||||||
*
|
|
||||||
* Unlike a regular {@link IPacketSender}, this must be associated with the node you are attempting to to send the packet from.
|
|
||||||
*/
|
|
||||||
public interface IWiredSender extends IPacketSender
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The node in the network representing this object.
|
|
||||||
*
|
|
||||||
* This should be used as a proxy for the main network. One should send packets and register receivers through this object.
|
|
||||||
*
|
|
||||||
* @return The node for this element.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
IWiredNode getNode();
|
|
||||||
}
|
|
||||||
@@ -1,198 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.filesystem.IMount;
|
|
||||||
import dan200.computercraft.api.filesystem.IWritableMount;
|
|
||||||
import dan200.computercraft.api.lua.ILuaCallback;
|
|
||||||
import dan200.computercraft.api.lua.ILuaContext;
|
|
||||||
import dan200.computercraft.api.lua.ILuaTask;
|
|
||||||
import dan200.computercraft.api.lua.MethodResult;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The interface passed to peripherals by computers or turtles, providing methods that they can call. This should not be implemented by your classes. Do not
|
|
||||||
* interact with computers except via this interface.
|
|
||||||
*/
|
|
||||||
public interface IComputerAccess
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Mount a mount onto the computer's file system in a read only mode.
|
|
||||||
*
|
|
||||||
* @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
|
|
||||||
* @param mount The mount object to mount on the computer.
|
|
||||||
* @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
|
|
||||||
* Store this value if you wish to unmount the mount later.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
* @see #mount(String, IMount, String)
|
|
||||||
* @see #mountWritable(String, IWritableMount)
|
|
||||||
* @see #unmount(String)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default String mount( @Nonnull String desiredLocation, @Nonnull IMount mount )
|
|
||||||
{
|
|
||||||
return mount( desiredLocation, mount, getAttachmentName() );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mount a mount onto the computer's file system in a read only mode.
|
|
||||||
*
|
|
||||||
* @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
|
|
||||||
* @param mount The mount object to mount on the computer.
|
|
||||||
* @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
|
|
||||||
* @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
|
|
||||||
* Store this value if you wish to unmount the mount later.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
* @see #mount(String, IMount)
|
|
||||||
* @see #mountWritable(String, IWritableMount)
|
|
||||||
* @see #unmount(String)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
String mount( @Nonnull String desiredLocation, @Nonnull IMount mount, @Nonnull String driveName );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a string, unique to the computer, by which the computer refers to this peripheral. For directly attached peripherals this will be
|
|
||||||
* "left","right","front","back",etc, but for peripherals attached remotely it will be different. It is good practice to supply this string when raising
|
|
||||||
* events to the computer, so that the computer knows from which peripheral the event came.
|
|
||||||
*
|
|
||||||
* @return A string unique to the computer, but not globally.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String getAttachmentName();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mount a mount onto the computer's file system in a writable mode.
|
|
||||||
*
|
|
||||||
* @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
|
|
||||||
* @param mount The mount object to mount on the computer.
|
|
||||||
* @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
|
|
||||||
* this value if you wish to unmount the mount later.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
* @see #mount(String, IMount)
|
|
||||||
* @see #unmount(String)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount )
|
|
||||||
{
|
|
||||||
return mountWritable( desiredLocation, mount, getAttachmentName() );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mount a mount onto the computer's file system in a writable mode.
|
|
||||||
*
|
|
||||||
* @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
|
|
||||||
* @param mount The mount object to mount on the computer.
|
|
||||||
* @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
|
|
||||||
* @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
|
|
||||||
* this value if you wish to unmount the mount later.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see ComputerCraftAPI#createSaveDirMount(World, String, long)
|
|
||||||
* @see ComputerCraftAPI#createResourceMount(String, String)
|
|
||||||
* @see #mount(String, IMount)
|
|
||||||
* @see #unmount(String)
|
|
||||||
* @see IMount
|
|
||||||
*/
|
|
||||||
String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount, @Nonnull String driveName );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unmounts a directory previously mounted onto the computers file system by {@link #mount(String, IMount)} or {@link #mountWritable(String,
|
|
||||||
* IWritableMount)}.
|
|
||||||
*
|
|
||||||
* When a directory is unmounted, it will disappear from the computers file system, and the user will no longer be able to access it. All directories
|
|
||||||
* mounted by a mount or mountWritable are automatically unmounted when the peripheral is attached if they have not been explicitly unmounted.
|
|
||||||
*
|
|
||||||
* Note that you cannot unmount another peripheral's mounts.
|
|
||||||
*
|
|
||||||
* @param location The desired location in the computers file system of the directory to unmount. This must be the location of a directory
|
|
||||||
* previously mounted by {@link #mount(String, IMount)} or {@link #mountWritable(String, IWritableMount)}, as indicated by their return value.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @throws IllegalStateException If the mount does not exist, or was mounted by another peripheral.
|
|
||||||
* @see #mount(String, IMount)
|
|
||||||
* @see #mountWritable(String, IWritableMount)
|
|
||||||
*/
|
|
||||||
void unmount( @Nullable String location );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the numerical ID of this computer.
|
|
||||||
*
|
|
||||||
* This is the same number obtained by calling {@code os.getComputerID()} or running the "id" program from lua, and is guaranteed unique. This number
|
|
||||||
* will be positive.
|
|
||||||
*
|
|
||||||
* @return The identifier.
|
|
||||||
*/
|
|
||||||
int getID();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Causes an event to be raised on this computer, which the computer can respond to by calling {@code os.pullEvent()}. This can be used to notify the
|
|
||||||
* computer when things happen in the world or to this peripheral.
|
|
||||||
*
|
|
||||||
* @param event A string identifying the type of event that has occurred, this will be returned as the first value from {@code os.pullEvent()}. It
|
|
||||||
* is recommended that you you choose a name that is unique, and recognisable as originating from your peripheral. eg: If your peripheral type is
|
|
||||||
* "button", a suitable event would be "button_pressed".
|
|
||||||
* @param arguments In addition to a name, you may pass an array of extra arguments to the event, that will be supplied as extra return values to
|
|
||||||
* os.pullEvent(). Objects in the array will be converted to lua data types in the same fashion as the return values of IPeripheral.callMethod().
|
|
||||||
*
|
|
||||||
* You may supply {@code null} to indicate that no arguments are to be supplied.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see MethodResult#pullEvent(String, ILuaCallback)
|
|
||||||
*/
|
|
||||||
void queueEvent( @Nonnull String event, @Nullable Object... arguments );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a set of peripherals that this computer access can "see", along with their attachment name.
|
|
||||||
*
|
|
||||||
* This may include other peripherals on the wired network or peripherals on other sides of the computer.
|
|
||||||
*
|
|
||||||
* @return All reachable peripherals
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
* @see #getAttachmentName()
|
|
||||||
* @see #getAvailablePeripheral(String)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Map<String, IPeripheral> getAvailablePeripherals();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a reachable peripheral with the given attachment name. This is a equivalent to {@link #getAvailablePeripherals()}{@code .get(name)}, though may
|
|
||||||
* be more efficient.
|
|
||||||
*
|
|
||||||
* @param name The peripheral's attached name
|
|
||||||
* @return The reachable peripheral, or {@code null} if none can be found.
|
|
||||||
* @see #getAvailablePeripherals()
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IPeripheral getAvailablePeripheral( @Nonnull String name );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a {@link IWorkMonitor} for tasks your peripheral might execute on the main (server) thread.
|
|
||||||
*
|
|
||||||
* This should be used to ensure your peripheral integrates with ComputerCraft's monitoring and limiting of how much server time each computer consumes.
|
|
||||||
* You should not need to use this if you use {@link ILuaContext#issueMainThreadTask(ILuaTask)} - this is intended for mods with their own system for
|
|
||||||
* running work on the main thread.
|
|
||||||
*
|
|
||||||
* Please note that the returned implementation is <em>not</em> thread-safe, and should only be used from the main thread.
|
|
||||||
*
|
|
||||||
* @return The work monitor for the main thread, or {@code null} if this computer does not have one.
|
|
||||||
* @throws NotAttachedException If the peripheral has been detached.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
IWorkMonitor getMainThreadMonitor();
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.*;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A peripheral whose methods are not known at runtime.
|
|
||||||
*
|
|
||||||
* This behaves similarly to {@link IDynamicLuaObject}, though also accepting the current {@link IComputerAccess}. Generally one may use {@link LuaFunction}
|
|
||||||
* instead of implementing this interface.
|
|
||||||
*/
|
|
||||||
public interface IDynamicPeripheral extends IPeripheral
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Should return an array of strings that identify the methods that this peripheral exposes to Lua. This will be called once before each attachment, and
|
|
||||||
* should not change when called multiple times.
|
|
||||||
*
|
|
||||||
* @return An array of strings representing method names.
|
|
||||||
* @see #callMethod
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String[] getMethodNames();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is called when a lua program on an attached computer calls {@code peripheral.call()} with one of the methods exposed by {@link
|
|
||||||
* #getMethodNames()}.
|
|
||||||
*
|
|
||||||
* Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting with Minecraft objects.
|
|
||||||
*
|
|
||||||
* @param computer The interface to the computer that is making the call. Remember that multiple computers can be attached to a peripheral at once.
|
|
||||||
* @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
|
|
||||||
* @param method An integer identifying which of the methods from getMethodNames() the computercraft wishes to call. The integer indicates the index
|
|
||||||
* into the getMethodNames() table that corresponds to the string passed into peripheral.call()
|
|
||||||
* @param arguments The arguments for this method.
|
|
||||||
* @return A {@link MethodResult} containing the values to return or the action to perform.
|
|
||||||
* @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
|
|
||||||
* to throw appropriate errors if the wrong arguments are supplied to your method.
|
|
||||||
* @see #getMethodNames()
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
MethodResult callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.LuaFunction;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The interface that defines a peripheral.
|
|
||||||
*
|
|
||||||
* In order to expose a peripheral for your block or tile entity, you register a {@link IPeripheralProvider}. This <em>cannot</em> be implemented {@link
|
|
||||||
* IPeripheral} directly on the tile.
|
|
||||||
*
|
|
||||||
* Peripherals should provide a series of methods to the user, either using {@link LuaFunction} or by implementing {@link IDynamicPeripheral}.
|
|
||||||
*/
|
|
||||||
public interface IPeripheral
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Should return a string that uniquely identifies this type of peripheral. This can be queried from lua by calling {@code peripheral.getType()}
|
|
||||||
*
|
|
||||||
* @return A string identifying the type of peripheral.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
String getType();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is called when when a computer is attaching to the peripheral.
|
|
||||||
*
|
|
||||||
* This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a peripheral, when a turtle travels into
|
|
||||||
* a square next to a peripheral, or when a wired modem adjacent to this peripheral is does any of the above.
|
|
||||||
*
|
|
||||||
* Between calls to attach and {@link #detach}, the attached computer can make method calls on the peripheral using {@code peripheral.call()}. This
|
|
||||||
* method can be used to keep track of which computers are attached to the peripheral, or to take action when attachment occurs.
|
|
||||||
*
|
|
||||||
* Be aware that will be called from both the server thread and ComputerCraft Lua thread, and so must be thread-safe and reentrant.
|
|
||||||
*
|
|
||||||
* @param computer The interface to the computer that is being attached. Remember that multiple computers can be attached to a peripheral at once.
|
|
||||||
* @see #detach
|
|
||||||
*/
|
|
||||||
default void attach( @Nonnull IComputerAccess computer )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when a computer is detaching from the peripheral.
|
|
||||||
*
|
|
||||||
* This will occur when a computer shuts down, when the peripheral is removed while attached to computers, when a turtle moves away from a block
|
|
||||||
* attached to a peripheral, or when a wired modem adjacent to this peripheral is detached.
|
|
||||||
*
|
|
||||||
* This method can be used to keep track of which computers are attached to the peripheral, or to take action when detachment occurs.
|
|
||||||
*
|
|
||||||
* Be aware that this will be called from both the server and ComputerCraft Lua thread, and must be thread-safe and reentrant.
|
|
||||||
*
|
|
||||||
* @param computer The interface to the computer that is being detached. Remember that multiple computers can be attached to a peripheral at once.
|
|
||||||
* @see #attach
|
|
||||||
*/
|
|
||||||
default void detach( @Nonnull IComputerAccess computer )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the object that this peripheral provides methods for. This will generally be the tile entity or block, but may be an inventory, entity, etc...
|
|
||||||
*
|
|
||||||
* @return The object this peripheral targets
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default Object getTarget()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether this peripheral is equivalent to another one.
|
|
||||||
*
|
|
||||||
* The minimal example should at least check whether they are the same object. However, you may wish to check if they point to the same block or tile
|
|
||||||
* entity.
|
|
||||||
*
|
|
||||||
* @param other The peripheral to compare against. This may be {@code null}.
|
|
||||||
* @return Whether these peripherals are equivalent.
|
|
||||||
*/
|
|
||||||
boolean equals( @Nullable IPeripheral other );
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import net.minecraft.block.entity.BlockEntity;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This interface is used to create peripheral implementations for blocks.
|
|
||||||
*
|
|
||||||
* If you have a {@link BlockEntity} which acts as a peripheral, you may alternatively expose the {@link IPeripheral} capability.
|
|
||||||
*
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface IPeripheralProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Produce an peripheral implementation from a block location.
|
|
||||||
*
|
|
||||||
* @param world The world the block is in.
|
|
||||||
* @param pos The position the block is at.
|
|
||||||
* @param side The side to get the peripheral from.
|
|
||||||
* @return A peripheral, or {@link Optional#empty()} if there is not a peripheral here you'd like to handle.
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A {@link net.minecraft.block.entity.BlockEntity} which may act as a peripheral.
|
|
||||||
*
|
|
||||||
* If you need more complex capabilities (such as handling TEs not belonging to your mod), you should use {@link IPeripheralProvider}.
|
|
||||||
*/
|
|
||||||
public interface IPeripheralTile
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the peripheral on the given {@code side}.
|
|
||||||
*
|
|
||||||
* @param side The side to get the peripheral from.
|
|
||||||
* @return A peripheral, or {@code null} if there is not a peripheral here.
|
|
||||||
* @see IPeripheralProvider#getPeripheral(World, BlockPos, Direction)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IPeripheral getPeripheral( @Nonnull Direction side );
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Monitors "work" associated with a computer, keeping track of how much a computer has done, and ensuring every computer receives a fair share of any
|
|
||||||
* processing time.
|
|
||||||
*
|
|
||||||
* This is primarily intended for work done by peripherals on the main thread (such as on a tile entity's tick), but could be used for other purposes (such
|
|
||||||
* as complex computations done on another thread).
|
|
||||||
*
|
|
||||||
* Before running a task, one should call {@link #canWork()} to determine if the computer is currently allowed to execute work. If that returns true, you
|
|
||||||
* should execute the task and use {@link #trackWork(long, TimeUnit)} to inform the monitor how long that task took.
|
|
||||||
*
|
|
||||||
* Alternatively, use {@link #runWork(Runnable)} to run and keep track of work.
|
|
||||||
*
|
|
||||||
* @see IComputerAccess#getMainThreadMonitor()
|
|
||||||
*/
|
|
||||||
public interface IWorkMonitor
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* If the owning computer is currently allowed to execute work, and has ample time to do so.
|
|
||||||
*
|
|
||||||
* This is effectively a more restrictive form of {@link #canWork()}. One should use that in order to determine if you may do an initial piece of work,
|
|
||||||
* and shouldWork to determine if any additional task may be performed.
|
|
||||||
*
|
|
||||||
* @return If we should execute work right now.
|
|
||||||
*/
|
|
||||||
boolean shouldWork();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run a task if possible, and inform the monitor of how long it took.
|
|
||||||
*
|
|
||||||
* @param runnable The task to run.
|
|
||||||
* @return If the task was actually run (namely, {@link #canWork()} returned {@code true}).
|
|
||||||
*/
|
|
||||||
default boolean runWork( @Nonnull Runnable runnable )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( runnable, "runnable should not be null" );
|
|
||||||
if( !canWork() )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
long start = System.nanoTime();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
runnable.run();
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
trackWork( System.nanoTime() - start, TimeUnit.NANOSECONDS );
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If the owning computer is currently allowed to execute work.
|
|
||||||
*
|
|
||||||
* @return If we can execute work right now.
|
|
||||||
*/
|
|
||||||
boolean canWork();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inform the monitor how long some piece of work took to execute.
|
|
||||||
*
|
|
||||||
* @param time The time some task took to run
|
|
||||||
* @param unit The unit that {@code time} was measured in.
|
|
||||||
*/
|
|
||||||
void trackWork( long time, @Nonnull TimeUnit unit );
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.peripheral;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thrown when performing operations on {@link IComputerAccess} when the current peripheral is no longer attached to the computer.
|
|
||||||
*/
|
|
||||||
public class NotAttachedException extends IllegalStateException
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1221244785535553536L;
|
|
||||||
|
|
||||||
public NotAttachedException()
|
|
||||||
{
|
|
||||||
super( "You are not attached to this computer" );
|
|
||||||
}
|
|
||||||
|
|
||||||
public NotAttachedException( String s )
|
|
||||||
{
|
|
||||||
super( s );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.pocket;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemConvertible;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.Util;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A base class for {@link IPocketUpgrade}s.
|
|
||||||
*
|
|
||||||
* One does not have to use this, but it does provide a convenient template.
|
|
||||||
*/
|
|
||||||
public abstract class AbstractPocketUpgrade implements IPocketUpgrade
|
|
||||||
{
|
|
||||||
private final Identifier id;
|
|
||||||
private final String adjective;
|
|
||||||
private final ItemStack stack;
|
|
||||||
|
|
||||||
protected AbstractPocketUpgrade( Identifier id, ItemConvertible item )
|
|
||||||
{
|
|
||||||
this( id, Util.createTranslationKey( "upgrade", id ) + ".adjective", item );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected AbstractPocketUpgrade( Identifier id, String adjective, ItemConvertible item )
|
|
||||||
{
|
|
||||||
this.id = id;
|
|
||||||
this.adjective = adjective;
|
|
||||||
stack = new ItemStack( item );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected AbstractPocketUpgrade( Identifier id, String adjective, ItemStack stack )
|
|
||||||
{
|
|
||||||
this.id = id;
|
|
||||||
this.adjective = adjective;
|
|
||||||
this.stack = stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final Identifier getUpgradeID()
|
|
||||||
{
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final String getUnlocalisedAdjective()
|
|
||||||
{
|
|
||||||
return adjective;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final ItemStack getCraftingItem()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.pocket;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.nbt.NbtCompound;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrapper class for pocket computers.
|
|
||||||
*/
|
|
||||||
public interface IPocketAccess
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Gets the entity holding this item.
|
|
||||||
*
|
|
||||||
* This must be called on the server thread.
|
|
||||||
*
|
|
||||||
* @return The holding entity, or {@code null} if none exists.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
Entity getEntity();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the colour of this pocket computer as a RGB number.
|
|
||||||
*
|
|
||||||
* @return The colour this pocket computer is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
|
|
||||||
* @see #setColour(int)
|
|
||||||
*/
|
|
||||||
int getColour();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the colour of the pocket computer to a RGB number.
|
|
||||||
*
|
|
||||||
* @param colour The colour this pocket computer should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or
|
|
||||||
* -1 to reset to the default colour.
|
|
||||||
* @see #getColour()
|
|
||||||
*/
|
|
||||||
void setColour( int colour );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the colour of this pocket computer's light as a RGB number.
|
|
||||||
*
|
|
||||||
* @return The colour this light is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
|
|
||||||
* @see #setLight(int)
|
|
||||||
*/
|
|
||||||
int getLight();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the colour of the pocket computer's light to a RGB number.
|
|
||||||
*
|
|
||||||
* @param colour The colour this modem's light will be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1
|
|
||||||
* to reset to the default colour.
|
|
||||||
* @see #getLight()
|
|
||||||
*/
|
|
||||||
void setLight( int colour );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the upgrade-specific NBT.
|
|
||||||
*
|
|
||||||
* This is persisted between computer reboots and chunk loads.
|
|
||||||
*
|
|
||||||
* @return The upgrade's NBT.
|
|
||||||
* @see #updateUpgradeNBTData()
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
NbtCompound getUpgradeNBTData();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mark the upgrade-specific NBT as dirty.
|
|
||||||
*
|
|
||||||
* @see #getUpgradeNBTData()
|
|
||||||
*/
|
|
||||||
void updateUpgradeNBTData();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove the current peripheral and create a new one. You may wish to do this if the methods available change.
|
|
||||||
*/
|
|
||||||
void invalidatePeripheral();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a list of all upgrades for the pocket computer.
|
|
||||||
*
|
|
||||||
* @return A collection of all upgrade names.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Map<Identifier, IPeripheral> getUpgrades();
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.pocket;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.IUpgradeBase;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Additional peripherals for pocket computers.
|
|
||||||
*
|
|
||||||
* @see ComputerCraftAPI#registerPocketUpgrade(IPocketUpgrade)
|
|
||||||
*/
|
|
||||||
public interface IPocketUpgrade extends IUpgradeBase
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Creates a peripheral for the pocket computer.
|
|
||||||
*
|
|
||||||
* The peripheral created will be stored for the lifetime of the upgrade, will be passed an argument to {@link #update(IPocketAccess, IPeripheral)} and
|
|
||||||
* will be attached, detached and have methods called in the same manner as an ordinary peripheral.
|
|
||||||
*
|
|
||||||
* @param access The access object for the pocket item stack.
|
|
||||||
* @return The newly created peripheral.
|
|
||||||
* @see #update(IPocketAccess, IPeripheral)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IPeripheral createPeripheral( @Nonnull IPocketAccess access );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when the pocket computer item stack updates.
|
|
||||||
*
|
|
||||||
* @param access The access object for the pocket item stack.
|
|
||||||
* @param peripheral The peripheral for this upgrade.
|
|
||||||
* @see #createPeripheral(IPocketAccess)
|
|
||||||
*/
|
|
||||||
default void update( @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when the pocket computer is right clicked.
|
|
||||||
*
|
|
||||||
* @param world The world the computer is in.
|
|
||||||
* @param access The access object for the pocket item stack.
|
|
||||||
* @param peripheral The peripheral for this upgrade.
|
|
||||||
* @return {@code true} to stop the GUI from opening, otherwise false. You should always provide some code path which returns {@code false}, such as
|
|
||||||
* requiring the player to be sneaking - otherwise they will be unable to access the GUI.
|
|
||||||
* @see #createPeripheral(IPocketAccess)
|
|
||||||
*/
|
|
||||||
default boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.redstone;
|
|
||||||
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This interface is used to provide bundled redstone output for blocks.
|
|
||||||
*
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface IBundledRedstoneProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Produce an bundled redstone output from a block location.
|
|
||||||
*
|
|
||||||
* @param world The world this block is in.
|
|
||||||
* @param pos The position this block is at.
|
|
||||||
* @param side The side to extract the bundled redstone output from.
|
|
||||||
* @return A number in the range 0-65535 to indicate this block is providing output, or -1 if you do not wish to handle this block.
|
|
||||||
* @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
|
|
||||||
*/
|
|
||||||
int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemConvertible;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.Util;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A base class for {@link ITurtleUpgrade}s.
|
|
||||||
*
|
|
||||||
* One does not have to use this, but it does provide a convenient template.
|
|
||||||
*/
|
|
||||||
public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
|
|
||||||
{
|
|
||||||
private final Identifier id;
|
|
||||||
private final TurtleUpgradeType type;
|
|
||||||
private final String adjective;
|
|
||||||
private final ItemStack stack;
|
|
||||||
|
|
||||||
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemConvertible item )
|
|
||||||
{
|
|
||||||
this( id, type, adjective, new ItemStack( item ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemStack stack )
|
|
||||||
{
|
|
||||||
this.id = id;
|
|
||||||
this.type = type;
|
|
||||||
this.adjective = adjective;
|
|
||||||
this.stack = stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemConvertible item )
|
|
||||||
{
|
|
||||||
this( id, type, new ItemStack( item ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemStack stack )
|
|
||||||
{
|
|
||||||
this( id, type, Util.createTranslationKey( "upgrade", id ) + ".adjective", stack );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final Identifier getUpgradeID()
|
|
||||||
{
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final String getUnlocalisedAdjective()
|
|
||||||
{
|
|
||||||
return adjective;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final TurtleUpgradeType getType()
|
|
||||||
{
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public final ItemStack getCraftingItem()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,356 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.util.concurrent.Future;
|
|
||||||
import io.netty.util.concurrent.GenericFutureListener;
|
|
||||||
import net.minecraft.block.entity.CommandBlockBlockEntity;
|
|
||||||
import net.minecraft.block.entity.SignBlockEntity;
|
|
||||||
import net.minecraft.command.argument.EntityAnchorArgumentType;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.entity.damage.DamageSource;
|
|
||||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
|
||||||
import net.minecraft.entity.passive.HorseBaseEntity;
|
|
||||||
import net.minecraft.inventory.Inventory;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.network.*;
|
|
||||||
import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
|
|
||||||
import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
|
|
||||||
import net.minecraft.recipe.Recipe;
|
|
||||||
import net.minecraft.screen.NamedScreenHandlerFactory;
|
|
||||||
import net.minecraft.screen.ScreenHandler;
|
|
||||||
import net.minecraft.server.network.ServerPlayNetworkHandler;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
import net.minecraft.server.network.ServerPlayerInteractionManager;
|
|
||||||
import net.minecraft.server.world.ServerWorld;
|
|
||||||
import net.minecraft.sound.SoundCategory;
|
|
||||||
import net.minecraft.sound.SoundEvent;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Hand;
|
|
||||||
import net.minecraft.util.collection.DefaultedList;
|
|
||||||
import net.minecraft.util.math.ChunkPos;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.village.TradeOfferList;
|
|
||||||
import net.minecraft.world.GameMode;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import javax.crypto.Cipher;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.OptionalInt;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A wrapper for {@link ServerPlayerEntity} which denotes a "fake" player.
|
|
||||||
*
|
|
||||||
* Please note that this does not implement any of the traditional fake player behaviour. It simply exists to prevent me passing in normal players.
|
|
||||||
*/
|
|
||||||
public class FakePlayer extends ServerPlayerEntity
|
|
||||||
{
|
|
||||||
public FakePlayer( ServerWorld world, GameProfile gameProfile )
|
|
||||||
{
|
|
||||||
super( world.getServer(), world, gameProfile, new ServerPlayerInteractionManager( world ) );
|
|
||||||
networkHandler = new FakeNetHandler( this );
|
|
||||||
}
|
|
||||||
|
|
||||||
// region Direct networkHandler access
|
|
||||||
@Override
|
|
||||||
public void enterCombat()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void endCombat()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void tick()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void playerTick()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDeath( DamageSource damage )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Entity moveToWorld( ServerWorld destination )
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void wakeUp( boolean bl, boolean updateSleepingPlayers )
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean startRiding( Entity entity, boolean flag )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void stopRiding()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void openEditSignScreen( SignBlockEntity tile )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OptionalInt openHandledScreen( @Nullable NamedScreenHandlerFactory container )
|
|
||||||
{
|
|
||||||
return OptionalInt.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendTradeOffers( int id, TradeOfferList list, int level, int experience, boolean levelled, boolean refreshable )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void openHorseInventory( HorseBaseEntity horse, Inventory inventory )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void useBook( ItemStack stack, Hand hand )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void openCommandBlockScreen( CommandBlockBlockEntity block )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSlotUpdate( ScreenHandler container, int slot, ItemStack stack )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onHandlerRegistered( ScreenHandler container, DefaultedList<ItemStack> defaultedList )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPropertyUpdate( ScreenHandler container, int key, int value )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void closeHandledScreen()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateCursorStack()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int unlockRecipes( Collection<Recipe<?>> recipes )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Indirect
|
|
||||||
@Override
|
|
||||||
public int lockRecipes( Collection<Recipe<?>> recipes )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage( Text textComponent, boolean status )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void consumeItem()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void lookAt( EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void lookAtEntity( EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onStatusEffectApplied( StatusEffectInstance statusEffectInstance )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onStatusEffectUpgraded( StatusEffectInstance statusEffectInstance, boolean particles )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onStatusEffectRemoved( StatusEffectInstance statusEffectInstance )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void requestTeleport( double x, double y, double z )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void changeGameMode( GameMode gameMode )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage( Text message, MessageType type, UUID senderUuid )
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getIp()
|
|
||||||
{
|
|
||||||
return "[Fake Player]";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendResourcePackUrl( String url, String hash )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStoppedTracking( Entity entity )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setCameraEntity( Entity entity )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void teleport( ServerWorld serverWorld, double x, double y, double z, float pitch, float yaw )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendInitialChunkPackets( ChunkPos chunkPos, Packet<?> packet, Packet<?> packet2 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendUnloadChunkPacket( ChunkPos chunkPos )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void playSound( SoundEvent soundEvent, SoundCategory soundCategory, float volume, float pitch )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class FakeNetHandler extends ServerPlayNetworkHandler
|
|
||||||
{
|
|
||||||
FakeNetHandler( ServerPlayerEntity player )
|
|
||||||
{
|
|
||||||
super( player.server, new FakeConnection(), player );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disconnect( Text message )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onVehicleMove( VehicleMoveC2SPacket move )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRequestCommandCompletions( RequestCommandCompletionsC2SPacket packet )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendPacket( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class FakeConnection extends ClientConnection
|
|
||||||
{
|
|
||||||
FakeConnection()
|
|
||||||
{
|
|
||||||
super( NetworkSide.CLIENTBOUND );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void channelActive( ChannelHandlerContext active )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setState( NetworkState state )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void exceptionCaught( ChannelHandlerContext context, Throwable err )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void channelRead0( ChannelHandlerContext context, Packet<?> packet )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void send( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void tick()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disconnect( Text message )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setupEncryption( Cipher cipher, Cipher cipher2 )
|
|
||||||
{
|
|
||||||
super.setupEncryption( cipher, cipher2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void disableAutoRead()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setCompressionThreshold( int size )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import dan200.computercraft.api.lua.ILuaCallback;
|
|
||||||
import dan200.computercraft.api.lua.MethodResult;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import dan200.computercraft.shared.util.ItemStorage;
|
|
||||||
import net.minecraft.inventory.Inventory;
|
|
||||||
import net.minecraft.nbt.NbtCompound;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The interface passed to turtle by turtles, providing methods that they can call.
|
|
||||||
*
|
|
||||||
* This should not be implemented by your classes. Do not interact with turtles except via this interface and {@link ITurtleUpgrade}.
|
|
||||||
*/
|
|
||||||
public interface ITurtleAccess
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Returns the world in which the turtle resides.
|
|
||||||
*
|
|
||||||
* @return the world in which the turtle resides.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
World getWorld();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a vector containing the integer co-ordinates at which the turtle resides.
|
|
||||||
*
|
|
||||||
* @return a vector containing the integer co-ordinates at which the turtle resides.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
BlockPos getPosition();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Attempt to move this turtle to a new position.
|
|
||||||
*
|
|
||||||
* This will preserve the turtle's internal state, such as it's inventory, computer and upgrades. It should be used before playing a movement animation
|
|
||||||
* using {@link #playAnimation(TurtleAnimation)}.
|
|
||||||
*
|
|
||||||
* @param world The new world to move it to
|
|
||||||
* @param pos The new position to move it to.
|
|
||||||
* @return Whether the movement was successful. It may fail if the block was not loaded or the block placement was cancelled.
|
|
||||||
* @throws UnsupportedOperationException When attempting to teleport on the client side.
|
|
||||||
*/
|
|
||||||
boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a vector containing the floating point co-ordinates at which the turtle is rendered. This will shift when the turtle is moving.
|
|
||||||
*
|
|
||||||
* @param f The subframe fraction.
|
|
||||||
* @return A vector containing the floating point co-ordinates at which the turtle resides.
|
|
||||||
* @see #getVisualYaw(float)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Vec3d getVisualPosition( float f );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the yaw the turtle is facing when it is rendered.
|
|
||||||
*
|
|
||||||
* @param f The subframe fraction.
|
|
||||||
* @return The yaw the turtle is facing.
|
|
||||||
* @see #getVisualPosition(float)
|
|
||||||
*/
|
|
||||||
float getVisualYaw( float f );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the world direction the turtle is currently facing.
|
|
||||||
*
|
|
||||||
* @return The world direction the turtle is currently facing.
|
|
||||||
* @see #setDirection(Direction)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Direction getDirection();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to call {@link
|
|
||||||
* #playAnimation(TurtleAnimation)} to do so.
|
|
||||||
*
|
|
||||||
* @param dir The new direction to set. This should be on either the x or z axis (so north, south, east or west).
|
|
||||||
* @see #getDirection()
|
|
||||||
*/
|
|
||||||
void setDirection( @Nonnull Direction dir );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the currently selected slot in the turtle's inventory.
|
|
||||||
*
|
|
||||||
* @return An integer representing the current slot.
|
|
||||||
* @see #getInventory()
|
|
||||||
* @see #setSelectedSlot(int)
|
|
||||||
*/
|
|
||||||
int getSelectedSlot();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the currently selected slot in the turtle's inventory.
|
|
||||||
*
|
|
||||||
* @param slot The slot to set. This must be greater or equal to 0 and less than the inventory size. Otherwise no action will be taken.
|
|
||||||
* @throws UnsupportedOperationException When attempting to change the slot on the client side.
|
|
||||||
* @see #getInventory()
|
|
||||||
* @see #getSelectedSlot()
|
|
||||||
*/
|
|
||||||
void setSelectedSlot( int slot );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the colour of this turtle as a RGB number.
|
|
||||||
*
|
|
||||||
* @return The colour this turtle is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
|
|
||||||
* @see #setColour(int)
|
|
||||||
*/
|
|
||||||
int getColour();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the colour of the turtle to a RGB number.
|
|
||||||
*
|
|
||||||
* @param colour The colour this turtle should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 to
|
|
||||||
* reset to the default colour.
|
|
||||||
* @see #getColour()
|
|
||||||
*/
|
|
||||||
void setColour( int colour );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the player who owns this turtle, namely whoever placed it.
|
|
||||||
*
|
|
||||||
* @return This turtle's owner.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
GameProfile getOwningPlayer();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether this turtle will require fuel when performing actions.
|
|
||||||
*
|
|
||||||
* @return Whether this turtle needs fuel.
|
|
||||||
* @see #getFuelLevel()
|
|
||||||
* @see #setFuelLevel(int)
|
|
||||||
*/
|
|
||||||
boolean isFuelNeeded();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the current fuel level of this turtle.
|
|
||||||
*
|
|
||||||
* @return The turtle's current fuel level.
|
|
||||||
* @see #isFuelNeeded()
|
|
||||||
* @see #setFuelLevel(int)
|
|
||||||
*/
|
|
||||||
int getFuelLevel();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the fuel level to a new value. It is generally preferred to use {@link #consumeFuel(int)}} or {@link #addFuel(int)} instead.
|
|
||||||
*
|
|
||||||
* @param fuel The new amount of fuel. This must be between 0 and the fuel limit.
|
|
||||||
* @see #getFuelLevel()
|
|
||||||
* @see #getFuelLimit()
|
|
||||||
* @see #addFuel(int)
|
|
||||||
* @see #consumeFuel(int)
|
|
||||||
*/
|
|
||||||
void setFuelLevel( int fuel );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the maximum amount of fuel a turtle can hold.
|
|
||||||
*
|
|
||||||
* @return The turtle's fuel limit.
|
|
||||||
*/
|
|
||||||
int getFuelLimit();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes some fuel from the turtles fuel supply. Negative numbers can be passed in to INCREASE the fuel level of the turtle.
|
|
||||||
*
|
|
||||||
* @param fuel The amount of fuel to consume.
|
|
||||||
* @return Whether the turtle was able to consume the amount of fuel specified. Will return false if you supply a number greater than the current fuel
|
|
||||||
* level of the turtle. No fuel will be consumed if {@code false} is returned.
|
|
||||||
* @throws UnsupportedOperationException When attempting to consume fuel on the client side.
|
|
||||||
*/
|
|
||||||
boolean consumeFuel( int fuel );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Increase the turtle's fuel level by the given amount.
|
|
||||||
*
|
|
||||||
* @param fuel The amount to refuel with.
|
|
||||||
* @throws UnsupportedOperationException When attempting to refuel on the client side.
|
|
||||||
*/
|
|
||||||
void addFuel( int fuel );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a custom command to the turtles command queue. Unlike peripheral methods, these custom commands will be executed on the main thread, so are
|
|
||||||
* guaranteed to be able to access Minecraft objects safely, and will be queued up with the turtles standard movement and tool commands. An issued
|
|
||||||
* command will return an unique integer, which will be supplied as a parameter to a "turtle_response" event issued to the turtle after the command has
|
|
||||||
* completed. Look at the lua source code for "rom/apis/turtle" for how to build a lua wrapper around this functionality.
|
|
||||||
*
|
|
||||||
* @param command An object which will execute the custom command when its point in the queue is reached
|
|
||||||
* @return The objects the command returned when executed. you should probably return these to the player unchanged if called from a peripheral method.
|
|
||||||
* @throws UnsupportedOperationException When attempting to execute a command on the client side.
|
|
||||||
* @see ITurtleCommand
|
|
||||||
* @see MethodResult#pullEvent(String, ILuaCallback)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
MethodResult executeCommand( @Nonnull ITurtleCommand command );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start playing a specific animation. This will prevent other turtle commands from executing until it is finished.
|
|
||||||
*
|
|
||||||
* @param animation The animation to play.
|
|
||||||
* @throws UnsupportedOperationException When attempting to execute play an animation on the client side.
|
|
||||||
* @see TurtleAnimation
|
|
||||||
*/
|
|
||||||
void playAnimation( @Nonnull TurtleAnimation animation );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the turtle on the specified side of the turtle, if there is one.
|
|
||||||
*
|
|
||||||
* @param side The side to get the upgrade from.
|
|
||||||
* @return The upgrade on the specified side of the turtle, if there is one.
|
|
||||||
* @see #setUpgrade(TurtleSide, ITurtleUpgrade)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
ITurtleUpgrade getUpgrade( @Nonnull TurtleSide side );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the upgrade for a given side, resetting peripherals and clearing upgrade specific data.
|
|
||||||
*
|
|
||||||
* @param side The side to set the upgrade on.
|
|
||||||
* @param upgrade The upgrade to set, may be {@code null} to clear.
|
|
||||||
* @see #getUpgrade(TurtleSide)
|
|
||||||
*/
|
|
||||||
void setUpgrade( @Nonnull TurtleSide side, @Nullable ITurtleUpgrade upgrade );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
|
|
||||||
*
|
|
||||||
* @param side The side to get the peripheral from.
|
|
||||||
* @return The peripheral created by the upgrade on the specified side of the turtle, {@code null} if none exists.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
IPeripheral getPeripheral( @Nonnull TurtleSide side );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an upgrade-specific NBT compound, which can be used to store arbitrary data.
|
|
||||||
*
|
|
||||||
* This will be persisted across turtle restarts and chunk loads, as well as being synced to the client. You must call {@link
|
|
||||||
* #updateUpgradeNBTData(TurtleSide)} after modifying it.
|
|
||||||
*
|
|
||||||
* @param side The side to get the upgrade data for.
|
|
||||||
* @return The upgrade-specific data.
|
|
||||||
* @see #updateUpgradeNBTData(TurtleSide)
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
NbtCompound getUpgradeNBTData( @Nullable TurtleSide side );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the client and persisted.
|
|
||||||
*
|
|
||||||
* @param side The side to mark dirty.
|
|
||||||
* @see #updateUpgradeNBTData(TurtleSide)
|
|
||||||
*/
|
|
||||||
void updateUpgradeNBTData( @Nonnull TurtleSide side );
|
|
||||||
|
|
||||||
default ItemStorage getItemHandler()
|
|
||||||
{
|
|
||||||
return ItemStorage.wrap( getInventory() );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the inventory of this turtle.
|
|
||||||
*
|
|
||||||
* Note: this inventory should only be accessed and modified on the server thread.
|
|
||||||
*
|
|
||||||
* @return This turtle's inventory
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
Inventory getInventory();
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An interface for objects executing custom turtle commands, used with {@link ITurtleAccess#executeCommand(ITurtleCommand)}.
|
|
||||||
*
|
|
||||||
* @see ITurtleAccess#executeCommand(ITurtleCommand)
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface ITurtleCommand
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Will be called by the turtle on the main thread when it is time to execute the custom command.
|
|
||||||
*
|
|
||||||
* The handler should either perform the work of the command, and return success, or return failure with an error message to indicate the command cannot
|
|
||||||
* be executed at this time.
|
|
||||||
*
|
|
||||||
* @param turtle Access to the turtle for whom the command was issued.
|
|
||||||
* @return A result, indicating whether this action succeeded or not.
|
|
||||||
* @see ITurtleAccess#executeCommand(ITurtleCommand)
|
|
||||||
* @see TurtleCommandResult#success()
|
|
||||||
* @see TurtleCommandResult#failure(String)
|
|
||||||
* @see TurtleCommandResult
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
TurtleCommandResult execute( @Nonnull ITurtleAccess turtle );
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.ComputerCraftAPI;
|
|
||||||
import dan200.computercraft.api.IUpgradeBase;
|
|
||||||
import dan200.computercraft.api.client.TransformedModel;
|
|
||||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The primary interface for defining an update for Turtles. A turtle update can either be a new tool, or a new peripheral.
|
|
||||||
*
|
|
||||||
* @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
|
|
||||||
*/
|
|
||||||
public interface ITurtleUpgrade extends IUpgradeBase
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Return whether this turtle adds a tool or a peripheral to the turtle.
|
|
||||||
*
|
|
||||||
* @return The type of upgrade this is.
|
|
||||||
* @see TurtleUpgradeType for the differences between them.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
TurtleUpgradeType getType();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Will only be called for peripheral upgrades. Creates a peripheral for a turtle being placed using this upgrade.
|
|
||||||
*
|
|
||||||
* The peripheral created will be stored for the lifetime of the upgrade and will be passed as an argument to {@link #update(ITurtleAccess,
|
|
||||||
* TurtleSide)}. It will be attached, detached and have methods called in the same manner as a Computer peripheral.
|
|
||||||
*
|
|
||||||
* @param turtle Access to the turtle that the peripheral is being created for.
|
|
||||||
* @param side Which side of the turtle (left or right) that the upgrade resides on.
|
|
||||||
* @return The newly created peripheral. You may return {@code null} if this upgrade is a Tool and this method is not expected to be called.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called by the turtle, and the tool is required to do some work.
|
|
||||||
*
|
|
||||||
* @param turtle Access to the turtle that the tool resides on.
|
|
||||||
* @param side Which side of the turtle (left or right) the tool resides on.
|
|
||||||
* @param verb Which action (dig or attack) the turtle is being called on to perform.
|
|
||||||
* @param direction Which world direction the action should be performed in, relative to the turtles position. This will either be up, down, or the
|
|
||||||
* direction the turtle is facing, depending on whether dig, digUp or digDown was called.
|
|
||||||
* @return Whether the turtle was able to perform the action, and hence whether the {@code turtle.dig()} or {@code turtle.attack()} lua method should
|
|
||||||
* return true. If true is returned, the tool will perform a swinging animation. You may return {@code null} if this turtle is a Peripheral and
|
|
||||||
* this method is not expected to be called.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction )
|
|
||||||
{
|
|
||||||
return TurtleCommandResult.failure();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called to obtain the model to be used when rendering a turtle peripheral.
|
|
||||||
*
|
|
||||||
* @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
|
|
||||||
* @param side Which side of the turtle (left or right) the upgrade resides on.
|
|
||||||
* @return The model that you wish to be used to render your upgrade.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
TransformedModel getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called once per tick for each turtle which has the upgrade equipped.
|
|
||||||
*
|
|
||||||
* @param turtle Access to the turtle that the upgrade resides on.
|
|
||||||
* @param side Which side of the turtle (left or right) the upgrade resides on.
|
|
||||||
*/
|
|
||||||
default void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An animation a turtle will play between executing commands.
|
|
||||||
*
|
|
||||||
* Each animation takes 8 ticks to complete unless otherwise specified.
|
|
||||||
*
|
|
||||||
* @see ITurtleAccess#playAnimation(TurtleAnimation)
|
|
||||||
*/
|
|
||||||
public enum TurtleAnimation
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* An animation which does nothing. This takes no time to complete.
|
|
||||||
*
|
|
||||||
* @see #WAIT
|
|
||||||
* @see #SHORT_WAIT
|
|
||||||
*/
|
|
||||||
NONE,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the turtle move forward. Note that the animation starts from the block <em>behind</em> it, and moves into this one.
|
|
||||||
*/
|
|
||||||
MOVE_FORWARD,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the turtle move backwards. Note that the animation starts from the block <em>in front</em> it, and moves into this one.
|
|
||||||
*/
|
|
||||||
MOVE_BACK,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the turtle move backwards. Note that the animation starts from the block <em>above</em> it, and moves into this one.
|
|
||||||
*/
|
|
||||||
MOVE_UP,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the turtle move backwards. Note that the animation starts from the block <em>below</em> it, and moves into this one.
|
|
||||||
*/
|
|
||||||
MOVE_DOWN,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and the turtle turns to face in the current
|
|
||||||
* direction.
|
|
||||||
*/
|
|
||||||
TURN_LEFT,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and the turtle turns to face in the current
|
|
||||||
* direction.
|
|
||||||
*/
|
|
||||||
TURN_RIGHT,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swing the tool on the left.
|
|
||||||
*/
|
|
||||||
SWING_LEFT_TOOL,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swing the tool on the right.
|
|
||||||
*/
|
|
||||||
SWING_RIGHT_TOOL,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wait until the animation has finished, performing no movement.
|
|
||||||
*
|
|
||||||
* @see #SHORT_WAIT
|
|
||||||
* @see #NONE
|
|
||||||
*/
|
|
||||||
WAIT,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wait until the animation has finished, performing no movement. This takes 4 ticks to complete.
|
|
||||||
*
|
|
||||||
* @see #WAIT
|
|
||||||
* @see #NONE
|
|
||||||
*/
|
|
||||||
SHORT_WAIT,
|
|
||||||
}
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used to indicate the result of executing a turtle command.
|
|
||||||
*
|
|
||||||
* @see ITurtleCommand#execute(ITurtleAccess)
|
|
||||||
* @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
|
|
||||||
*/
|
|
||||||
public final class TurtleCommandResult
|
|
||||||
{
|
|
||||||
private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult( true, null, null );
|
|
||||||
private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult( false, null, null );
|
|
||||||
private final boolean success;
|
|
||||||
private final String errorMessage;
|
|
||||||
private final Object[] results;
|
|
||||||
|
|
||||||
private TurtleCommandResult( boolean success, String errorMessage, Object[] results )
|
|
||||||
{
|
|
||||||
this.success = success;
|
|
||||||
this.errorMessage = errorMessage;
|
|
||||||
this.results = results;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a successful command result with no result.
|
|
||||||
*
|
|
||||||
* @return A successful command result with no values.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static TurtleCommandResult success()
|
|
||||||
{
|
|
||||||
return EMPTY_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a successful command result with the given result values.
|
|
||||||
*
|
|
||||||
* @param results The results of executing this command.
|
|
||||||
* @return A successful command result with the given values.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static TurtleCommandResult success( @Nullable Object[] results )
|
|
||||||
{
|
|
||||||
if( results == null || results.length == 0 )
|
|
||||||
{
|
|
||||||
return EMPTY_SUCCESS;
|
|
||||||
}
|
|
||||||
return new TurtleCommandResult( true, null, results );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a failed command result with no error message.
|
|
||||||
*
|
|
||||||
* @return A failed command result with no message.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static TurtleCommandResult failure()
|
|
||||||
{
|
|
||||||
return EMPTY_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a failed command result with an error message.
|
|
||||||
*
|
|
||||||
* @param errorMessage The error message to provide.
|
|
||||||
* @return A failed command result with a message.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public static TurtleCommandResult failure( @Nullable String errorMessage )
|
|
||||||
{
|
|
||||||
if( errorMessage == null )
|
|
||||||
{
|
|
||||||
return EMPTY_FAILURE;
|
|
||||||
}
|
|
||||||
return new TurtleCommandResult( false, errorMessage, null );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the command executed successfully.
|
|
||||||
*
|
|
||||||
* @return If the command was successful.
|
|
||||||
*/
|
|
||||||
public boolean isSuccess()
|
|
||||||
{
|
|
||||||
return success;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the error message of this command result.
|
|
||||||
*
|
|
||||||
* @return The command's error message, or {@code null} if it was a success.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public String getErrorMessage()
|
|
||||||
{
|
|
||||||
return errorMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the resulting values of this command result.
|
|
||||||
*
|
|
||||||
* @return The command's result, or {@code null} if it was a failure.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public Object[] getResults()
|
|
||||||
{
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An enum representing the two sides of the turtle that a turtle turtle might reside.
|
|
||||||
*/
|
|
||||||
public enum TurtleSide
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
|
|
||||||
*/
|
|
||||||
LEFT,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The turtle's right side (where the modem usually is on a Wireless Mining Turtle).
|
|
||||||
*/
|
|
||||||
RIGHT,
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An enum representing the different types of turtle that an {@link ITurtleUpgrade} implementation can add to a turtle.
|
|
||||||
*
|
|
||||||
* @see ITurtleUpgrade#getType()
|
|
||||||
*/
|
|
||||||
public enum TurtleUpgradeType
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* A tool is rendered as an item on the side of the turtle, and responds to the {@code turtle.dig()} and {@code turtle.attack()} methods (Such as
|
|
||||||
* pickaxe or sword on Mining and Melee turtles).
|
|
||||||
*/
|
|
||||||
TOOL,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A peripheral adds a special peripheral which is attached to the side of the turtle, and can be interacted with the {@code peripheral} API (Such as
|
|
||||||
* the modem on Wireless Turtles).
|
|
||||||
*/
|
|
||||||
PERIPHERAL,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An upgrade which provides both a tool and a peripheral. This can be used when you wish your upgrade to also provide methods. For example, a pickaxe
|
|
||||||
* could provide methods determining whether it can break the given block or not.
|
|
||||||
*/
|
|
||||||
BOTH;
|
|
||||||
|
|
||||||
public boolean isTool()
|
|
||||||
{
|
|
||||||
return this == TOOL || this == BOTH;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isPeripheral()
|
|
||||||
{
|
|
||||||
return this == PERIPHERAL || this == BOTH;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An enum representing the different actions that an {@link ITurtleUpgrade} of type Tool may be called on to perform by a turtle.
|
|
||||||
*
|
|
||||||
* @see ITurtleUpgrade#getType()
|
|
||||||
* @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
|
|
||||||
*/
|
|
||||||
public enum TurtleVerb
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}.
|
|
||||||
*/
|
|
||||||
DIG,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The turtle called {@code turtle.attack()}, {@code turtle.attackUp()} or {@code turtle.attackDown()}.
|
|
||||||
*/
|
|
||||||
ATTACK,
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A basic action that a turtle may perform, as accessed by the {@code turtle} API.
|
|
||||||
*
|
|
||||||
* @see TurtleActionEvent
|
|
||||||
*/
|
|
||||||
public enum TurtleAction
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* A turtle moves to a new position.
|
|
||||||
*
|
|
||||||
* @see TurtleBlockEvent.Move
|
|
||||||
*/
|
|
||||||
MOVE,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A turtle turns in a specific direction.
|
|
||||||
*/
|
|
||||||
TURN,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A turtle attempts to dig a block.
|
|
||||||
*
|
|
||||||
* @see TurtleBlockEvent.Dig
|
|
||||||
*/
|
|
||||||
DIG,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A turtle attempts to place a block or item in the world.
|
|
||||||
*
|
|
||||||
* @see TurtleBlockEvent.Place
|
|
||||||
*/
|
|
||||||
PLACE,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A turtle attempts to attack an entity.
|
|
||||||
*
|
|
||||||
* @see TurtleActionEvent
|
|
||||||
*/
|
|
||||||
ATTACK,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Drop an item into an inventory/the world.
|
|
||||||
*
|
|
||||||
* @see TurtleInventoryEvent.Drop
|
|
||||||
*/
|
|
||||||
DROP,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Suck an item from an inventory or the world.
|
|
||||||
*
|
|
||||||
* @see TurtleInventoryEvent.Suck
|
|
||||||
*/
|
|
||||||
SUCK,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Refuel the turtle's fuel levels.
|
|
||||||
*/
|
|
||||||
REFUEL,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Equip or unequip an item.
|
|
||||||
*/
|
|
||||||
EQUIP,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inspect a block in world.
|
|
||||||
*
|
|
||||||
* @see TurtleBlockEvent.Inspect
|
|
||||||
*/
|
|
||||||
INSPECT,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gather metdata about an item in the turtle's inventory.
|
|
||||||
*/
|
|
||||||
INSPECT_ITEM,
|
|
||||||
}
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import dan200.computercraft.api.turtle.TurtleCommandResult;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An event fired when a turtle is performing a known action.
|
|
||||||
*/
|
|
||||||
public class TurtleActionEvent extends TurtleEvent
|
|
||||||
{
|
|
||||||
private final TurtleAction action;
|
|
||||||
private String failureMessage;
|
|
||||||
private boolean cancelled = false;
|
|
||||||
|
|
||||||
public TurtleActionEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action )
|
|
||||||
{
|
|
||||||
super( turtle );
|
|
||||||
|
|
||||||
Objects.requireNonNull( action, "action cannot be null" );
|
|
||||||
this.action = action;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TurtleAction getAction()
|
|
||||||
{
|
|
||||||
return action;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the cancellation state of this action.
|
|
||||||
*
|
|
||||||
* If {@code cancel} is {@code true}, this action will not be carried out.
|
|
||||||
*
|
|
||||||
* @param cancel The new canceled value.
|
|
||||||
* @see TurtleCommandResult#failure()
|
|
||||||
* @deprecated Use {@link #setCanceled(boolean, String)} instead.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public void setCanceled( boolean cancel )
|
|
||||||
{
|
|
||||||
setCanceled( cancel, null );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the cancellation state of this action, setting a failure message if required.
|
|
||||||
*
|
|
||||||
* If {@code cancel} is {@code true}, this action will not be carried out.
|
|
||||||
*
|
|
||||||
* @param cancel The new canceled value.
|
|
||||||
* @param failureMessage The message to return to the user explaining the failure.
|
|
||||||
* @see TurtleCommandResult#failure(String)
|
|
||||||
*/
|
|
||||||
public void setCanceled( boolean cancel, @Nullable String failureMessage )
|
|
||||||
{
|
|
||||||
cancelled = true;
|
|
||||||
this.failureMessage = cancel ? failureMessage : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the message with which this will fail.
|
|
||||||
*
|
|
||||||
* @return The failure message.
|
|
||||||
* @see TurtleCommandResult#failure()
|
|
||||||
* @see #setCanceled(boolean, String)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public String getFailureMessage()
|
|
||||||
{
|
|
||||||
return failureMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isCancelled()
|
|
||||||
{
|
|
||||||
return cancelled;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.FakePlayer;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import dan200.computercraft.api.turtle.TurtleSide;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to attack an entity.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#ATTACK
|
|
||||||
*/
|
|
||||||
public class TurtleAttackEvent extends TurtlePlayerEvent
|
|
||||||
{
|
|
||||||
private final Entity target;
|
|
||||||
private final ITurtleUpgrade upgrade;
|
|
||||||
private final TurtleSide side;
|
|
||||||
|
|
||||||
public TurtleAttackEvent( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Entity target, @Nonnull ITurtleUpgrade upgrade,
|
|
||||||
@Nonnull TurtleSide side )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.ATTACK, player );
|
|
||||||
Objects.requireNonNull( target, "target cannot be null" );
|
|
||||||
Objects.requireNonNull( upgrade, "upgrade cannot be null" );
|
|
||||||
Objects.requireNonNull( side, "side cannot be null" );
|
|
||||||
this.target = target;
|
|
||||||
this.upgrade = upgrade;
|
|
||||||
this.side = side;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the entity being attacked by this turtle.
|
|
||||||
*
|
|
||||||
* @return The entity being attacked.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public Entity getTarget()
|
|
||||||
{
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the upgrade responsible for attacking.
|
|
||||||
*
|
|
||||||
* @return The upgrade responsible for attacking.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ITurtleUpgrade getUpgrade()
|
|
||||||
{
|
|
||||||
return upgrade;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the side the attacking upgrade is on.
|
|
||||||
*
|
|
||||||
* @return The upgrade's side.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public TurtleSide getSide()
|
|
||||||
{
|
|
||||||
return side;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.MethodResult;
|
|
||||||
import dan200.computercraft.api.turtle.FakePlayer;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import dan200.computercraft.api.turtle.TurtleSide;
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A general event for when a turtle interacts with a block or region.
|
|
||||||
*
|
|
||||||
* You should generally listen to one of the sub-events instead, cancelling them where appropriate.
|
|
||||||
*
|
|
||||||
* Note that you are not guaranteed to receive this event, if it has been cancelled by other mechanisms, such as block protection systems.
|
|
||||||
*
|
|
||||||
* Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact with a block, simply objects within that block space.
|
|
||||||
*/
|
|
||||||
public abstract class TurtleBlockEvent extends TurtlePlayerEvent
|
|
||||||
{
|
|
||||||
private final World world;
|
|
||||||
private final BlockPos pos;
|
|
||||||
|
|
||||||
protected TurtleBlockEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
|
|
||||||
@Nonnull BlockPos pos )
|
|
||||||
{
|
|
||||||
super( turtle, action, player );
|
|
||||||
|
|
||||||
Objects.requireNonNull( world, "world cannot be null" );
|
|
||||||
Objects.requireNonNull( pos, "pos cannot be null" );
|
|
||||||
this.world = world;
|
|
||||||
this.pos = pos;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the world the turtle is interacting in.
|
|
||||||
*
|
|
||||||
* @return The world the turtle is interacting in.
|
|
||||||
*/
|
|
||||||
public World getWorld()
|
|
||||||
{
|
|
||||||
return world;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the position the turtle is interacting with. Note that this is different to {@link ITurtleAccess#getPosition()}.
|
|
||||||
*
|
|
||||||
* @return The position the turtle is interacting with.
|
|
||||||
*/
|
|
||||||
public BlockPos getPos()
|
|
||||||
{
|
|
||||||
return pos;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to dig a block.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#DIG
|
|
||||||
*/
|
|
||||||
public static class Dig extends TurtleBlockEvent
|
|
||||||
{
|
|
||||||
private final BlockState block;
|
|
||||||
private final ITurtleUpgrade upgrade;
|
|
||||||
private final TurtleSide side;
|
|
||||||
|
|
||||||
public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block,
|
|
||||||
@Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.DIG, player, world, pos );
|
|
||||||
|
|
||||||
Objects.requireNonNull( block, "block cannot be null" );
|
|
||||||
Objects.requireNonNull( upgrade, "upgrade cannot be null" );
|
|
||||||
Objects.requireNonNull( side, "side cannot be null" );
|
|
||||||
this.block = block;
|
|
||||||
this.upgrade = upgrade;
|
|
||||||
this.side = side;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the block which is about to be broken.
|
|
||||||
*
|
|
||||||
* @return The block which is going to be broken.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public BlockState getBlock()
|
|
||||||
{
|
|
||||||
return block;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the upgrade doing the digging.
|
|
||||||
*
|
|
||||||
* @return The upgrade doing the digging.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ITurtleUpgrade getUpgrade()
|
|
||||||
{
|
|
||||||
return upgrade;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the side the upgrade doing the digging is on.
|
|
||||||
*
|
|
||||||
* @return The upgrade's side.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public TurtleSide getSide()
|
|
||||||
{
|
|
||||||
return side;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to move into a block.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#MOVE
|
|
||||||
*/
|
|
||||||
public static class Move extends TurtleBlockEvent
|
|
||||||
{
|
|
||||||
public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.MOVE, player, world, pos );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to place a block in the world.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#PLACE
|
|
||||||
*/
|
|
||||||
public static class Place extends TurtleBlockEvent
|
|
||||||
{
|
|
||||||
private final ItemStack stack;
|
|
||||||
|
|
||||||
public Place( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.PLACE, player, world, pos );
|
|
||||||
|
|
||||||
Objects.requireNonNull( stack, "stack cannot be null" );
|
|
||||||
this.stack = stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the item stack that will be placed. This should not be modified.
|
|
||||||
*
|
|
||||||
* @return The item stack to be placed.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ItemStack getStack()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle gathers data on a block in world.
|
|
||||||
*
|
|
||||||
* You may prevent blocks being inspected, or add additional information to the result.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#INSPECT
|
|
||||||
*/
|
|
||||||
public static class Inspect extends TurtleBlockEvent
|
|
||||||
{
|
|
||||||
private final BlockState state;
|
|
||||||
private final Map<String, Object> data;
|
|
||||||
|
|
||||||
public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state,
|
|
||||||
@Nonnull Map<String, Object> data )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.INSPECT, player, world, pos );
|
|
||||||
|
|
||||||
Objects.requireNonNull( state, "state cannot be null" );
|
|
||||||
Objects.requireNonNull( data, "data cannot be null" );
|
|
||||||
this.data = data;
|
|
||||||
this.state = state;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the block state which is being inspected.
|
|
||||||
*
|
|
||||||
* @return The inspected block state.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public BlockState getState()
|
|
||||||
{
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the "inspection data" from this block, which will be returned to the user.
|
|
||||||
*
|
|
||||||
* @return This block's inspection data.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public Map<String, Object> getData()
|
|
||||||
{
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add new information to the inspection result. Note this will override fields with the same name.
|
|
||||||
*
|
|
||||||
* @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
|
|
||||||
*/
|
|
||||||
public void addData( @Nonnull Map<String, ?> newData )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( newData, "newData cannot be null" );
|
|
||||||
data.putAll( newData );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import com.google.common.eventbus.EventBus;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A base class for all events concerning a turtle. This will only ever constructed and fired on the server side, so sever specific methods on {@link
|
|
||||||
* ITurtleAccess} are safe to use.
|
|
||||||
*
|
|
||||||
* You should generally not need to subscribe to this event, preferring one of the more specific classes.
|
|
||||||
*
|
|
||||||
* @see TurtleActionEvent
|
|
||||||
*/
|
|
||||||
public abstract class TurtleEvent
|
|
||||||
{
|
|
||||||
public static final EventBus EVENT_BUS = new EventBus();
|
|
||||||
|
|
||||||
private final ITurtleAccess turtle;
|
|
||||||
|
|
||||||
protected TurtleEvent( @Nonnull ITurtleAccess turtle )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( turtle, "turtle cannot be null" );
|
|
||||||
this.turtle = turtle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean post( TurtleActionEvent event )
|
|
||||||
{
|
|
||||||
EVENT_BUS.post( event );
|
|
||||||
return event.isCancelled();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the turtle which is performing this action.
|
|
||||||
*
|
|
||||||
* @return The access for this turtle.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ITurtleAccess getTurtle()
|
|
||||||
{
|
|
||||||
return turtle;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.MethodResult;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle gathers data on an item in its inventory.
|
|
||||||
*
|
|
||||||
* You may prevent items being inspected, or add additional information to the result. Be aware that this may be fired on the computer thread, and so any
|
|
||||||
* operations on it must be thread safe.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#INSPECT_ITEM
|
|
||||||
*/
|
|
||||||
public class TurtleInspectItemEvent extends TurtleActionEvent
|
|
||||||
{
|
|
||||||
private final ItemStack stack;
|
|
||||||
private final Map<String, Object> data;
|
|
||||||
private final boolean mainThread;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data )
|
|
||||||
{
|
|
||||||
this( turtle, stack, data, false );
|
|
||||||
}
|
|
||||||
|
|
||||||
public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data, boolean mainThread )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.INSPECT_ITEM );
|
|
||||||
|
|
||||||
Objects.requireNonNull( stack, "stack cannot be null" );
|
|
||||||
Objects.requireNonNull( data, "data cannot be null" );
|
|
||||||
this.stack = stack;
|
|
||||||
this.data = data;
|
|
||||||
this.mainThread = mainThread;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The item which is currently being inspected.
|
|
||||||
*
|
|
||||||
* @return The item stack which is being inspected. This should <b>not</b> be modified.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ItemStack getStack()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the "inspection data" from this item, which will be returned to the user.
|
|
||||||
*
|
|
||||||
* @return This items's inspection data.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public Map<String, Object> getData()
|
|
||||||
{
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If this event is being fired on the server thread. When true, information which relies on server state may be exposed.
|
|
||||||
*
|
|
||||||
* @return If this is run on the main thread.
|
|
||||||
*/
|
|
||||||
public boolean onMainThread()
|
|
||||||
{
|
|
||||||
return mainThread;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add new information to the inspection result. Note this will override fields with the same name.
|
|
||||||
*
|
|
||||||
* @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
|
|
||||||
*/
|
|
||||||
public void addData( @Nonnull Map<String, ?> newData )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( newData, "newData cannot be null" );
|
|
||||||
data.putAll( newData );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.FakePlayer;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import net.minecraft.inventory.Inventory;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to interact with an inventory.
|
|
||||||
*/
|
|
||||||
public abstract class TurtleInventoryEvent extends TurtleBlockEvent
|
|
||||||
{
|
|
||||||
private final Inventory handler;
|
|
||||||
|
|
||||||
protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
|
|
||||||
@Nonnull BlockPos pos, @Nullable Inventory handler )
|
|
||||||
{
|
|
||||||
super( turtle, action, player, world, pos );
|
|
||||||
this.handler = handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the inventory being interacted with.
|
|
||||||
*
|
|
||||||
* @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public Inventory getItemHandler()
|
|
||||||
{
|
|
||||||
return handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to suck from an inventory.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#SUCK
|
|
||||||
*/
|
|
||||||
public static class Suck extends TurtleInventoryEvent
|
|
||||||
{
|
|
||||||
public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.SUCK, player, world, pos, handler );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to drop an item into an inventory.
|
|
||||||
*
|
|
||||||
* @see TurtleAction#DROP
|
|
||||||
*/
|
|
||||||
public static class Drop extends TurtleInventoryEvent
|
|
||||||
{
|
|
||||||
private final ItemStack stack;
|
|
||||||
|
|
||||||
public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler,
|
|
||||||
@Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.DROP, player, world, pos, handler );
|
|
||||||
|
|
||||||
Objects.requireNonNull( stack, "stack cannot be null" );
|
|
||||||
this.stack = stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The item which will be inserted into the inventory/dropped on the ground.
|
|
||||||
*
|
|
||||||
* @return The item stack which will be dropped. This should <b>not</b> be modified.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public ItemStack getStack()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.FakePlayer;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An action done by a turtle which is normally done by a player.
|
|
||||||
*
|
|
||||||
* {@link #getPlayer()} may be used to modify the player's attributes or perform permission checks.
|
|
||||||
*/
|
|
||||||
public abstract class TurtlePlayerEvent extends TurtleActionEvent
|
|
||||||
{
|
|
||||||
private final FakePlayer player;
|
|
||||||
|
|
||||||
protected TurtlePlayerEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player )
|
|
||||||
{
|
|
||||||
super( turtle, action );
|
|
||||||
|
|
||||||
Objects.requireNonNull( player, "player cannot be null" );
|
|
||||||
this.player = player;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A fake player, representing this turtle.
|
|
||||||
*
|
|
||||||
* This may be used for triggering permission checks.
|
|
||||||
*
|
|
||||||
* @return A {@link FakePlayer} representing this turtle.
|
|
||||||
*/
|
|
||||||
@Nonnull
|
|
||||||
public FakePlayer getPlayer()
|
|
||||||
{
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the public ComputerCraft API - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
|
|
||||||
* For help using the API, and posting your mods, visit the forums at computercraft.info.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.api.turtle.event;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleAccess;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fired when a turtle attempts to refuel from an item.
|
|
||||||
*
|
|
||||||
* One may use {@link #setCanceled(boolean, String)} to prevent refueling from this specific item. Additionally, you may use {@link #setHandler(Handler)} to
|
|
||||||
* register a custom fuel provider.
|
|
||||||
*/
|
|
||||||
public class TurtleRefuelEvent extends TurtleActionEvent
|
|
||||||
{
|
|
||||||
private final ItemStack stack;
|
|
||||||
private Handler handler;
|
|
||||||
|
|
||||||
public TurtleRefuelEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack )
|
|
||||||
{
|
|
||||||
super( turtle, TurtleAction.REFUEL );
|
|
||||||
|
|
||||||
Objects.requireNonNull( turtle, "turtle cannot be null" );
|
|
||||||
this.stack = stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the stack we are attempting to refuel from.
|
|
||||||
*
|
|
||||||
* Do not modify the returned stack - all modifications should be done within the {@link Handler}.
|
|
||||||
*
|
|
||||||
* @return The stack to refuel from.
|
|
||||||
*/
|
|
||||||
public ItemStack getStack()
|
|
||||||
{
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the refuel handler for this stack.
|
|
||||||
*
|
|
||||||
* @return The refuel handler, or {@code null} if none has currently been set.
|
|
||||||
* @see #setHandler(Handler)
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
public Handler getHandler()
|
|
||||||
{
|
|
||||||
return handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the refuel handler for this stack.
|
|
||||||
*
|
|
||||||
* You should call this if you can actually refuel from this item, and ideally only if there are no existing handlers.
|
|
||||||
*
|
|
||||||
* @param handler The new refuel handler.
|
|
||||||
* @see #getHandler()
|
|
||||||
*/
|
|
||||||
public void setHandler( @Nullable Handler handler )
|
|
||||||
{
|
|
||||||
this.handler = handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles refuelling a turtle from a specific item.
|
|
||||||
*/
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface Handler
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Refuel a turtle using an item.
|
|
||||||
*
|
|
||||||
* @param turtle The turtle to refuel.
|
|
||||||
* @param stack The stack to refuel with.
|
|
||||||
* @param slot The slot the stack resides within. This may be used to modify the inventory afterwards.
|
|
||||||
* @param limit The maximum number of refuel operations to perform. This will often correspond to the number of items to consume.
|
|
||||||
* @return The amount of fuel gained.
|
|
||||||
*/
|
|
||||||
int refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client;
|
|
||||||
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.shared.ComputerCraftRegistry;
|
|
||||||
import dan200.computercraft.shared.common.IColouredItem;
|
|
||||||
import dan200.computercraft.shared.media.items.ItemDisk;
|
|
||||||
import dan200.computercraft.shared.media.items.ItemTreasureDisk;
|
|
||||||
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
|
|
||||||
import dan200.computercraft.shared.util.Colour;
|
|
||||||
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
|
|
||||||
import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.ModelLoader;
|
|
||||||
import net.minecraft.client.render.model.ModelRotation;
|
|
||||||
import net.minecraft.client.render.model.UnbakedModel;
|
|
||||||
import net.minecraft.client.texture.SpriteAtlasTexture;
|
|
||||||
import net.minecraft.client.util.ModelIdentifier;
|
|
||||||
import net.minecraft.resource.ResourceManager;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers textures and models for items.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings( {
|
|
||||||
"MethodCallSideOnly",
|
|
||||||
"LocalVariableDeclarationSideOnly"
|
|
||||||
} )
|
|
||||||
public final class ClientRegistry
|
|
||||||
{
|
|
||||||
private static final String[] EXTRA_MODELS = new String[] {
|
|
||||||
"turtle_modem_normal_off_left",
|
|
||||||
"turtle_modem_normal_on_left",
|
|
||||||
"turtle_modem_normal_off_right",
|
|
||||||
"turtle_modem_normal_on_right",
|
|
||||||
|
|
||||||
"turtle_modem_advanced_off_left",
|
|
||||||
"turtle_modem_advanced_on_left",
|
|
||||||
"turtle_modem_advanced_off_right",
|
|
||||||
"turtle_modem_advanced_on_right",
|
|
||||||
"turtle_crafting_table_left",
|
|
||||||
"turtle_crafting_table_right",
|
|
||||||
|
|
||||||
"turtle_speaker_upgrade_left",
|
|
||||||
"turtle_speaker_upgrade_right",
|
|
||||||
|
|
||||||
"turtle_colour",
|
|
||||||
"turtle_elf_overlay",
|
|
||||||
};
|
|
||||||
|
|
||||||
private static final String[] EXTRA_TEXTURES = new String[] {
|
|
||||||
// TODO: Gather these automatically from the model. Sadly the model loader isn't available
|
|
||||||
// when stitching textures.
|
|
||||||
"block/turtle_colour",
|
|
||||||
"block/turtle_elf_overlay",
|
|
||||||
"block/turtle_crafty_face",
|
|
||||||
"block/turtle_speaker_face",
|
|
||||||
};
|
|
||||||
|
|
||||||
private ClientRegistry() {}
|
|
||||||
|
|
||||||
public static void onTextureStitchEvent( SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry )
|
|
||||||
{
|
|
||||||
for( String extra : EXTRA_TEXTURES )
|
|
||||||
{
|
|
||||||
registry.register( new Identifier( ComputerCraft.MOD_ID, extra ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings( "NewExpressionSideOnly" )
|
|
||||||
public static void onModelBakeEvent( ResourceManager manager, Consumer<ModelIdentifier> out )
|
|
||||||
{
|
|
||||||
for( String model : EXTRA_MODELS )
|
|
||||||
{
|
|
||||||
out.accept( new ModelIdentifier( new Identifier( ComputerCraft.MOD_ID, model ), "inventory" ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void onItemColours()
|
|
||||||
{
|
|
||||||
ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
|
|
||||||
return layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF;
|
|
||||||
}, ComputerCraftRegistry.ModItems.DISK );
|
|
||||||
|
|
||||||
ColorProviderRegistry.ITEM.register( ( stack, layer ) -> layer == 1 ? ItemTreasureDisk.getColour( stack ) : 0xFFFFFF,
|
|
||||||
ComputerCraftRegistry.ModItems.TREASURE_DISK );
|
|
||||||
|
|
||||||
ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
|
|
||||||
switch( layer )
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
default:
|
|
||||||
return 0xFFFFFF;
|
|
||||||
case 1: // Frame colour
|
|
||||||
return IColouredItem.getColourBasic( stack );
|
|
||||||
case 2: // Light colour
|
|
||||||
int light = ItemPocketComputer.getLightState( stack );
|
|
||||||
return light == -1 ? Colour.BLACK.getHex() : light;
|
|
||||||
}
|
|
||||||
}, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
|
|
||||||
|
|
||||||
// Setup turtle colours
|
|
||||||
ColorProviderRegistry.ITEM.register( ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
|
|
||||||
ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL,
|
|
||||||
ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static BakedModel bake( ModelLoader loader, UnbakedModel model, Identifier identifier )
|
|
||||||
{
|
|
||||||
model.getTextureDependencies( loader::getOrLoadModel, new HashSet<>() );
|
|
||||||
return model.bake( loader,
|
|
||||||
spriteIdentifier -> MinecraftClient.getInstance()
|
|
||||||
.getSpriteAtlas( spriteIdentifier.getAtlasId() )
|
|
||||||
.apply( spriteIdentifier.getTextureId() ),
|
|
||||||
ModelRotation.X0_Y0,
|
|
||||||
identifier );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client;
|
|
||||||
|
|
||||||
import dan200.computercraft.fabric.mixin.ChatHudAccess;
|
|
||||||
import dan200.computercraft.shared.command.text.ChatHelpers;
|
|
||||||
import dan200.computercraft.shared.command.text.TableBuilder;
|
|
||||||
import dan200.computercraft.shared.command.text.TableFormatter;
|
|
||||||
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.font.TextRenderer;
|
|
||||||
import net.minecraft.client.gui.hud.ChatHud;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Formatting;
|
|
||||||
import net.minecraft.util.math.MathHelper;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
@SuppressWarnings( {
|
|
||||||
"MethodCallSideOnly",
|
|
||||||
"LocalVariableDeclarationSideOnly"
|
|
||||||
} )
|
|
||||||
public class ClientTableFormatter implements TableFormatter
|
|
||||||
{
|
|
||||||
public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
|
|
||||||
|
|
||||||
private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@Nullable
|
|
||||||
public Text getPadding( Text component, int width )
|
|
||||||
{
|
|
||||||
int extraWidth = width - getWidth( component );
|
|
||||||
if( extraWidth <= 0 )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
TextRenderer renderer = renderer();
|
|
||||||
|
|
||||||
float spaceWidth = renderer.getWidth( " " );
|
|
||||||
int spaces = MathHelper.floor( extraWidth / spaceWidth );
|
|
||||||
int extra = extraWidth - (int) (spaces * spaceWidth);
|
|
||||||
|
|
||||||
return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), Formatting.GRAY );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TextRenderer renderer()
|
|
||||||
{
|
|
||||||
return MinecraftClient.getInstance().textRenderer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getColumnPadding()
|
|
||||||
{
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getWidth( Text component )
|
|
||||||
{
|
|
||||||
return renderer().getWidth( component );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeLine( int id, Text component )
|
|
||||||
{
|
|
||||||
MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
ChatHud chat = mc.inGameHud.getChatHud();
|
|
||||||
|
|
||||||
// TODO: Trim the text if it goes over the allowed length
|
|
||||||
// int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
|
|
||||||
// List<ITextProperties> list = RenderComponentsUtil.func_238505_a_( component, maxWidth, mc.fontRenderer );
|
|
||||||
// if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
|
|
||||||
((ChatHudAccess) chat).callAddMessage( component, id );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int display( TableBuilder table )
|
|
||||||
{
|
|
||||||
ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud();
|
|
||||||
|
|
||||||
int lastHeight = lastHeights.get( table.getId() );
|
|
||||||
|
|
||||||
int height = TableFormatter.super.display( table );
|
|
||||||
lastHeights.put( table.getId(), height );
|
|
||||||
|
|
||||||
for( int i = height; i < lastHeight; i++ )
|
|
||||||
{
|
|
||||||
((ChatHudAccess) chat).callRemoveMessage( i + table.getId() );
|
|
||||||
}
|
|
||||||
return height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client;
|
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
|
||||||
|
|
||||||
public final class FrameInfo
|
|
||||||
{
|
|
||||||
private static int tick;
|
|
||||||
private static long renderFrame;
|
|
||||||
|
|
||||||
private FrameInfo()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void init()
|
|
||||||
{
|
|
||||||
ClientTickEvents.START_CLIENT_TICK.register( m -> {
|
|
||||||
tick++;
|
|
||||||
} );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean getGlobalCursorBlink()
|
|
||||||
{
|
|
||||||
return (tick / 8) % 2 == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static long getRenderFrame()
|
|
||||||
{
|
|
||||||
return renderFrame;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO Call this in a callback
|
|
||||||
public static void onTick()
|
|
||||||
{
|
|
||||||
tick++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO Call this in a callback
|
|
||||||
public static void onRenderFrame()
|
|
||||||
{
|
|
||||||
renderFrame++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,421 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.client.FrameInfo;
|
|
||||||
import dan200.computercraft.core.terminal.Terminal;
|
|
||||||
import dan200.computercraft.core.terminal.TextBuffer;
|
|
||||||
import dan200.computercraft.shared.util.Colour;
|
|
||||||
import dan200.computercraft.shared.util.Palette;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.*;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.AffineTransformation;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
public final class FixedWidthFontRenderer
|
|
||||||
{
|
|
||||||
public static final int FONT_HEIGHT = 9;
|
|
||||||
public static final int FONT_WIDTH = 6;
|
|
||||||
public static final float WIDTH = 256.0f;
|
|
||||||
public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
|
|
||||||
public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
|
|
||||||
private static final Matrix4f IDENTITY = AffineTransformation.identity()
|
|
||||||
.getMatrix();
|
|
||||||
private static final Identifier FONT = new Identifier( "computercraft", "textures/gui/term_font.png" );
|
|
||||||
public static final RenderLayer TYPE = Type.MAIN;
|
|
||||||
|
|
||||||
|
|
||||||
private FixedWidthFontRenderer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawString( float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
|
|
||||||
@Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
bindFont();
|
|
||||||
|
|
||||||
VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
|
|
||||||
.getBufferBuilders()
|
|
||||||
.getEntityVertexConsumers();
|
|
||||||
drawString( IDENTITY,
|
|
||||||
((VertexConsumerProvider) renderer).getBuffer( TYPE ),
|
|
||||||
x,
|
|
||||||
y,
|
|
||||||
text,
|
|
||||||
textColour,
|
|
||||||
backgroundColour,
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
leftMarginSize,
|
|
||||||
rightMarginSize );
|
|
||||||
renderer.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void bindFont()
|
|
||||||
{
|
|
||||||
MinecraftClient.getInstance()
|
|
||||||
.getTextureManager()
|
|
||||||
.bindTexture( FONT );
|
|
||||||
RenderSystem.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawString( @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y, @Nonnull TextBuffer text,
|
|
||||||
@Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
|
|
||||||
float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
if( backgroundColour != null )
|
|
||||||
{
|
|
||||||
drawBackground( transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT );
|
|
||||||
}
|
|
||||||
|
|
||||||
for( int i = 0; i < text.length(); i++ )
|
|
||||||
{
|
|
||||||
double[] colour = palette.getColour( getColour( textColour.charAt( i ), Colour.BLACK ) );
|
|
||||||
float r, g, b;
|
|
||||||
if( greyscale )
|
|
||||||
{
|
|
||||||
r = g = b = toGreyscale( colour );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
r = (float) colour[0];
|
|
||||||
g = (float) colour[1];
|
|
||||||
b = (float) colour[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw char
|
|
||||||
int index = text.charAt( i );
|
|
||||||
if( index > 255 )
|
|
||||||
{
|
|
||||||
index = '?';
|
|
||||||
}
|
|
||||||
drawChar( transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawBackground( @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
|
|
||||||
@Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale, float leftMarginSize,
|
|
||||||
float rightMarginSize, float height )
|
|
||||||
{
|
|
||||||
if( leftMarginSize > 0 )
|
|
||||||
{
|
|
||||||
drawQuad( transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt( 0 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( rightMarginSize > 0 )
|
|
||||||
{
|
|
||||||
drawQuad( transform,
|
|
||||||
renderer,
|
|
||||||
x + backgroundColour.length() * FONT_WIDTH,
|
|
||||||
y,
|
|
||||||
rightMarginSize,
|
|
||||||
height,
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
backgroundColour.charAt( backgroundColour.length() - 1 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Batch together runs of identical background cells.
|
|
||||||
int blockStart = 0;
|
|
||||||
char blockColour = '\0';
|
|
||||||
for( int i = 0; i < backgroundColour.length(); i++ )
|
|
||||||
{
|
|
||||||
char colourIndex = backgroundColour.charAt( i );
|
|
||||||
if( colourIndex == blockColour )
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( blockColour != '\0' )
|
|
||||||
{
|
|
||||||
drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour );
|
|
||||||
}
|
|
||||||
|
|
||||||
blockColour = colourIndex;
|
|
||||||
blockStart = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( blockColour != '\0' )
|
|
||||||
{
|
|
||||||
drawQuad( transform,
|
|
||||||
renderer,
|
|
||||||
x + blockStart * FONT_WIDTH,
|
|
||||||
y,
|
|
||||||
FONT_WIDTH * (backgroundColour.length() - blockStart),
|
|
||||||
height,
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
blockColour );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getColour( char c, Colour def )
|
|
||||||
{
|
|
||||||
return 15 - Terminal.getColour( c, def );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static float toGreyscale( double[] rgb )
|
|
||||||
{
|
|
||||||
return (float) ((rgb[0] + rgb[1] + rgb[2]) / 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawChar( Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b )
|
|
||||||
{
|
|
||||||
// Short circuit to avoid the common case - the texture should be blank here after all.
|
|
||||||
if( index == '\0' || index == ' ' )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int column = index % 16;
|
|
||||||
int row = index / 16;
|
|
||||||
|
|
||||||
int xStart = 1 + column * (FONT_WIDTH + 2);
|
|
||||||
int yStart = 1 + row * (FONT_HEIGHT + 2);
|
|
||||||
|
|
||||||
buffer.vertex( transform, x, y, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( xStart / WIDTH, yStart / WIDTH )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x, y + FONT_HEIGHT, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + FONT_WIDTH, y, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + FONT_WIDTH, y, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x, y + FONT_HEIGHT, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette,
|
|
||||||
boolean greyscale, char colourIndex )
|
|
||||||
{
|
|
||||||
double[] colour = palette.getColour( getColour( colourIndex, Colour.BLACK ) );
|
|
||||||
float r, g, b;
|
|
||||||
if( greyscale )
|
|
||||||
{
|
|
||||||
r = g = b = toGreyscale( colour );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
r = (float) colour[0];
|
|
||||||
g = (float) colour[1];
|
|
||||||
b = (float) colour[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
drawQuad( transform, buffer, x, y, width, height, r, g, b );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b )
|
|
||||||
{
|
|
||||||
buffer.vertex( transform, x, y, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_START, BACKGROUND_START )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x, y + height, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_START, BACKGROUND_END )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + width, y, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_END, BACKGROUND_START )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + width, y, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_END, BACKGROUND_START )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x, y + height, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_START, BACKGROUND_END )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + width, y + height, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( BACKGROUND_END, BACKGROUND_END )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawTerminalWithoutCursor( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
|
|
||||||
@Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
|
|
||||||
float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
Palette palette = terminal.getPalette();
|
|
||||||
int height = terminal.getHeight();
|
|
||||||
|
|
||||||
// Top and bottom margins
|
|
||||||
drawBackground( transform,
|
|
||||||
buffer,
|
|
||||||
x,
|
|
||||||
y - topMarginSize,
|
|
||||||
terminal.getBackgroundColourLine( 0 ),
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
leftMarginSize,
|
|
||||||
rightMarginSize,
|
|
||||||
topMarginSize );
|
|
||||||
|
|
||||||
drawBackground( transform,
|
|
||||||
buffer,
|
|
||||||
x,
|
|
||||||
y + height * FONT_HEIGHT,
|
|
||||||
terminal.getBackgroundColourLine( height - 1 ),
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
leftMarginSize,
|
|
||||||
rightMarginSize,
|
|
||||||
bottomMarginSize );
|
|
||||||
|
|
||||||
// The main text
|
|
||||||
for( int i = 0; i < height; i++ )
|
|
||||||
{
|
|
||||||
drawString( transform,
|
|
||||||
buffer,
|
|
||||||
x,
|
|
||||||
y + FixedWidthFontRenderer.FONT_HEIGHT * i,
|
|
||||||
terminal.getLine( i ),
|
|
||||||
terminal.getTextColourLine( i ),
|
|
||||||
terminal.getBackgroundColourLine( i ),
|
|
||||||
palette,
|
|
||||||
greyscale,
|
|
||||||
leftMarginSize,
|
|
||||||
rightMarginSize );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawCursor( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
|
|
||||||
boolean greyscale )
|
|
||||||
{
|
|
||||||
Palette palette = terminal.getPalette();
|
|
||||||
int width = terminal.getWidth();
|
|
||||||
int height = terminal.getHeight();
|
|
||||||
|
|
||||||
int cursorX = terminal.getCursorX();
|
|
||||||
int cursorY = terminal.getCursorY();
|
|
||||||
if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink() )
|
|
||||||
{
|
|
||||||
double[] colour = palette.getColour( 15 - terminal.getTextColour() );
|
|
||||||
float r, g, b;
|
|
||||||
if( greyscale )
|
|
||||||
{
|
|
||||||
r = g = b = toGreyscale( colour );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
r = (float) colour[0];
|
|
||||||
g = (float) colour[1];
|
|
||||||
b = (float) colour[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
drawChar( transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawTerminal( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
|
|
||||||
boolean greyscale, float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
drawTerminalWithoutCursor( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
|
|
||||||
drawCursor( transform, buffer, x, y, terminal, greyscale );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawTerminal( @Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize,
|
|
||||||
float bottomMarginSize, float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
bindFont();
|
|
||||||
|
|
||||||
VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
|
|
||||||
.getBufferBuilders()
|
|
||||||
.getEntityVertexConsumers();
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( TYPE );
|
|
||||||
drawTerminal( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
|
|
||||||
renderer.draw( TYPE );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawTerminal( float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
|
|
||||||
float leftMarginSize, float rightMarginSize )
|
|
||||||
{
|
|
||||||
drawTerminal( IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawEmptyTerminal( float x, float y, float width, float height )
|
|
||||||
{
|
|
||||||
drawEmptyTerminal( IDENTITY, x, y, width, height );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawEmptyTerminal( @Nonnull Matrix4f transform, float x, float y, float width, float height )
|
|
||||||
{
|
|
||||||
bindFont();
|
|
||||||
|
|
||||||
VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
|
|
||||||
.getBufferBuilders()
|
|
||||||
.getEntityVertexConsumers();
|
|
||||||
drawEmptyTerminal( transform, renderer, x, y, width, height );
|
|
||||||
renderer.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width,
|
|
||||||
float height )
|
|
||||||
{
|
|
||||||
Colour colour = Colour.BLACK;
|
|
||||||
drawQuad( transform, renderer.getBuffer( TYPE ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width, float height )
|
|
||||||
{
|
|
||||||
Colour colour = Colour.BLACK;
|
|
||||||
drawQuad( transform, renderer.getBuffer( Type.BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final class Type extends RenderPhase
|
|
||||||
{
|
|
||||||
private static final int GL_MODE = GL11.GL_TRIANGLES;
|
|
||||||
|
|
||||||
private static final VertexFormat FORMAT = VertexFormats.POSITION_COLOR_TEXTURE;
|
|
||||||
|
|
||||||
static final RenderLayer MAIN = RenderLayer.of( "terminal_font", FORMAT, GL_MODE, 1024, false, false, // useDelegate, needsSorting
|
|
||||||
RenderLayer.MultiPhaseParameters.builder()
|
|
||||||
.texture( new RenderPhase.Texture( FONT,
|
|
||||||
false,
|
|
||||||
false ) ) // blur, minimap
|
|
||||||
.alpha( ONE_TENTH_ALPHA )
|
|
||||||
.lightmap( DISABLE_LIGHTMAP )
|
|
||||||
.writeMaskState( COLOR_MASK )
|
|
||||||
.build( false ) );
|
|
||||||
|
|
||||||
static final RenderLayer BLOCKER = RenderLayer.of( "terminal_blocker", FORMAT, GL_MODE, 256, false, false, // useDelegate, needsSorting
|
|
||||||
RenderLayer.MultiPhaseParameters.builder()
|
|
||||||
.texture( new RenderPhase.Texture( FONT,
|
|
||||||
false,
|
|
||||||
false ) ) // blur, minimap
|
|
||||||
.alpha( ONE_TENTH_ALPHA )
|
|
||||||
.writeMaskState( ALL_MASK )
|
|
||||||
.lightmap( DISABLE_LIGHTMAP )
|
|
||||||
.build( false ) );
|
|
||||||
|
|
||||||
private Type( String name, Runnable setup, Runnable destroy )
|
|
||||||
{
|
|
||||||
super( name, setup, destroy );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.client.gui.widgets.WidgetTerminal;
|
|
||||||
import dan200.computercraft.client.gui.widgets.WidgetWrapper;
|
|
||||||
import dan200.computercraft.client.render.ComputerBorderRenderer;
|
|
||||||
import dan200.computercraft.shared.computer.core.ClientComputer;
|
|
||||||
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
||||||
import dan200.computercraft.shared.computer.inventory.ContainerComputer;
|
|
||||||
import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
|
|
||||||
import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
|
|
||||||
import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
|
|
||||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
|
|
||||||
import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
|
|
||||||
|
|
||||||
public class GuiComputer<T extends ContainerComputerBase> extends HandledScreen<T>
|
|
||||||
{
|
|
||||||
protected final ComputerFamily family;
|
|
||||||
protected final ClientComputer computer;
|
|
||||||
private final int termWidth;
|
|
||||||
private final int termHeight;
|
|
||||||
|
|
||||||
protected WidgetTerminal terminal;
|
|
||||||
protected WidgetWrapper terminalWrapper;
|
|
||||||
|
|
||||||
protected GuiComputer( T container, PlayerInventory player, Text title, int termWidth, int termHeight )
|
|
||||||
{
|
|
||||||
super( container, player, title );
|
|
||||||
this.family = container.getFamily();
|
|
||||||
this.computer = (ClientComputer) container.getComputer();
|
|
||||||
this.termWidth = termWidth;
|
|
||||||
this.termHeight = termHeight;
|
|
||||||
this.terminal = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, Text component )
|
|
||||||
{
|
|
||||||
return new GuiComputer<>( container, inventory, component, ComputerCraft.computerTermWidth, ComputerCraft.computerTermHeight );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, Text component )
|
|
||||||
{
|
|
||||||
return new GuiComputer<>( container, inventory, component, ComputerCraft.pocketTermWidth, ComputerCraft.pocketTermHeight );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, PlayerInventory inventory, Text component )
|
|
||||||
{
|
|
||||||
return new GuiComputer<>( container, inventory, component, container.getWidth(), container.getHeight() );
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void initTerminal( int border, int widthExtra, int heightExtra )
|
|
||||||
{
|
|
||||||
client.keyboard.setRepeatEvents( true );
|
|
||||||
|
|
||||||
int termPxWidth = termWidth * FixedWidthFontRenderer.FONT_WIDTH;
|
|
||||||
int termPxHeight = termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
|
|
||||||
|
|
||||||
backgroundWidth = termPxWidth + MARGIN * 2 + border * 2 + widthExtra;
|
|
||||||
backgroundHeight = termPxHeight + MARGIN * 2 + border * 2 + heightExtra;
|
|
||||||
|
|
||||||
super.init();
|
|
||||||
|
|
||||||
terminal = new WidgetTerminal( client, () -> computer, termWidth, termHeight, MARGIN, MARGIN, MARGIN, MARGIN );
|
|
||||||
terminalWrapper = new WidgetWrapper( terminal, MARGIN + border + x, MARGIN + border + y, termPxWidth, termPxHeight );
|
|
||||||
|
|
||||||
children.add( terminalWrapper );
|
|
||||||
setFocused( terminalWrapper );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void init()
|
|
||||||
{
|
|
||||||
initTerminal( BORDER, 0, 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
|
|
||||||
{
|
|
||||||
this.renderBackground( stack );
|
|
||||||
super.render( stack, mouseX, mouseY, partialTicks );
|
|
||||||
drawMouseoverTooltip( stack, mouseX, mouseY );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
// Skip rendering labels.
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawBackground( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
// Draw terminal
|
|
||||||
terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
|
|
||||||
|
|
||||||
// Draw a border around the terminal
|
|
||||||
RenderSystem.color4f( 1, 1, 1, 1 );
|
|
||||||
client.getTextureManager()
|
|
||||||
.bindTexture( ComputerBorderRenderer.getTexture( family ) );
|
|
||||||
ComputerBorderRenderer.render( terminalWrapper.getX() - MARGIN, terminalWrapper.getY() - MARGIN,
|
|
||||||
getZOffset(), terminalWrapper.getWidth() + MARGIN * 2, terminalWrapper.getHeight() + MARGIN * 2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
|
|
||||||
{
|
|
||||||
return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseReleased( double mouseX, double mouseY, int button )
|
|
||||||
{
|
|
||||||
return (getFocused() != null && getFocused().mouseReleased( mouseX, mouseY, button )) || super.mouseReleased( x, y, button );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
// Forward the tab key to the terminal, rather than moving between controls.
|
|
||||||
if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
|
|
||||||
{
|
|
||||||
return getFocused().keyPressed( key, scancode, modifiers );
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.keyPressed( key, scancode, modifiers );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void removed()
|
|
||||||
{
|
|
||||||
super.removed();
|
|
||||||
children.remove( terminal );
|
|
||||||
terminal = null;
|
|
||||||
client.keyboard.setRepeatEvents( false );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void tick()
|
|
||||||
{
|
|
||||||
super.tick();
|
|
||||||
terminal.update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
|
|
||||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class GuiDiskDrive extends HandledScreen<ContainerDiskDrive>
|
|
||||||
{
|
|
||||||
private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/disk_drive.png" );
|
|
||||||
|
|
||||||
public GuiDiskDrive( ContainerDiskDrive container, PlayerInventory player, Text title )
|
|
||||||
{
|
|
||||||
super( container, player, title );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
|
|
||||||
{
|
|
||||||
renderBackground( transform );
|
|
||||||
super.render( transform, mouseX, mouseY, partialTicks );
|
|
||||||
drawMouseoverTooltip( transform, mouseX, mouseY );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
|
||||||
client.getTextureManager()
|
|
||||||
.bindTexture( BACKGROUND );
|
|
||||||
drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
|
|
||||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class GuiPrinter extends HandledScreen<ContainerPrinter>
|
|
||||||
{
|
|
||||||
private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/printer.png" );
|
|
||||||
|
|
||||||
public GuiPrinter( ContainerPrinter container, PlayerInventory player, Text title )
|
|
||||||
{
|
|
||||||
super( container, player, title );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*@Override
|
|
||||||
protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
String title = getTitle().getFormattedText();
|
|
||||||
font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
|
|
||||||
font.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
|
|
||||||
}*/
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
|
|
||||||
{
|
|
||||||
renderBackground( stack );
|
|
||||||
super.render( stack, mouseX, mouseY, partialTicks );
|
|
||||||
drawMouseoverTooltip( stack, mouseX, mouseY );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
|
||||||
client.getTextureManager()
|
|
||||||
.bindTexture( BACKGROUND );
|
|
||||||
drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
|
|
||||||
|
|
||||||
if( getScreenHandler().isPrinting() )
|
|
||||||
{
|
|
||||||
drawTexture( transform, x + 34, y + 21, 176, 0, 25, 45 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.core.terminal.TextBuffer;
|
|
||||||
import dan200.computercraft.shared.common.ContainerHeldItem;
|
|
||||||
import dan200.computercraft.shared.media.items.ItemPrintout;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.render.PrintoutRenderer.*;
|
|
||||||
|
|
||||||
public class GuiPrintout extends HandledScreen<ContainerHeldItem>
|
|
||||||
{
|
|
||||||
private final boolean book;
|
|
||||||
private final int pages;
|
|
||||||
private final TextBuffer[] text;
|
|
||||||
private final TextBuffer[] colours;
|
|
||||||
private int page;
|
|
||||||
|
|
||||||
public GuiPrintout( ContainerHeldItem container, PlayerInventory player, Text title )
|
|
||||||
{
|
|
||||||
super( container, player, title );
|
|
||||||
|
|
||||||
backgroundHeight = Y_SIZE;
|
|
||||||
|
|
||||||
String[] text = ItemPrintout.getText( container.getStack() );
|
|
||||||
this.text = new TextBuffer[text.length];
|
|
||||||
for( int i = 0; i < this.text.length; i++ )
|
|
||||||
{
|
|
||||||
this.text[i] = new TextBuffer( text[i] );
|
|
||||||
}
|
|
||||||
|
|
||||||
String[] colours = ItemPrintout.getColours( container.getStack() );
|
|
||||||
this.colours = new TextBuffer[colours.length];
|
|
||||||
for( int i = 0; i < this.colours.length; i++ )
|
|
||||||
{
|
|
||||||
this.colours[i] = new TextBuffer( colours[i] );
|
|
||||||
}
|
|
||||||
|
|
||||||
page = 0;
|
|
||||||
pages = Math.max( this.text.length / ItemPrintout.LINES_PER_PAGE, 1 );
|
|
||||||
book = ((ItemPrintout) container.getStack()
|
|
||||||
.getItem()).getType() == ItemPrintout.Type.BOOK;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled( double x, double y, double delta )
|
|
||||||
{
|
|
||||||
if( super.mouseScrolled( x, y, delta ) )
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if( delta < 0 )
|
|
||||||
{
|
|
||||||
// Scroll up goes to the next page
|
|
||||||
if( page < pages - 1 )
|
|
||||||
{
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( delta > 0 )
|
|
||||||
{
|
|
||||||
// Scroll down goes to the previous page
|
|
||||||
if( page > 0 )
|
|
||||||
{
|
|
||||||
page--;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
|
|
||||||
{
|
|
||||||
// We must take the background further back in order to not overlap with our printed pages.
|
|
||||||
setZOffset( getZOffset() - 1 );
|
|
||||||
renderBackground( stack );
|
|
||||||
setZOffset( getZOffset() + 1 );
|
|
||||||
|
|
||||||
super.render( stack, mouseX, mouseY, partialTicks );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
// Skip rendering labels.
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
// Draw the printout
|
|
||||||
RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
|
|
||||||
RenderSystem.enableDepthTest();
|
|
||||||
|
|
||||||
VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
|
|
||||||
.getBufferBuilders()
|
|
||||||
.getEntityVertexConsumers();
|
|
||||||
Matrix4f matrix = transform.peek()
|
|
||||||
.getModel();
|
|
||||||
drawBorder( matrix, renderer, x, y, getZOffset(), page, pages, book );
|
|
||||||
drawText( matrix, renderer, x + X_TEXT_MARGIN, y + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
|
|
||||||
renderer.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
if( super.keyPressed( key, scancode, modifiers ) )
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( key == GLFW.GLFW_KEY_RIGHT )
|
|
||||||
{
|
|
||||||
if( page < pages - 1 )
|
|
||||||
{
|
|
||||||
page++;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( key == GLFW.GLFW_KEY_LEFT )
|
|
||||||
{
|
|
||||||
if( page > 0 )
|
|
||||||
{
|
|
||||||
page--;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
||||||
import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerInventory;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class GuiTurtle extends GuiComputer<ContainerTurtle>
|
|
||||||
{
|
|
||||||
private static final Identifier BACKGROUND_NORMAL = new Identifier( "computercraft", "textures/gui/turtle_normal.png" );
|
|
||||||
private static final Identifier BACKGROUND_ADVANCED = new Identifier( "computercraft", "textures/gui/turtle_advanced.png" );
|
|
||||||
private final ContainerTurtle container;
|
|
||||||
|
|
||||||
public GuiTurtle( ContainerTurtle container, PlayerInventory player, Text title )
|
|
||||||
{
|
|
||||||
super( container, player, title, ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight );
|
|
||||||
|
|
||||||
this.container = container;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void init()
|
|
||||||
{
|
|
||||||
initTerminal( 8, 0, 80 );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
|
|
||||||
{
|
|
||||||
// Draw term
|
|
||||||
Identifier texture = family == ComputerFamily.ADVANCED ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
|
|
||||||
terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
|
|
||||||
|
|
||||||
// Draw border/inventory
|
|
||||||
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
|
|
||||||
client.getTextureManager()
|
|
||||||
.bindTexture( texture );
|
|
||||||
drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
|
|
||||||
|
|
||||||
// Draw selection slot
|
|
||||||
int slot = container.getSelectedSlot();
|
|
||||||
if( slot >= 0 )
|
|
||||||
{
|
|
||||||
int slotX = slot % 4;
|
|
||||||
int slotY = slot / 4;
|
|
||||||
drawTexture( transform, x + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, y + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
|
|
||||||
0,
|
|
||||||
217,
|
|
||||||
24,
|
|
||||||
24 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,400 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui.widgets;
|
|
||||||
|
|
||||||
import dan200.computercraft.client.gui.FixedWidthFontRenderer;
|
|
||||||
import dan200.computercraft.core.terminal.Terminal;
|
|
||||||
import dan200.computercraft.shared.computer.core.ClientComputer;
|
|
||||||
import dan200.computercraft.shared.computer.core.IComputer;
|
|
||||||
import net.minecraft.SharedConstants;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.Element;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import java.util.BitSet;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
|
|
||||||
|
|
||||||
public class WidgetTerminal implements Element
|
|
||||||
{
|
|
||||||
private static final float TERMINATE_TIME = 0.5f;
|
|
||||||
|
|
||||||
private final MinecraftClient client;
|
|
||||||
private final Supplier<ClientComputer> computer;
|
|
||||||
private final int termWidth;
|
|
||||||
private final int termHeight;
|
|
||||||
private final int leftMargin;
|
|
||||||
private final int rightMargin;
|
|
||||||
private final int topMargin;
|
|
||||||
private final int bottomMargin;
|
|
||||||
private final BitSet keysDown = new BitSet( 256 );
|
|
||||||
private boolean focused;
|
|
||||||
private float terminateTimer = -1;
|
|
||||||
private float rebootTimer = -1;
|
|
||||||
private float shutdownTimer = -1;
|
|
||||||
private int lastMouseButton = -1;
|
|
||||||
private int lastMouseX = -1;
|
|
||||||
private int lastMouseY = -1;
|
|
||||||
|
|
||||||
public WidgetTerminal( MinecraftClient client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin,
|
|
||||||
int topMargin, int bottomMargin )
|
|
||||||
{
|
|
||||||
this.client = client;
|
|
||||||
this.computer = computer;
|
|
||||||
this.termWidth = termWidth;
|
|
||||||
this.termHeight = termHeight;
|
|
||||||
this.leftMargin = leftMargin;
|
|
||||||
this.rightMargin = rightMargin;
|
|
||||||
this.topMargin = topMargin;
|
|
||||||
this.bottomMargin = bottomMargin;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked( double mouseX, double mouseY, int button )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer == null || !computer.isColour() || button < 0 || button > 2 )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Terminal term = computer.getTerminal();
|
|
||||||
if( term != null )
|
|
||||||
{
|
|
||||||
int charX = (int) (mouseX / FONT_WIDTH);
|
|
||||||
int charY = (int) (mouseY / FONT_HEIGHT);
|
|
||||||
charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
|
|
||||||
charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
|
|
||||||
|
|
||||||
computer.mouseClick( button + 1, charX + 1, charY + 1 );
|
|
||||||
|
|
||||||
lastMouseButton = button;
|
|
||||||
lastMouseX = charX;
|
|
||||||
lastMouseY = charY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseReleased( double mouseX, double mouseY, int button )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer == null || !computer.isColour() || button < 0 || button > 2 )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Terminal term = computer.getTerminal();
|
|
||||||
if( term != null )
|
|
||||||
{
|
|
||||||
int charX = (int) (mouseX / FONT_WIDTH);
|
|
||||||
int charY = (int) (mouseY / FONT_HEIGHT);
|
|
||||||
charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
|
|
||||||
charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
|
|
||||||
|
|
||||||
if( lastMouseButton == button )
|
|
||||||
{
|
|
||||||
computer.mouseUp( lastMouseButton + 1, charX + 1, charY + 1 );
|
|
||||||
lastMouseButton = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
lastMouseX = charX;
|
|
||||||
lastMouseY = charY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseDragged( double mouseX, double mouseY, int button, double v2, double v3 )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer == null || !computer.isColour() || button < 0 || button > 2 )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Terminal term = computer.getTerminal();
|
|
||||||
if( term != null )
|
|
||||||
{
|
|
||||||
int charX = (int) (mouseX / FONT_WIDTH);
|
|
||||||
int charY = (int) (mouseY / FONT_HEIGHT);
|
|
||||||
charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
|
|
||||||
charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
|
|
||||||
|
|
||||||
if( button == lastMouseButton && (charX != lastMouseX || charY != lastMouseY) )
|
|
||||||
{
|
|
||||||
computer.mouseDrag( button + 1, charX + 1, charY + 1 );
|
|
||||||
lastMouseX = charX;
|
|
||||||
lastMouseY = charY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled( double mouseX, double mouseY, double delta )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer == null || !computer.isColour() || delta == 0 )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Terminal term = computer.getTerminal();
|
|
||||||
if( term != null )
|
|
||||||
{
|
|
||||||
int charX = (int) (mouseX / FONT_WIDTH);
|
|
||||||
int charY = (int) (mouseY / FONT_HEIGHT);
|
|
||||||
charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
|
|
||||||
charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
|
|
||||||
|
|
||||||
computer.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
|
|
||||||
|
|
||||||
lastMouseX = charX;
|
|
||||||
lastMouseY = charY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
if( key == GLFW.GLFW_KEY_ESCAPE )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if( (modifiers & GLFW.GLFW_MOD_CONTROL) != 0 )
|
|
||||||
{
|
|
||||||
switch( key )
|
|
||||||
{
|
|
||||||
case GLFW.GLFW_KEY_T:
|
|
||||||
if( terminateTimer < 0 )
|
|
||||||
{
|
|
||||||
terminateTimer = 0;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
case GLFW.GLFW_KEY_S:
|
|
||||||
if( shutdownTimer < 0 )
|
|
||||||
{
|
|
||||||
shutdownTimer = 0;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
case GLFW.GLFW_KEY_R:
|
|
||||||
if( rebootTimer < 0 )
|
|
||||||
{
|
|
||||||
rebootTimer = 0;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case GLFW.GLFW_KEY_V:
|
|
||||||
// Ctrl+V for paste
|
|
||||||
String clipboard = client.keyboard.getClipboard();
|
|
||||||
if( clipboard != null )
|
|
||||||
{
|
|
||||||
// Clip to the first occurrence of \r or \n
|
|
||||||
int newLineIndex1 = clipboard.indexOf( "\r" );
|
|
||||||
int newLineIndex2 = clipboard.indexOf( "\n" );
|
|
||||||
if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
|
|
||||||
{
|
|
||||||
clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
|
|
||||||
}
|
|
||||||
else if( newLineIndex1 >= 0 )
|
|
||||||
{
|
|
||||||
clipboard = clipboard.substring( 0, newLineIndex1 );
|
|
||||||
}
|
|
||||||
else if( newLineIndex2 >= 0 )
|
|
||||||
{
|
|
||||||
clipboard = clipboard.substring( 0, newLineIndex2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Filter the string
|
|
||||||
clipboard = SharedConstants.stripInvalidChars( clipboard );
|
|
||||||
if( !clipboard.isEmpty() )
|
|
||||||
{
|
|
||||||
// Clip to 512 characters and queue the event
|
|
||||||
if( clipboard.length() > 512 )
|
|
||||||
{
|
|
||||||
clipboard = clipboard.substring( 0, 512 );
|
|
||||||
}
|
|
||||||
queueEvent( "paste", clipboard );
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( key >= 0 && terminateTimer < 0 && rebootTimer < 0 && shutdownTimer < 0 )
|
|
||||||
{
|
|
||||||
// Queue the "key" event and add to the down set
|
|
||||||
boolean repeat = keysDown.get( key );
|
|
||||||
keysDown.set( key );
|
|
||||||
IComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.keyDown( key, repeat );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyReleased( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
// Queue the "key_up" event and remove from the down set
|
|
||||||
if( key >= 0 && keysDown.get( key ) )
|
|
||||||
{
|
|
||||||
keysDown.set( key, false );
|
|
||||||
IComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.keyUp( key );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
switch( key )
|
|
||||||
{
|
|
||||||
case GLFW.GLFW_KEY_T:
|
|
||||||
terminateTimer = -1;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_R:
|
|
||||||
rebootTimer = -1;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_S:
|
|
||||||
shutdownTimer = -1;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_LEFT_CONTROL:
|
|
||||||
case GLFW.GLFW_KEY_RIGHT_CONTROL:
|
|
||||||
terminateTimer = rebootTimer = shutdownTimer = -1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean charTyped( char ch, int modifiers )
|
|
||||||
{
|
|
||||||
if( ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255 ) // printable chars in byte range
|
|
||||||
{
|
|
||||||
// Queue the "char" event
|
|
||||||
queueEvent( "char", Character.toString( ch ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean changeFocus( boolean reversed )
|
|
||||||
{
|
|
||||||
if( focused )
|
|
||||||
{
|
|
||||||
// When blurring, we should make all keys go up
|
|
||||||
for( int key = 0; key < keysDown.size(); key++ )
|
|
||||||
{
|
|
||||||
if( keysDown.get( key ) )
|
|
||||||
{
|
|
||||||
queueEvent( "key_up", key );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
keysDown.clear();
|
|
||||||
|
|
||||||
// When blurring, we should make the last mouse button go up
|
|
||||||
if( lastMouseButton > 0 )
|
|
||||||
{
|
|
||||||
IComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.mouseUp( lastMouseButton + 1, lastMouseX + 1, lastMouseY + 1 );
|
|
||||||
}
|
|
||||||
lastMouseButton = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
shutdownTimer = terminateTimer = rebootTimer = -1;
|
|
||||||
}
|
|
||||||
focused = !focused;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isMouseOver( double x, double y )
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void queueEvent( String event, Object... args )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.queueEvent( event, args );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update()
|
|
||||||
{
|
|
||||||
if( terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME )
|
|
||||||
{
|
|
||||||
queueEvent( "terminate" );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.shutdown();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( rebootTimer >= 0 && rebootTimer < TERMINATE_TIME && (rebootTimer += 0.05f) > TERMINATE_TIME )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.reboot();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void queueEvent( String event )
|
|
||||||
{
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
if( computer != null )
|
|
||||||
{
|
|
||||||
computer.queueEvent( event );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void draw( int originX, int originY )
|
|
||||||
{
|
|
||||||
synchronized( computer )
|
|
||||||
{
|
|
||||||
// Draw the screen contents
|
|
||||||
ClientComputer computer = this.computer.get();
|
|
||||||
Terminal terminal = computer != null ? computer.getTerminal() : null;
|
|
||||||
if( terminal != null )
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawTerminal( originX, originY, terminal, !computer.isColour(), topMargin, bottomMargin, leftMargin,
|
|
||||||
rightMargin );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawEmptyTerminal( originX - leftMargin,
|
|
||||||
originY - rightMargin, termWidth * FONT_WIDTH + leftMargin + rightMargin,
|
|
||||||
termHeight * FONT_HEIGHT + topMargin + bottomMargin );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.gui.widgets;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.Element;
|
|
||||||
|
|
||||||
public class WidgetWrapper implements Element
|
|
||||||
{
|
|
||||||
private final Element listener;
|
|
||||||
private final int x;
|
|
||||||
private final int y;
|
|
||||||
private final int width;
|
|
||||||
private final int height;
|
|
||||||
|
|
||||||
public WidgetWrapper( Element listener, int x, int y, int width, int height )
|
|
||||||
{
|
|
||||||
this.listener = listener;
|
|
||||||
this.x = x;
|
|
||||||
this.y = y;
|
|
||||||
this.width = width;
|
|
||||||
this.height = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked( double x, double y, int button )
|
|
||||||
{
|
|
||||||
double dx = x - this.x, dy = y - this.y;
|
|
||||||
return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseClicked( dx, dy, button );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseReleased( double x, double y, int button )
|
|
||||||
{
|
|
||||||
double dx = x - this.x, dy = y - this.y;
|
|
||||||
return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseReleased( dx, dy, button );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
|
|
||||||
{
|
|
||||||
double dx = x - this.x, dy = y - this.y;
|
|
||||||
return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseDragged( dx, dy, button, deltaX, deltaY );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled( double x, double y, double delta )
|
|
||||||
{
|
|
||||||
double dx = x - this.x, dy = y - this.y;
|
|
||||||
return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseScrolled( dx, dy, delta );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyPressed( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
return listener.keyPressed( key, scancode, modifiers );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyReleased( int key, int scancode, int modifiers )
|
|
||||||
{
|
|
||||||
return listener.keyReleased( key, scancode, modifiers );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean charTyped( char character, int modifiers )
|
|
||||||
{
|
|
||||||
return listener.charTyped( character, modifiers );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean changeFocus( boolean b )
|
|
||||||
{
|
|
||||||
return listener.changeFocus( b );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isMouseOver( double x, double y )
|
|
||||||
{
|
|
||||||
double dx = x - this.x, dy = y - this.y;
|
|
||||||
return dx >= 0 && dx < width && dy >= 0 && dy < height;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getX()
|
|
||||||
{
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getY()
|
|
||||||
{
|
|
||||||
return y;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getWidth()
|
|
||||||
{
|
|
||||||
return width;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getHeight()
|
|
||||||
{
|
|
||||||
return height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.proxy;
|
|
||||||
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.client.ClientRegistry;
|
|
||||||
import dan200.computercraft.client.FrameInfo;
|
|
||||||
import dan200.computercraft.client.gui.*;
|
|
||||||
import dan200.computercraft.client.render.TileEntityMonitorRenderer;
|
|
||||||
import dan200.computercraft.client.render.TileEntityTurtleRenderer;
|
|
||||||
import dan200.computercraft.client.render.TurtleModelLoader;
|
|
||||||
import dan200.computercraft.client.render.TurtlePlayerRenderer;
|
|
||||||
import dan200.computercraft.fabric.events.ClientUnloadWorldEvent;
|
|
||||||
import dan200.computercraft.shared.ComputerCraftRegistry;
|
|
||||||
import dan200.computercraft.shared.common.ContainerHeldItem;
|
|
||||||
import dan200.computercraft.shared.common.IColouredItem;
|
|
||||||
import dan200.computercraft.shared.common.TileGeneric;
|
|
||||||
import dan200.computercraft.shared.computer.inventory.ContainerComputer;
|
|
||||||
import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
|
|
||||||
import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
|
|
||||||
import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
|
|
||||||
import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
|
|
||||||
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
|
|
||||||
import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
|
|
||||||
import dan200.computercraft.shared.util.Config;
|
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
|
|
||||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientBlockEntityEvents;
|
|
||||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
|
|
||||||
import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
|
|
||||||
import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
|
|
||||||
import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
|
|
||||||
import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
|
|
||||||
import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
|
|
||||||
import net.fabricmc.fabric.mixin.object.builder.ModelPredicateProviderRegistrySpecificAccessor;
|
|
||||||
import net.minecraft.client.item.ModelPredicateProvider;
|
|
||||||
import net.minecraft.client.render.RenderLayer;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.screen.PlayerScreenHandler;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class ComputerCraftProxyClient implements ClientModInitializer
|
|
||||||
{
|
|
||||||
|
|
||||||
private static void initEvents()
|
|
||||||
{
|
|
||||||
ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register( ( blockEntity, world ) -> {
|
|
||||||
if( blockEntity instanceof TileGeneric )
|
|
||||||
{
|
|
||||||
((TileGeneric) blockEntity).onChunkUnloaded();
|
|
||||||
}
|
|
||||||
} );
|
|
||||||
|
|
||||||
ClientUnloadWorldEvent.EVENT.register( () -> ClientMonitor.destroyAll() );
|
|
||||||
|
|
||||||
// Config
|
|
||||||
ClientLifecycleEvents.CLIENT_STARTED.register( Config::clientStarted );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInitializeClient()
|
|
||||||
{
|
|
||||||
FrameInfo.init();
|
|
||||||
registerContainers();
|
|
||||||
|
|
||||||
// While turtles themselves are not transparent, their upgrades may be.
|
|
||||||
BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL, RenderLayer.getTranslucent() );
|
|
||||||
BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED, RenderLayer.getTranslucent() );
|
|
||||||
|
|
||||||
// Monitors' textures have transparent fronts and so count as cutouts.
|
|
||||||
BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.MONITOR_NORMAL, RenderLayer.getCutout() );
|
|
||||||
BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.MONITOR_ADVANCED, RenderLayer.getCutout() );
|
|
||||||
|
|
||||||
// Setup TESRs
|
|
||||||
BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.MONITOR_NORMAL, TileEntityMonitorRenderer::new );
|
|
||||||
BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.MONITOR_ADVANCED, TileEntityMonitorRenderer::new );
|
|
||||||
BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.TURTLE_NORMAL, TileEntityTurtleRenderer::new );
|
|
||||||
BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.TURTLE_ADVANCED, TileEntityTurtleRenderer::new );
|
|
||||||
|
|
||||||
ClientSpriteRegistryCallback.event( PlayerScreenHandler.BLOCK_ATLAS_TEXTURE )
|
|
||||||
.register( ClientRegistry::onTextureStitchEvent );
|
|
||||||
ModelLoadingRegistry.INSTANCE.registerAppender( ClientRegistry::onModelBakeEvent );
|
|
||||||
ModelLoadingRegistry.INSTANCE.registerResourceProvider( loader -> ( name, context ) -> TurtleModelLoader.INSTANCE.accepts( name ) ?
|
|
||||||
TurtleModelLoader.INSTANCE.loadModel(
|
|
||||||
name ) : null );
|
|
||||||
|
|
||||||
EntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModEntities.TURTLE_PLAYER, TurtlePlayerRenderer::new );
|
|
||||||
|
|
||||||
registerItemProperty( "state",
|
|
||||||
( stack, world, player ) -> ItemPocketComputer.getState( stack )
|
|
||||||
.ordinal(),
|
|
||||||
() -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
|
|
||||||
() -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
|
|
||||||
registerItemProperty( "state",
|
|
||||||
( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
|
|
||||||
() -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
|
|
||||||
() -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
|
|
||||||
ClientRegistry.onItemColours();
|
|
||||||
|
|
||||||
initEvents();
|
|
||||||
}
|
|
||||||
|
|
||||||
// My IDE doesn't think so, but we do actually need these generics.
|
|
||||||
private static void registerContainers()
|
|
||||||
{
|
|
||||||
ScreenRegistry.<ContainerComputer, GuiComputer<ContainerComputer>>register( ComputerCraftRegistry.ModContainers.COMPUTER, GuiComputer::create );
|
|
||||||
ScreenRegistry.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( ComputerCraftRegistry.ModContainers.POCKET_COMPUTER,
|
|
||||||
GuiComputer::createPocket );
|
|
||||||
ScreenRegistry.<ContainerTurtle, GuiTurtle>register( ComputerCraftRegistry.ModContainers.TURTLE, GuiTurtle::new );
|
|
||||||
|
|
||||||
ScreenRegistry.<ContainerPrinter, GuiPrinter>register( ComputerCraftRegistry.ModContainers.PRINTER, GuiPrinter::new );
|
|
||||||
ScreenRegistry.<ContainerDiskDrive, GuiDiskDrive>register( ComputerCraftRegistry.ModContainers.DISK_DRIVE, GuiDiskDrive::new );
|
|
||||||
ScreenRegistry.<ContainerHeldItem, GuiPrintout>register( ComputerCraftRegistry.ModContainers.PRINTOUT, GuiPrintout::new );
|
|
||||||
|
|
||||||
ScreenRegistry.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( ComputerCraftRegistry.ModContainers.VIEW_COMPUTER,
|
|
||||||
GuiComputer::createView );
|
|
||||||
}
|
|
||||||
|
|
||||||
@SafeVarargs
|
|
||||||
private static void registerItemProperty( String name, ModelPredicateProvider getter, Supplier<? extends Item>... items )
|
|
||||||
{
|
|
||||||
Identifier id = new Identifier( ComputerCraft.MOD_ID, name );
|
|
||||||
for( Supplier<? extends Item> item : items )
|
|
||||||
{
|
|
||||||
ModelPredicateProviderRegistrySpecificAccessor.callRegister( item.get(), id, getter );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.shared.ComputerCraftRegistry;
|
|
||||||
import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
|
|
||||||
import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
|
|
||||||
import dan200.computercraft.shared.util.WorldUtil;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.Camera;
|
|
||||||
import net.minecraft.client.render.VertexConsumer;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.util.shape.VoxelShape;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class CableHighlightRenderer
|
|
||||||
{
|
|
||||||
private CableHighlightRenderer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean drawHighlight( MatrixStack stack, VertexConsumer consumer, Entity entity, double d, double e, double f, BlockPos pos,
|
|
||||||
BlockState state )
|
|
||||||
{
|
|
||||||
Camera info = MinecraftClient.getInstance().gameRenderer.getCamera();
|
|
||||||
|
|
||||||
// We only care about instances with both cable and modem.
|
|
||||||
if( state.getBlock() != ComputerCraftRegistry.ModBlocks.CABLE || state.get( BlockCable.MODEM )
|
|
||||||
.getFacing() == null || !state.get( BlockCable.CABLE ) )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ),
|
|
||||||
new Vec3d( d, e, f ).subtract( pos.getX(),
|
|
||||||
pos.getY(),
|
|
||||||
pos.getZ() ) ) ? CableShapes.getModemShape( state ) : CableShapes.getCableShape(
|
|
||||||
state );
|
|
||||||
|
|
||||||
Vec3d cameraPos = info.getPos();
|
|
||||||
double xOffset = pos.getX() - cameraPos.getX();
|
|
||||||
double yOffset = pos.getY() - cameraPos.getY();
|
|
||||||
double zOffset = pos.getZ() - cameraPos.getZ();
|
|
||||||
Matrix4f matrix4f = stack.peek()
|
|
||||||
.getModel();
|
|
||||||
shape.forEachEdge( ( x1, y1, z1, x2, y2, z2 ) -> {
|
|
||||||
consumer.vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
|
|
||||||
.color( 0, 0, 0, 0.4f )
|
|
||||||
.next();
|
|
||||||
consumer.vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
|
|
||||||
.color( 0, 0, 0, 0.4f )
|
|
||||||
.next();
|
|
||||||
} );
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,174 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
||||||
import net.minecraft.client.render.BufferBuilder;
|
|
||||||
import net.minecraft.client.render.Tessellator;
|
|
||||||
import net.minecraft.client.render.VertexConsumer;
|
|
||||||
import net.minecraft.client.render.VertexFormats;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class ComputerBorderRenderer
|
|
||||||
{
|
|
||||||
public static final Identifier BACKGROUND_NORMAL = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_normal.png" );
|
|
||||||
public static final Identifier BACKGROUND_ADVANCED = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
|
|
||||||
public static final Identifier BACKGROUND_COMMAND = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
|
|
||||||
public static final Identifier BACKGROUND_COLOUR = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
|
|
||||||
/**
|
|
||||||
* The margin between the terminal and its border.
|
|
||||||
*/
|
|
||||||
public static final int MARGIN = 2;
|
|
||||||
/**
|
|
||||||
* The width of the terminal border.
|
|
||||||
*/
|
|
||||||
public static final int BORDER = 12;
|
|
||||||
private static final Matrix4f IDENTITY = new Matrix4f();
|
|
||||||
private static final int CORNER_TOP_Y = 28;
|
|
||||||
private static final int CORNER_BOTTOM_Y = CORNER_TOP_Y + BORDER;
|
|
||||||
private static final int CORNER_LEFT_X = BORDER;
|
|
||||||
private static final int CORNER_RIGHT_X = CORNER_LEFT_X + BORDER;
|
|
||||||
private static final int BORDER_RIGHT_X = 36;
|
|
||||||
private static final int LIGHT_BORDER_Y = 56;
|
|
||||||
private static final int LIGHT_CORNER_Y = 80;
|
|
||||||
|
|
||||||
public static final int LIGHT_HEIGHT = 8;
|
|
||||||
private static final float TEX_SCALE = 1 / 256.0f;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
IDENTITY.loadIdentity();
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Matrix4f transform;
|
|
||||||
private final VertexConsumer builder;
|
|
||||||
private final int z;
|
|
||||||
private final float r, g, b;
|
|
||||||
|
|
||||||
public ComputerBorderRenderer( Matrix4f transform, VertexConsumer builder, int z, float r, float g, float b )
|
|
||||||
{
|
|
||||||
this.transform = transform;
|
|
||||||
this.builder = builder;
|
|
||||||
this.z = z;
|
|
||||||
this.r = r;
|
|
||||||
this.g = g;
|
|
||||||
this.b = b;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
public static Identifier getTexture( @Nonnull ComputerFamily family )
|
|
||||||
{
|
|
||||||
switch( family )
|
|
||||||
{
|
|
||||||
case NORMAL:
|
|
||||||
default:
|
|
||||||
return BACKGROUND_NORMAL;
|
|
||||||
case ADVANCED:
|
|
||||||
return BACKGROUND_ADVANCED;
|
|
||||||
case COMMAND:
|
|
||||||
return BACKGROUND_COMMAND;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void render( int x, int y, int z, int width, int height )
|
|
||||||
{
|
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
|
||||||
BufferBuilder buffer = tessellator.getBuffer();
|
|
||||||
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE );
|
|
||||||
|
|
||||||
render( IDENTITY, buffer, x, y, z, width, height );
|
|
||||||
|
|
||||||
RenderSystem.enableAlphaTest();
|
|
||||||
tessellator.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height )
|
|
||||||
{
|
|
||||||
render( transform, buffer, x, y, z, width, height, 1, 1, 1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, float r, float g, float b )
|
|
||||||
{
|
|
||||||
render( transform, buffer, x, y, z, width, height, false, r, g, b );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, boolean withLight, float r, float g, float b )
|
|
||||||
{
|
|
||||||
new ComputerBorderRenderer( transform, buffer, z, r, g, b ).doRender( x, y, width, height, withLight );
|
|
||||||
}
|
|
||||||
|
|
||||||
public void doRender( int x, int y, int width, int height, boolean withLight )
|
|
||||||
{
|
|
||||||
int endX = x + width;
|
|
||||||
int endY = y + height;
|
|
||||||
|
|
||||||
// Vertical bars
|
|
||||||
renderLine( x - BORDER, y, 0, CORNER_TOP_Y, BORDER, endY - y );
|
|
||||||
renderLine( endX, y, BORDER_RIGHT_X, CORNER_TOP_Y, BORDER, endY - y );
|
|
||||||
|
|
||||||
// Top bar
|
|
||||||
renderLine( x, y - BORDER, 0, 0, endX - x, BORDER );
|
|
||||||
renderCorner( x - BORDER, y - BORDER, CORNER_LEFT_X, CORNER_TOP_Y );
|
|
||||||
renderCorner( endX, y - BORDER, CORNER_RIGHT_X, CORNER_TOP_Y );
|
|
||||||
|
|
||||||
// Bottom bar. We allow for drawing a stretched version, which allows for additional elements (such as the
|
|
||||||
// pocket computer's lights).
|
|
||||||
if( withLight )
|
|
||||||
{
|
|
||||||
renderTexture( x, endY, 0, LIGHT_BORDER_Y, endX - x, BORDER + LIGHT_HEIGHT, BORDER, BORDER + LIGHT_HEIGHT );
|
|
||||||
renderTexture( x - BORDER, endY, CORNER_LEFT_X, LIGHT_CORNER_Y, BORDER, BORDER + LIGHT_HEIGHT );
|
|
||||||
renderTexture( endX, endY, CORNER_RIGHT_X, LIGHT_CORNER_Y, BORDER, BORDER + LIGHT_HEIGHT );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
renderLine( x, endY, 0, BORDER, endX - x, BORDER );
|
|
||||||
renderCorner( x - BORDER, endY, CORNER_LEFT_X, CORNER_BOTTOM_Y );
|
|
||||||
renderCorner( endX, endY, CORNER_RIGHT_X, CORNER_BOTTOM_Y );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void renderLine( int x, int y, int u, int v, int width, int height )
|
|
||||||
{
|
|
||||||
renderTexture( x, y, u, v, width, height, BORDER, BORDER );
|
|
||||||
}
|
|
||||||
|
|
||||||
private void renderCorner( int x, int y, int u, int v )
|
|
||||||
{
|
|
||||||
renderTexture( x, y, u, v, BORDER, BORDER, BORDER, BORDER );
|
|
||||||
}
|
|
||||||
|
|
||||||
private void renderTexture( int x, int y, int u, int v, int width, int height )
|
|
||||||
{
|
|
||||||
renderTexture( x, y, u, v, width, height, width, height );
|
|
||||||
}
|
|
||||||
|
|
||||||
private void renderTexture( int x, int y, int u, int v, int width, int height, int textureWidth, int textureHeight )
|
|
||||||
{
|
|
||||||
builder.vertex( transform, x, y + height, z )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( u * TEX_SCALE, (v + textureHeight) * TEX_SCALE )
|
|
||||||
.next();
|
|
||||||
builder.vertex( transform, x + width, y + height, z )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( (u + textureWidth) * TEX_SCALE, (v + textureHeight) * TEX_SCALE )
|
|
||||||
.next();
|
|
||||||
builder.vertex( transform, x + width, y, z )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( (u + textureWidth) * TEX_SCALE, v * TEX_SCALE )
|
|
||||||
.next();
|
|
||||||
builder.vertex( transform, x, y, z )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.texture( u * TEX_SCALE, v * TEX_SCALE )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.fabric.mixin.HeldItemRendererAccess;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.render.item.HeldItemRenderer;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Arm;
|
|
||||||
import net.minecraft.util.Hand;
|
|
||||||
import net.minecraft.util.math.MathHelper;
|
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public abstract class ItemMapLikeRenderer
|
|
||||||
{
|
|
||||||
public void renderItemFirstPerson(
|
|
||||||
MatrixStack transform, VertexConsumerProvider render, int lightTexture, Hand hand, float pitch, float equipProgress,
|
|
||||||
float swingProgress, ItemStack stack
|
|
||||||
)
|
|
||||||
{
|
|
||||||
PlayerEntity player = MinecraftClient.getInstance().player;
|
|
||||||
|
|
||||||
transform.push();
|
|
||||||
if( hand == Hand.MAIN_HAND && player.getOffHandStack().isEmpty() )
|
|
||||||
{
|
|
||||||
renderItemFirstPersonCenter( transform, render, lightTexture, pitch, equipProgress, swingProgress, stack );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
renderItemFirstPersonSide( transform,
|
|
||||||
render,
|
|
||||||
lightTexture,
|
|
||||||
hand == Hand.MAIN_HAND ? player.getMainArm() : player.getMainArm().getOpposite(),
|
|
||||||
equipProgress,
|
|
||||||
swingProgress,
|
|
||||||
stack );
|
|
||||||
}
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Render an item in the middle of the screen.
|
|
||||||
*
|
|
||||||
* @param transform The matrix transformation stack
|
|
||||||
* @param render The buffer to render to
|
|
||||||
* @param combinedLight The current light level
|
|
||||||
* @param pitch The pitch of the player
|
|
||||||
* @param equipProgress The equip progress of this item
|
|
||||||
* @param swingProgress The swing progress of this item
|
|
||||||
* @param stack The stack to render
|
|
||||||
*/
|
|
||||||
private void renderItemFirstPersonCenter( MatrixStack transform, VertexConsumerProvider render, int combinedLight, float pitch, float equipProgress,
|
|
||||||
float swingProgress, ItemStack stack )
|
|
||||||
{
|
|
||||||
MinecraftClient minecraft = MinecraftClient.getInstance();
|
|
||||||
HeldItemRenderer renderer = minecraft.getHeldItemRenderer();
|
|
||||||
|
|
||||||
// Setup the appropriate transformations. This is just copied from the
|
|
||||||
// corresponding method in ItemRenderer.
|
|
||||||
float swingRt = MathHelper.sqrt( swingProgress );
|
|
||||||
float tX = -0.2f * MathHelper.sin( swingProgress * (float) Math.PI );
|
|
||||||
float tZ = -0.4f * MathHelper.sin( swingRt * (float) Math.PI );
|
|
||||||
transform.translate( 0, -tX / 2, tZ );
|
|
||||||
|
|
||||||
HeldItemRendererAccess access = (HeldItemRendererAccess) renderer;
|
|
||||||
float pitchAngle = access.callGetMapAngle( pitch );
|
|
||||||
transform.translate( 0, 0.04F + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_X.getDegreesQuaternion( pitchAngle * -85.0f ) );
|
|
||||||
if( !minecraft.player.isInvisible() )
|
|
||||||
{
|
|
||||||
transform.push();
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Y.getDegreesQuaternion( 90.0F ) );
|
|
||||||
access.callRenderArm( transform, render, combinedLight, Arm.RIGHT );
|
|
||||||
access.callRenderArm( transform, render, combinedLight, Arm.LEFT );
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
float rX = MathHelper.sin( swingRt * (float) Math.PI );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_X.getDegreesQuaternion( rX * 20.0F ) );
|
|
||||||
transform.scale( 2.0F, 2.0F, 2.0F );
|
|
||||||
|
|
||||||
renderItem( transform, render, stack );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Renders the item to one side of the player.
|
|
||||||
*
|
|
||||||
* @param transform The matrix transformation stack
|
|
||||||
* @param render The buffer to render to
|
|
||||||
* @param combinedLight The current light level
|
|
||||||
* @param side The side to render on
|
|
||||||
* @param equipProgress The equip progress of this item
|
|
||||||
* @param swingProgress The swing progress of this item
|
|
||||||
* @param stack The stack to render
|
|
||||||
*/
|
|
||||||
private void renderItemFirstPersonSide( MatrixStack transform, VertexConsumerProvider render, int combinedLight, Arm side, float equipProgress,
|
|
||||||
float swingProgress, ItemStack stack )
|
|
||||||
{
|
|
||||||
MinecraftClient minecraft = MinecraftClient.getInstance();
|
|
||||||
float offset = side == Arm.RIGHT ? 1f : -1f;
|
|
||||||
transform.translate( offset * 0.125f, -0.125f, 0f );
|
|
||||||
|
|
||||||
// If the player is not invisible then render a single arm
|
|
||||||
if( !minecraft.player.isInvisible() )
|
|
||||||
{
|
|
||||||
transform.push();
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Z.getDegreesQuaternion( offset * 10f ) );
|
|
||||||
((HeldItemRendererAccess) minecraft.getHeldItemRenderer())
|
|
||||||
.callRenderArmHoldingItem( transform, render, combinedLight, equipProgress, swingProgress, side );
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup the appropriate transformations. This is just copied from the
|
|
||||||
// corresponding method in ItemRenderer.
|
|
||||||
transform.push();
|
|
||||||
transform.translate( offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f );
|
|
||||||
float f1 = MathHelper.sqrt( swingProgress );
|
|
||||||
float f2 = MathHelper.sin( f1 * (float) Math.PI );
|
|
||||||
float f3 = -0.5f * f2;
|
|
||||||
float f4 = 0.4f * MathHelper.sin( f1 * ((float) Math.PI * 2f) );
|
|
||||||
float f5 = -0.3f * MathHelper.sin( swingProgress * (float) Math.PI );
|
|
||||||
transform.translate( offset * f3, f4 - 0.3f * f2, f5 );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_X.getDegreesQuaternion( f2 * -45f ) );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Y.getDegreesQuaternion( offset * f2 * -30f ) );
|
|
||||||
|
|
||||||
renderItem( transform, render, stack );
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The main rendering method for the item.
|
|
||||||
*
|
|
||||||
* @param transform The matrix transformation stack
|
|
||||||
* @param render The buffer to render to
|
|
||||||
* @param stack The stack to render
|
|
||||||
*/
|
|
||||||
protected abstract void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack );
|
|
||||||
}
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.client.gui.FixedWidthFontRenderer;
|
|
||||||
import dan200.computercraft.core.terminal.Terminal;
|
|
||||||
import dan200.computercraft.shared.computer.core.ClientComputer;
|
|
||||||
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
||||||
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
|
|
||||||
import dan200.computercraft.shared.util.Colour;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.BufferBuilder;
|
|
||||||
import net.minecraft.client.render.Tessellator;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.render.VertexFormats;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
|
|
||||||
import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emulates map rendering for pocket computers.
|
|
||||||
*/
|
|
||||||
public final class ItemPocketRenderer extends ItemMapLikeRenderer
|
|
||||||
{
|
|
||||||
public static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
|
|
||||||
|
|
||||||
private ItemPocketRenderer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
|
|
||||||
{
|
|
||||||
ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
|
|
||||||
Terminal terminal = computer == null ? null : computer.getTerminal();
|
|
||||||
|
|
||||||
int termWidth, termHeight;
|
|
||||||
if( terminal == null )
|
|
||||||
{
|
|
||||||
termWidth = ComputerCraft.pocketTermWidth;
|
|
||||||
termHeight = ComputerCraft.pocketTermHeight;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
termWidth = terminal.getWidth();
|
|
||||||
termHeight = terminal.getHeight();
|
|
||||||
}
|
|
||||||
|
|
||||||
int width = termWidth * FONT_WIDTH + MARGIN * 2;
|
|
||||||
int height = termHeight * FONT_HEIGHT + MARGIN * 2;
|
|
||||||
|
|
||||||
// Setup various transformations. Note that these are partially adapted from the corresponding method
|
|
||||||
// in ItemRenderer
|
|
||||||
transform.push();
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Y.getDegreesQuaternion( 180f ) );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
|
|
||||||
transform.scale( 0.5f, 0.5f, 0.5f );
|
|
||||||
|
|
||||||
float scale = 0.75f / Math.max( width + BORDER * 2, height + BORDER * 2 + LIGHT_HEIGHT );
|
|
||||||
transform.scale( scale, scale, 0 );
|
|
||||||
transform.translate( -0.5 * width, -0.5 * height, 0 );
|
|
||||||
|
|
||||||
// Render the main frame
|
|
||||||
ItemPocketComputer item = (ItemPocketComputer) stack.getItem();
|
|
||||||
ComputerFamily family = item.getFamily();
|
|
||||||
int frameColour = item.getColour( stack );
|
|
||||||
|
|
||||||
Matrix4f matrix = transform.peek()
|
|
||||||
.getModel();
|
|
||||||
renderFrame( matrix, family, frameColour, width, height );
|
|
||||||
|
|
||||||
// Render the light
|
|
||||||
int lightColour = ItemPocketComputer.getLightState( stack );
|
|
||||||
if( lightColour == -1 )
|
|
||||||
{
|
|
||||||
lightColour = Colour.BLACK.getHex();
|
|
||||||
}
|
|
||||||
renderLight( matrix, lightColour, width, height );
|
|
||||||
|
|
||||||
if( computer != null && terminal != null )
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawTerminal( matrix, MARGIN, MARGIN, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawEmptyTerminal( matrix, 0, 0, width, height );
|
|
||||||
}
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void renderFrame( Matrix4f transform, ComputerFamily family, int colour, int width, int height )
|
|
||||||
{
|
|
||||||
RenderSystem.enableBlend();
|
|
||||||
MinecraftClient.getInstance()
|
|
||||||
.getTextureManager()
|
|
||||||
.bindTexture( colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture( family ) );
|
|
||||||
|
|
||||||
float r = ((colour >>> 16) & 0xFF) / 255.0f;
|
|
||||||
float g = ((colour >>> 8) & 0xFF) / 255.0f;
|
|
||||||
float b = (colour & 0xFF) / 255.0f;
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
|
||||||
BufferBuilder buffer = tessellator.getBuffer();
|
|
||||||
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE );
|
|
||||||
|
|
||||||
ComputerBorderRenderer.render( transform, buffer, 0, 0, 0, width, height, true, r, g, b );
|
|
||||||
|
|
||||||
tessellator.draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void renderLight( Matrix4f transform, int colour, int width, int height )
|
|
||||||
{
|
|
||||||
RenderSystem.disableTexture();
|
|
||||||
|
|
||||||
float r = ((colour >>> 16) & 0xFF) / 255.0f;
|
|
||||||
float g = ((colour >>> 8) & 0xFF) / 255.0f;
|
|
||||||
float b = (colour & 0xFF) / 255.0f;
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
|
||||||
BufferBuilder buffer = tessellator.getBuffer();
|
|
||||||
buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR );
|
|
||||||
buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, width, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, width, height + BORDER / 2.0f, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + BORDER / 2.0f, 0 )
|
|
||||||
.color( r, g, b, 1.0f )
|
|
||||||
.next();
|
|
||||||
|
|
||||||
tessellator.draw();
|
|
||||||
RenderSystem.enableTexture();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.shared.media.items.ItemPrintout;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
|
|
||||||
import static dan200.computercraft.client.render.PrintoutRenderer.*;
|
|
||||||
import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
|
|
||||||
import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Emulates map and item-frame rendering for printouts.
|
|
||||||
*/
|
|
||||||
public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
|
|
||||||
{
|
|
||||||
public static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();
|
|
||||||
|
|
||||||
private ItemPrintoutRenderer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
|
|
||||||
{
|
|
||||||
transform.multiply( Vec3f.POSITIVE_X.getDegreesQuaternion( 180f ) );
|
|
||||||
transform.scale( 0.42f, 0.42f, -0.42f );
|
|
||||||
transform.translate( -0.5f, -0.48f, 0.0f );
|
|
||||||
|
|
||||||
drawPrintout( transform, render, stack );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawPrintout( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
|
|
||||||
{
|
|
||||||
int pages = ItemPrintout.getPageCount( stack );
|
|
||||||
boolean book = ((ItemPrintout) stack.getItem()).getType() == ItemPrintout.Type.BOOK;
|
|
||||||
|
|
||||||
double width = LINE_MAX_LENGTH * FONT_WIDTH + X_TEXT_MARGIN * 2;
|
|
||||||
double height = LINES_PER_PAGE * FONT_HEIGHT + Y_TEXT_MARGIN * 2;
|
|
||||||
|
|
||||||
// Non-books will be left aligned
|
|
||||||
if( !book )
|
|
||||||
{
|
|
||||||
width += offsetAt( pages );
|
|
||||||
}
|
|
||||||
|
|
||||||
double visualWidth = width, visualHeight = height;
|
|
||||||
|
|
||||||
// Meanwhile books will be centred
|
|
||||||
if( book )
|
|
||||||
{
|
|
||||||
visualWidth += 2 * COVER_SIZE + 2 * offsetAt( pages );
|
|
||||||
visualHeight += 2 * COVER_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
double max = Math.max( visualHeight, visualWidth );
|
|
||||||
|
|
||||||
// Scale the printout to fit correctly.
|
|
||||||
float scale = (float) (1.0 / max);
|
|
||||||
transform.scale( scale, scale, scale );
|
|
||||||
transform.translate( (max - width) / 2.0, (max - height) / 2.0, 0.0 );
|
|
||||||
|
|
||||||
Matrix4f matrix = transform.peek()
|
|
||||||
.getModel();
|
|
||||||
drawBorder( matrix, render, 0, 0, -0.01f, 0, pages, book );
|
|
||||||
drawText( matrix, render, X_TEXT_MARGIN, Y_TEXT_MARGIN, 0, ItemPrintout.getText( stack ), ItemPrintout.getColours( stack ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean renderInFrame( MatrixStack matrixStack, VertexConsumerProvider consumerProvider, ItemStack stack )
|
|
||||||
{
|
|
||||||
if( !(stack.getItem() instanceof ItemPrintout) )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Move a little bit forward to ensure we're not clipping with the frame
|
|
||||||
matrixStack.translate( 0.0f, 0.0f, -0.001f );
|
|
||||||
matrixStack.multiply( Vec3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
|
|
||||||
matrixStack.scale( 0.95f, 0.95f, -0.95f );
|
|
||||||
matrixStack.translate( -0.5f, -0.5f, 0.0f );
|
|
||||||
|
|
||||||
drawPrintout( matrixStack, consumerProvider, stack );
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.fabric.mixin.BakedQuadAccess;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.render.VertexFormat;
|
|
||||||
import net.minecraft.client.render.VertexFormatElement;
|
|
||||||
import net.minecraft.client.render.VertexFormats;
|
|
||||||
import net.minecraft.client.render.model.BakedQuad;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vector4f;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Transforms vertices of a model, remaining aware of winding order, and rearranging vertices if needed.
|
|
||||||
*/
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class ModelTransformer
|
|
||||||
{
|
|
||||||
private static final Matrix4f identity;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
identity = new Matrix4f();
|
|
||||||
identity.loadIdentity();
|
|
||||||
}
|
|
||||||
|
|
||||||
private ModelTransformer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void transformQuadsTo( List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
|
|
||||||
{
|
|
||||||
transformQuadsTo( VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, output, input, transform );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void transformQuadsTo( VertexFormat format, List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
|
|
||||||
{
|
|
||||||
if( transform == null || transform.equals( identity ) )
|
|
||||||
{
|
|
||||||
output.addAll( input );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for( BakedQuad quad : input )
|
|
||||||
{
|
|
||||||
output.add( doTransformQuad( format, quad, transform ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static BakedQuad doTransformQuad( VertexFormat format, BakedQuad quad, Matrix4f transform )
|
|
||||||
{
|
|
||||||
int[] vertexData = quad.getVertexData().clone();
|
|
||||||
BakedQuad copy = new BakedQuad( vertexData, -1, quad.getFace(), ((BakedQuadAccess) quad).getSprite(), true );
|
|
||||||
|
|
||||||
int offsetBytes = 0;
|
|
||||||
for( int v = 0; v < 4; ++v )
|
|
||||||
{
|
|
||||||
for( VertexFormatElement element : format.getElements() ) // For each vertex element
|
|
||||||
{
|
|
||||||
int start = offsetBytes / Integer.BYTES;
|
|
||||||
if( element.getType() == VertexFormatElement.Type.POSITION && element.getDataType() == VertexFormatElement.DataType.FLOAT ) // When we find a position element
|
|
||||||
{
|
|
||||||
Vector4f pos = new Vector4f( Float.intBitsToFloat( vertexData[start] ),
|
|
||||||
Float.intBitsToFloat( vertexData[start + 1] ),
|
|
||||||
Float.intBitsToFloat( vertexData[start + 2] ),
|
|
||||||
1 );
|
|
||||||
|
|
||||||
// Transform the position
|
|
||||||
pos.transform( transform );
|
|
||||||
|
|
||||||
// Insert the position
|
|
||||||
vertexData[start] = Float.floatToRawIntBits( pos.getX() );
|
|
||||||
vertexData[start + 1] = Float.floatToRawIntBits( pos.getY() );
|
|
||||||
vertexData[start + 2] = Float.floatToRawIntBits( pos.getZ() );
|
|
||||||
}
|
|
||||||
offsetBytes += element.getByteLength();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return copy;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static BakedQuad transformQuad( VertexFormat format, BakedQuad input, Matrix4f transform )
|
|
||||||
{
|
|
||||||
if( transform == null || transform.equals( identity ) )
|
|
||||||
{
|
|
||||||
return input;
|
|
||||||
}
|
|
||||||
return doTransformQuad( format, input, transform );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,153 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.block.entity.BlockEntity;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.VertexConsumer;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import java.util.EnumSet;
|
|
||||||
|
|
||||||
import static net.minecraft.util.math.Direction.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Overrides monitor highlighting to only render the outline of the <em>whole</em> monitor, rather than the current block. This means you do not get an
|
|
||||||
* intrusive outline on top of the screen.
|
|
||||||
*/
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class MonitorHighlightRenderer
|
|
||||||
{
|
|
||||||
private MonitorHighlightRenderer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean drawHighlight(
|
|
||||||
MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos, BlockState blockState
|
|
||||||
)
|
|
||||||
{
|
|
||||||
// Preserve normal behaviour when crouching.
|
|
||||||
if( entity.isInSneakingPose() )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = entity.getEntityWorld();
|
|
||||||
|
|
||||||
BlockEntity tile = world.getBlockEntity( pos );
|
|
||||||
if( !(tile instanceof TileMonitor) )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileMonitor monitor = (TileMonitor) tile;
|
|
||||||
|
|
||||||
// Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
|
|
||||||
EnumSet<Direction> faces = EnumSet.allOf( Direction.class );
|
|
||||||
Direction front = monitor.getFront();
|
|
||||||
faces.remove( front );
|
|
||||||
if( monitor.getXIndex() != 0 )
|
|
||||||
{
|
|
||||||
faces.remove( monitor.getRight()
|
|
||||||
.getOpposite() );
|
|
||||||
}
|
|
||||||
if( monitor.getXIndex() != monitor.getWidth() - 1 )
|
|
||||||
{
|
|
||||||
faces.remove( monitor.getRight() );
|
|
||||||
}
|
|
||||||
if( monitor.getYIndex() != 0 )
|
|
||||||
{
|
|
||||||
faces.remove( monitor.getDown()
|
|
||||||
.getOpposite() );
|
|
||||||
}
|
|
||||||
if( monitor.getYIndex() != monitor.getHeight() - 1 )
|
|
||||||
{
|
|
||||||
faces.remove( monitor.getDown() );
|
|
||||||
}
|
|
||||||
|
|
||||||
Vec3d cameraPos = MinecraftClient.getInstance().gameRenderer.getCamera()
|
|
||||||
.getPos();
|
|
||||||
matrixStack.push();
|
|
||||||
matrixStack.translate( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );
|
|
||||||
|
|
||||||
// I wish I could think of a better way to do this
|
|
||||||
Matrix4f transform = matrixStack.peek()
|
|
||||||
.getModel();
|
|
||||||
if( faces.contains( NORTH ) || faces.contains( WEST ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 0, 0, UP );
|
|
||||||
}
|
|
||||||
if( faces.contains( SOUTH ) || faces.contains( WEST ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 0, 1, UP );
|
|
||||||
}
|
|
||||||
if( faces.contains( NORTH ) || faces.contains( EAST ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 1, 0, 0, UP );
|
|
||||||
}
|
|
||||||
if( faces.contains( SOUTH ) || faces.contains( EAST ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 1, 0, 1, UP );
|
|
||||||
}
|
|
||||||
if( faces.contains( NORTH ) || faces.contains( DOWN ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 0, 0, EAST );
|
|
||||||
}
|
|
||||||
if( faces.contains( SOUTH ) || faces.contains( DOWN ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 0, 1, EAST );
|
|
||||||
}
|
|
||||||
if( faces.contains( NORTH ) || faces.contains( UP ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 1, 0, EAST );
|
|
||||||
}
|
|
||||||
if( faces.contains( SOUTH ) || faces.contains( UP ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 1, 1, EAST );
|
|
||||||
}
|
|
||||||
if( faces.contains( WEST ) || faces.contains( DOWN ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 0, 0, SOUTH );
|
|
||||||
}
|
|
||||||
if( faces.contains( EAST ) || faces.contains( DOWN ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 1, 0, 0, SOUTH );
|
|
||||||
}
|
|
||||||
if( faces.contains( WEST ) || faces.contains( UP ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 0, 1, 0, SOUTH );
|
|
||||||
}
|
|
||||||
if( faces.contains( EAST ) || faces.contains( UP ) )
|
|
||||||
{
|
|
||||||
line( vertexConsumer, transform, 1, 1, 0, SOUTH );
|
|
||||||
}
|
|
||||||
|
|
||||||
matrixStack.pop();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void line( VertexConsumer buffer, Matrix4f transform, float x, float y, float z, Direction direction )
|
|
||||||
{
|
|
||||||
buffer.vertex( transform, x, y, z )
|
|
||||||
.color( 0, 0, 0, 0.4f )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( transform, x + direction.getOffsetX(), y + direction.getOffsetY(), z + direction.getOffsetZ() )
|
|
||||||
.color( 0, 0, 0, 0.4f )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.google.common.base.Strings;
|
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.client.gui.FixedWidthFontRenderer;
|
|
||||||
import dan200.computercraft.shared.util.Palette;
|
|
||||||
import net.minecraft.client.texture.TextureUtil;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import org.lwjgl.BufferUtils;
|
|
||||||
import org.lwjgl.opengl.GL13;
|
|
||||||
import org.lwjgl.opengl.GL20;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.nio.FloatBuffer;
|
|
||||||
|
|
||||||
class MonitorTextureBufferShader
|
|
||||||
{
|
|
||||||
static final int TEXTURE_INDEX = GL13.GL_TEXTURE3;
|
|
||||||
|
|
||||||
private static final FloatBuffer MATRIX_BUFFER = BufferUtils.createFloatBuffer( 16 );
|
|
||||||
private static final FloatBuffer PALETTE_BUFFER = BufferUtils.createFloatBuffer( 16 * 3 );
|
|
||||||
|
|
||||||
private static int uniformMv;
|
|
||||||
|
|
||||||
private static int uniformFont;
|
|
||||||
private static int uniformWidth;
|
|
||||||
private static int uniformHeight;
|
|
||||||
private static int uniformTbo;
|
|
||||||
private static int uniformPalette;
|
|
||||||
|
|
||||||
private static boolean initialised;
|
|
||||||
private static boolean ok;
|
|
||||||
private static int program;
|
|
||||||
|
|
||||||
static void setupUniform( Matrix4f transform, int width, int height, Palette palette, boolean greyscale )
|
|
||||||
{
|
|
||||||
MATRIX_BUFFER.rewind();
|
|
||||||
transform.writeColumnMajor( MATRIX_BUFFER );
|
|
||||||
MATRIX_BUFFER.rewind();
|
|
||||||
RenderSystem.glUniformMatrix4( uniformMv, false, MATRIX_BUFFER );
|
|
||||||
|
|
||||||
RenderSystem.glUniform1i( uniformWidth, width );
|
|
||||||
RenderSystem.glUniform1i( uniformHeight, height );
|
|
||||||
|
|
||||||
PALETTE_BUFFER.rewind();
|
|
||||||
for( int i = 0; i < 16; i++ )
|
|
||||||
{
|
|
||||||
double[] colour = palette.getColour( i );
|
|
||||||
if( greyscale )
|
|
||||||
{
|
|
||||||
float f = FixedWidthFontRenderer.toGreyscale( colour );
|
|
||||||
PALETTE_BUFFER.put( f )
|
|
||||||
.put( f )
|
|
||||||
.put( f );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
PALETTE_BUFFER.put( (float) colour[0] )
|
|
||||||
.put( (float) colour[1] )
|
|
||||||
.put( (float) colour[2] );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
PALETTE_BUFFER.flip();
|
|
||||||
RenderSystem.glUniform3( uniformPalette, PALETTE_BUFFER );
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean use()
|
|
||||||
{
|
|
||||||
if( initialised )
|
|
||||||
{
|
|
||||||
if( ok )
|
|
||||||
{
|
|
||||||
GlStateManager.useProgram( program );
|
|
||||||
}
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( ok = load() )
|
|
||||||
{
|
|
||||||
GL20.glUseProgram( program );
|
|
||||||
RenderSystem.glUniform1i( uniformFont, 0 );
|
|
||||||
RenderSystem.glUniform1i( uniformTbo, TEXTURE_INDEX - GL13.GL_TEXTURE0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
return ok;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean load()
|
|
||||||
{
|
|
||||||
initialised = true;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int vertexShader = loadShader( GL20.GL_VERTEX_SHADER, "assets/computercraft/shaders/monitor.vert" );
|
|
||||||
int fragmentShader = loadShader( GL20.GL_FRAGMENT_SHADER, "assets/computercraft/shaders/monitor.frag" );
|
|
||||||
|
|
||||||
program = GlStateManager.createProgram();
|
|
||||||
GlStateManager.attachShader( program, vertexShader );
|
|
||||||
GlStateManager.attachShader( program, fragmentShader );
|
|
||||||
GL20.glBindAttribLocation( program, 0, "v_pos" );
|
|
||||||
|
|
||||||
GlStateManager.linkProgram( program );
|
|
||||||
boolean ok = GlStateManager.getProgram( program, GL20.GL_LINK_STATUS ) != 0;
|
|
||||||
String log = GlStateManager.getProgramInfoLog( program, Short.MAX_VALUE )
|
|
||||||
.trim();
|
|
||||||
if( !Strings.isNullOrEmpty( log ) )
|
|
||||||
{
|
|
||||||
ComputerCraft.log.warn( "Problems when linking monitor shader: {}", log );
|
|
||||||
}
|
|
||||||
|
|
||||||
GL20.glDetachShader( program, vertexShader );
|
|
||||||
GL20.glDetachShader( program, fragmentShader );
|
|
||||||
GlStateManager.deleteShader( vertexShader );
|
|
||||||
GlStateManager.deleteShader( fragmentShader );
|
|
||||||
|
|
||||||
if( !ok )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
uniformMv = getUniformLocation( program, "u_mv" );
|
|
||||||
uniformFont = getUniformLocation( program, "u_font" );
|
|
||||||
uniformWidth = getUniformLocation( program, "u_width" );
|
|
||||||
uniformHeight = getUniformLocation( program, "u_height" );
|
|
||||||
uniformTbo = getUniformLocation( program, "u_tbo" );
|
|
||||||
uniformPalette = getUniformLocation( program, "u_palette" );
|
|
||||||
|
|
||||||
ComputerCraft.log.info( "Loaded monitor shader." );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch( Exception e )
|
|
||||||
{
|
|
||||||
ComputerCraft.log.error( "Cannot load monitor shaders", e );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int loadShader( int kind, String path )
|
|
||||||
{
|
|
||||||
InputStream stream = TileEntityMonitorRenderer.class.getClassLoader()
|
|
||||||
.getResourceAsStream( path );
|
|
||||||
if( stream == null )
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException( "Cannot find " + path );
|
|
||||||
}
|
|
||||||
String contents = TextureUtil.readAllToString( stream );
|
|
||||||
|
|
||||||
int shader = GlStateManager.createShader( kind );
|
|
||||||
|
|
||||||
GlStateManager.shaderSource( shader, contents );
|
|
||||||
GlStateManager.compileShader( shader );
|
|
||||||
|
|
||||||
boolean ok = GlStateManager.getShader( shader, GL20.GL_COMPILE_STATUS ) != 0;
|
|
||||||
String log = GlStateManager.getShaderInfoLog( shader, Short.MAX_VALUE )
|
|
||||||
.trim();
|
|
||||||
if( !Strings.isNullOrEmpty( log ) )
|
|
||||||
{
|
|
||||||
ComputerCraft.log.warn( "Problems when loading monitor shader {}: {}", path, log );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !ok )
|
|
||||||
{
|
|
||||||
throw new IllegalStateException( "Cannot compile shader " + path );
|
|
||||||
}
|
|
||||||
return shader;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int getUniformLocation( int program, String name )
|
|
||||||
{
|
|
||||||
int uniform = GlStateManager.getUniformLocation( program, name );
|
|
||||||
if( uniform == -1 )
|
|
||||||
{
|
|
||||||
throw new IllegalStateException( "Cannot find uniform " + name );
|
|
||||||
}
|
|
||||||
return uniform;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.client.gui.FixedWidthFontRenderer;
|
|
||||||
import dan200.computercraft.core.terminal.TextBuffer;
|
|
||||||
import dan200.computercraft.shared.util.Palette;
|
|
||||||
import net.minecraft.client.render.*;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
|
|
||||||
import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
|
|
||||||
|
|
||||||
public final class PrintoutRenderer
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Width of a page.
|
|
||||||
*/
|
|
||||||
public static final int X_SIZE = 172;
|
|
||||||
/**
|
|
||||||
* Height of a page.
|
|
||||||
*/
|
|
||||||
public static final int Y_SIZE = 209;
|
|
||||||
/**
|
|
||||||
* Padding between the left and right of a page and the text.
|
|
||||||
*/
|
|
||||||
public static final int X_TEXT_MARGIN = 13;
|
|
||||||
/**
|
|
||||||
* Padding between the top and bottom of a page and the text.
|
|
||||||
*/
|
|
||||||
public static final int Y_TEXT_MARGIN = 11;
|
|
||||||
/**
|
|
||||||
* Size of the leather cover.
|
|
||||||
*/
|
|
||||||
public static final int COVER_SIZE = 12;
|
|
||||||
private static final Identifier BG = new Identifier( "computercraft", "textures/gui/printout.png" );
|
|
||||||
private static final float BG_SIZE = 256.0f;
|
|
||||||
/**
|
|
||||||
* Width of the extra page texture.
|
|
||||||
*/
|
|
||||||
private static final int X_FOLD_SIZE = 12;
|
|
||||||
private static final int COVER_Y = Y_SIZE;
|
|
||||||
private static final int COVER_X = X_SIZE + 4 * X_FOLD_SIZE;
|
|
||||||
|
|
||||||
private PrintoutRenderer() {}
|
|
||||||
|
|
||||||
public static void drawText( Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
|
|
||||||
{
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
|
|
||||||
for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawString( transform,
|
|
||||||
buffer,
|
|
||||||
x,
|
|
||||||
y + line * FONT_HEIGHT,
|
|
||||||
text[start + line],
|
|
||||||
colours[start + line],
|
|
||||||
null,
|
|
||||||
Palette.DEFAULT,
|
|
||||||
false,
|
|
||||||
0,
|
|
||||||
0 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawText( Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, String[] text, String[] colours )
|
|
||||||
{
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
|
|
||||||
for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawString( transform,
|
|
||||||
buffer,
|
|
||||||
x,
|
|
||||||
y + line * FONT_HEIGHT,
|
|
||||||
new TextBuffer( text[start + line] ),
|
|
||||||
new TextBuffer( colours[start + line] ),
|
|
||||||
null,
|
|
||||||
Palette.DEFAULT,
|
|
||||||
false,
|
|
||||||
0,
|
|
||||||
0 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawBorder( Matrix4f transform, VertexConsumerProvider renderer, float x, float y, float z, int page, int pages, boolean isBook )
|
|
||||||
{
|
|
||||||
int leftPages = page;
|
|
||||||
int rightPages = pages - page - 1;
|
|
||||||
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( Type.TYPE );
|
|
||||||
|
|
||||||
if( isBook )
|
|
||||||
{
|
|
||||||
// Border
|
|
||||||
float offset = offsetAt( pages );
|
|
||||||
float left = x - 4 - offset;
|
|
||||||
float right = x + X_SIZE + offset - 4;
|
|
||||||
|
|
||||||
// Left and right border
|
|
||||||
drawTexture( transform, buffer, left - 4, y - 8, z - 0.02f, COVER_X, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2 );
|
|
||||||
drawTexture( transform, buffer, right, y - 8, z - 0.02f, COVER_X + COVER_SIZE, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2 );
|
|
||||||
|
|
||||||
// Draw centre panel (just stretched texture, sorry).
|
|
||||||
drawTexture( transform,
|
|
||||||
buffer,
|
|
||||||
x - offset,
|
|
||||||
y,
|
|
||||||
z - 0.02f,
|
|
||||||
X_SIZE + offset * 2,
|
|
||||||
Y_SIZE,
|
|
||||||
COVER_X + COVER_SIZE / 2.0f,
|
|
||||||
COVER_SIZE,
|
|
||||||
COVER_SIZE,
|
|
||||||
Y_SIZE );
|
|
||||||
|
|
||||||
float borderX = left;
|
|
||||||
while( borderX < right )
|
|
||||||
{
|
|
||||||
double thisWidth = Math.min( right - borderX, X_SIZE );
|
|
||||||
drawTexture( transform, buffer, borderX, y - 8, z - 0.02f, 0, COVER_Y, (float) thisWidth, COVER_SIZE );
|
|
||||||
drawTexture( transform, buffer, borderX, y + Y_SIZE - 4, z - 0.02f, 0, COVER_Y + COVER_SIZE, (float) thisWidth, COVER_SIZE );
|
|
||||||
borderX += thisWidth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Left half
|
|
||||||
drawTexture( transform, buffer, x, y, z, X_FOLD_SIZE * 2, 0, X_SIZE / 2.0f, Y_SIZE );
|
|
||||||
for( int n = 0; n <= leftPages; n++ )
|
|
||||||
{
|
|
||||||
drawTexture( transform, buffer, x - offsetAt( n ), y, z - 1e-3f * n,
|
|
||||||
// Use the left "bold" fold for the outermost page
|
|
||||||
n == leftPages ? 0 : X_FOLD_SIZE, 0, X_FOLD_SIZE, Y_SIZE );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Right half
|
|
||||||
drawTexture( transform, buffer, x + X_SIZE / 2.0f, y, z, X_FOLD_SIZE * 2 + X_SIZE / 2.0f, 0, X_SIZE / 2.0f, Y_SIZE );
|
|
||||||
for( int n = 0; n <= rightPages; n++ )
|
|
||||||
{
|
|
||||||
drawTexture( transform, buffer, x + (X_SIZE - X_FOLD_SIZE) + offsetAt( n ), y, z - 1e-3f * n,
|
|
||||||
// Two folds, then the main page. Use the right "bold" fold for the outermost page.
|
|
||||||
X_FOLD_SIZE * 2 + X_SIZE + (n == rightPages ? X_FOLD_SIZE : 0), 0, X_FOLD_SIZE, Y_SIZE );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static float offsetAt( int page )
|
|
||||||
{
|
|
||||||
return (float) (32 * (1 - Math.pow( 1.2, -page )));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float u, float v, float width, float height )
|
|
||||||
{
|
|
||||||
buffer.vertex( matrix, x, y + height, z )
|
|
||||||
.texture( u / BG_SIZE, (v + height) / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x + width, y + height, z )
|
|
||||||
.texture( (u + width) / BG_SIZE, (v + height) / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x + width, y, z )
|
|
||||||
.texture( (u + width) / BG_SIZE, v / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x, y, z )
|
|
||||||
.texture( u / BG_SIZE, v / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float width, float height, float u, float v,
|
|
||||||
float tWidth, float tHeight )
|
|
||||||
{
|
|
||||||
buffer.vertex( matrix, x, y + height, z )
|
|
||||||
.texture( u / BG_SIZE, (v + tHeight) / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x + width, y + height, z )
|
|
||||||
.texture( (u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x + width, y, z )
|
|
||||||
.texture( (u + tWidth) / BG_SIZE, v / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( matrix, x, y, z )
|
|
||||||
.texture( u / BG_SIZE, v / BG_SIZE )
|
|
||||||
.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final class Type extends RenderPhase
|
|
||||||
{
|
|
||||||
static final RenderLayer TYPE = RenderLayer.of( "printout_background",
|
|
||||||
VertexFormats.POSITION_TEXTURE,
|
|
||||||
GL11.GL_QUADS,
|
|
||||||
1024,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
// useDelegate, needsSorting
|
|
||||||
RenderLayer.MultiPhaseParameters.builder()
|
|
||||||
.texture( new RenderPhase.Texture( BG, false, false ) ) // blur, minimap
|
|
||||||
.alpha( ONE_TENTH_ALPHA )
|
|
||||||
.lightmap( DISABLE_LIGHTMAP )
|
|
||||||
.build( false ) );
|
|
||||||
|
|
||||||
private Type( String name, Runnable setup, Runnable destroy )
|
|
||||||
{
|
|
||||||
super( name, setup, destroy );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,263 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
|
||||||
import dan200.computercraft.client.FrameInfo;
|
|
||||||
import dan200.computercraft.client.gui.FixedWidthFontRenderer;
|
|
||||||
import dan200.computercraft.core.terminal.Terminal;
|
|
||||||
import dan200.computercraft.core.terminal.TextBuffer;
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
|
|
||||||
import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
|
|
||||||
import dan200.computercraft.shared.util.Colour;
|
|
||||||
import dan200.computercraft.shared.util.DirectionUtil;
|
|
||||||
import net.minecraft.client.gl.VertexBuffer;
|
|
||||||
import net.minecraft.client.render.*;
|
|
||||||
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
|
|
||||||
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
|
|
||||||
import net.minecraft.client.util.GlAllocationUtils;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.util.math.AffineTransformation;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
import org.lwjgl.opengl.GL13;
|
|
||||||
import org.lwjgl.opengl.GL20;
|
|
||||||
import org.lwjgl.opengl.GL31;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
|
|
||||||
import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
|
|
||||||
|
|
||||||
public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* {@link TileMonitor#RENDER_MARGIN}, but a tiny bit of additional padding to ensure that there is no space between the monitor frame and contents.
|
|
||||||
*/
|
|
||||||
private static final float MARGIN = (float) (TileMonitor.RENDER_MARGIN * 1.1);
|
|
||||||
private static final Matrix4f IDENTITY = AffineTransformation.identity()
|
|
||||||
.getMatrix();
|
|
||||||
private static ByteBuffer tboContents;
|
|
||||||
|
|
||||||
public TileEntityMonitorRenderer( BlockEntityRenderDispatcher rendererDispatcher )
|
|
||||||
{
|
|
||||||
super( rendererDispatcher );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull TileMonitor monitor, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
|
|
||||||
int lightmapCoord, int overlayLight )
|
|
||||||
{
|
|
||||||
// Render from the origin monitor
|
|
||||||
ClientMonitor originTerminal = monitor.getClientMonitor();
|
|
||||||
|
|
||||||
if( originTerminal == null ) return;
|
|
||||||
TileMonitor origin = originTerminal.getOrigin();
|
|
||||||
BlockPos monitorPos = monitor.getPos();
|
|
||||||
|
|
||||||
// Ensure each monitor terminal is rendered only once. We allow rendering a specific tile
|
|
||||||
// multiple times in a single frame to ensure compatibility with shaders which may run a
|
|
||||||
// pass multiple times.
|
|
||||||
long renderFrame = FrameInfo.getRenderFrame();
|
|
||||||
if( originTerminal.lastRenderFrame == renderFrame && !monitorPos.equals( originTerminal.lastRenderPos ) )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
originTerminal.lastRenderFrame = renderFrame;
|
|
||||||
originTerminal.lastRenderPos = monitorPos;
|
|
||||||
|
|
||||||
BlockPos originPos = origin.getPos();
|
|
||||||
|
|
||||||
// Determine orientation
|
|
||||||
Direction dir = origin.getDirection();
|
|
||||||
Direction front = origin.getFront();
|
|
||||||
float yaw = dir.asRotation();
|
|
||||||
float pitch = DirectionUtil.toPitchAngle( front );
|
|
||||||
|
|
||||||
// Setup initial transform
|
|
||||||
transform.push();
|
|
||||||
transform.translate( originPos.getX() - monitorPos.getX() + 0.5,
|
|
||||||
originPos.getY() - monitorPos.getY() + 0.5,
|
|
||||||
originPos.getZ() - monitorPos.getZ() + 0.5 );
|
|
||||||
|
|
||||||
transform.multiply( Vec3f.NEGATIVE_Y.getDegreesQuaternion( yaw ) );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_X.getDegreesQuaternion( pitch ) );
|
|
||||||
transform.translate( -0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
|
|
||||||
origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN) + 0,
|
|
||||||
0.50 );
|
|
||||||
double xSize = origin.getWidth() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
|
|
||||||
double ySize = origin.getHeight() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
|
|
||||||
|
|
||||||
// Draw the background blocker
|
|
||||||
FixedWidthFontRenderer.drawBlocker( transform.peek().getModel(),
|
|
||||||
renderer,
|
|
||||||
(float) -TileMonitor.RENDER_MARGIN,
|
|
||||||
(float) TileMonitor.RENDER_MARGIN,
|
|
||||||
(float) (xSize + 2 * TileMonitor.RENDER_MARGIN),
|
|
||||||
(float) -(ySize + TileMonitor.RENDER_MARGIN * 2) );
|
|
||||||
|
|
||||||
// Set the contents slightly off the surface to prevent z-fighting
|
|
||||||
transform.translate( 0.0, 0.0, 0.001 );
|
|
||||||
|
|
||||||
// Draw the contents
|
|
||||||
Terminal terminal = originTerminal.getTerminal();
|
|
||||||
if( terminal != null )
|
|
||||||
{
|
|
||||||
// Draw a terminal
|
|
||||||
int width = terminal.getWidth(), height = terminal.getHeight();
|
|
||||||
int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
|
|
||||||
double xScale = xSize / pixelWidth;
|
|
||||||
double yScale = ySize / pixelHeight;
|
|
||||||
transform.push();
|
|
||||||
transform.scale( (float) xScale, (float) -yScale, 1.0f );
|
|
||||||
|
|
||||||
Matrix4f matrix = transform.peek().getModel();
|
|
||||||
|
|
||||||
// Sneaky hack here: we get a buffer now in order to flush existing ones and set up the appropriate
|
|
||||||
// render state. I've no clue how well this'll work in future versions of Minecraft, but it does the trick
|
|
||||||
// for now.
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
|
|
||||||
FixedWidthFontRenderer.TYPE.startDrawing();
|
|
||||||
|
|
||||||
renderTerminal( matrix, originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale) );
|
|
||||||
|
|
||||||
// We don't draw the cursor with the VBO, as it's dynamic and so we'll end up refreshing far more than is
|
|
||||||
// reasonable.
|
|
||||||
FixedWidthFontRenderer.drawCursor( matrix, buffer, 0, 0, terminal, !originTerminal.isColour() );
|
|
||||||
|
|
||||||
// To go along with sneaky hack above: make sure state changes are undone. I would have thought this would
|
|
||||||
// happen automatically after these buffers are drawn, but chests will render weird around monitors without this.
|
|
||||||
FixedWidthFontRenderer.TYPE.endDrawing();
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
FixedWidthFontRenderer.drawEmptyTerminal( transform.peek()
|
|
||||||
.getModel(),
|
|
||||||
renderer,
|
|
||||||
-MARGIN,
|
|
||||||
MARGIN,
|
|
||||||
(float) (xSize + 2 * MARGIN),
|
|
||||||
(float) -(ySize + MARGIN * 2) );
|
|
||||||
}
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void renderTerminal( Matrix4f matrix, ClientMonitor monitor, float xMargin, float yMargin )
|
|
||||||
{
|
|
||||||
Terminal terminal = monitor.getTerminal();
|
|
||||||
|
|
||||||
MonitorRenderer renderType = MonitorRenderer.current();
|
|
||||||
boolean redraw = monitor.pollTerminalChanged();
|
|
||||||
if( monitor.createBuffer( renderType ) )
|
|
||||||
{
|
|
||||||
redraw = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch( renderType )
|
|
||||||
{
|
|
||||||
case TBO:
|
|
||||||
{
|
|
||||||
if( !MonitorTextureBufferShader.use() )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int width = terminal.getWidth(), height = terminal.getHeight();
|
|
||||||
int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
|
|
||||||
|
|
||||||
if( redraw )
|
|
||||||
{
|
|
||||||
int size = width * height * 3;
|
|
||||||
if( tboContents == null || tboContents.capacity() < size )
|
|
||||||
{
|
|
||||||
tboContents = GlAllocationUtils.allocateByteBuffer( size );
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer monitorBuffer = tboContents;
|
|
||||||
monitorBuffer.clear();
|
|
||||||
for( int y = 0; y < height; y++ )
|
|
||||||
{
|
|
||||||
TextBuffer text = terminal.getLine( y ), textColour = terminal.getTextColourLine( y ), background = terminal.getBackgroundColourLine( y );
|
|
||||||
for( int x = 0; x < width; x++ )
|
|
||||||
{
|
|
||||||
monitorBuffer.put( (byte) (text.charAt( x ) & 0xFF) );
|
|
||||||
monitorBuffer.put( (byte) getColour( textColour.charAt( x ), Colour.WHITE ) );
|
|
||||||
monitorBuffer.put( (byte) getColour( background.charAt( x ), Colour.BLACK ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
monitorBuffer.flip();
|
|
||||||
|
|
||||||
GlStateManager.bindBuffers( GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer );
|
|
||||||
GlStateManager.bufferData( GL31.GL_TEXTURE_BUFFER, monitorBuffer, GL20.GL_STATIC_DRAW );
|
|
||||||
GlStateManager.bindBuffers( GL31.GL_TEXTURE_BUFFER, 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Nobody knows what they're doing!
|
|
||||||
GlStateManager.activeTexture( MonitorTextureBufferShader.TEXTURE_INDEX );
|
|
||||||
GL11.glBindTexture( GL31.GL_TEXTURE_BUFFER, monitor.tboTexture );
|
|
||||||
GlStateManager.activeTexture( GL13.GL_TEXTURE0 );
|
|
||||||
|
|
||||||
MonitorTextureBufferShader.setupUniform( matrix, width, height, terminal.getPalette(), !monitor.isColour() );
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
|
||||||
BufferBuilder buffer = tessellator.getBuffer();
|
|
||||||
buffer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION );
|
|
||||||
buffer.vertex( -xMargin, -yMargin, 0 )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( -xMargin, pixelHeight + yMargin, 0 )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( pixelWidth + xMargin, -yMargin, 0 )
|
|
||||||
.next();
|
|
||||||
buffer.vertex( pixelWidth + xMargin, pixelHeight + yMargin, 0 )
|
|
||||||
.next();
|
|
||||||
tessellator.draw();
|
|
||||||
|
|
||||||
GlStateManager.useProgram( 0 );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case VBO:
|
|
||||||
VertexBuffer vbo = monitor.buffer;
|
|
||||||
if( redraw )
|
|
||||||
{
|
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
|
||||||
BufferBuilder builder = tessellator.getBuffer();
|
|
||||||
builder.begin( FixedWidthFontRenderer.TYPE.getDrawMode(), FixedWidthFontRenderer.TYPE.getVertexFormat() );
|
|
||||||
FixedWidthFontRenderer.drawTerminalWithoutCursor( IDENTITY,
|
|
||||||
builder,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
terminal,
|
|
||||||
!monitor.isColour(),
|
|
||||||
yMargin,
|
|
||||||
yMargin,
|
|
||||||
xMargin,
|
|
||||||
xMargin );
|
|
||||||
|
|
||||||
builder.end();
|
|
||||||
vbo.upload( builder );
|
|
||||||
}
|
|
||||||
|
|
||||||
vbo.bind();
|
|
||||||
FixedWidthFontRenderer.TYPE.getVertexFormat()
|
|
||||||
.startDrawing( 0L );
|
|
||||||
vbo.draw( matrix, FixedWidthFontRenderer.TYPE.getDrawMode() );
|
|
||||||
VertexBuffer.unbind();
|
|
||||||
FixedWidthFontRenderer.TYPE.getVertexFormat()
|
|
||||||
.endDrawing();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,223 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.client.TransformedModel;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import dan200.computercraft.api.turtle.TurtleSide;
|
|
||||||
import dan200.computercraft.shared.computer.core.ComputerFamily;
|
|
||||||
import dan200.computercraft.shared.turtle.blocks.TileTurtle;
|
|
||||||
import dan200.computercraft.shared.util.DirectionUtil;
|
|
||||||
import dan200.computercraft.shared.util.Holiday;
|
|
||||||
import dan200.computercraft.shared.util.HolidayUtil;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.font.TextRenderer;
|
|
||||||
import net.minecraft.client.render.TexturedRenderLayers;
|
|
||||||
import net.minecraft.client.render.VertexConsumer;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
|
|
||||||
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.BakedModelManager;
|
|
||||||
import net.minecraft.client.render.model.BakedQuad;
|
|
||||||
import net.minecraft.client.util.ModelIdentifier;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.hit.BlockHitResult;
|
|
||||||
import net.minecraft.util.hit.HitResult;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
import net.minecraft.util.math.Matrix4f;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
|
|
||||||
{
|
|
||||||
private static final ModelIdentifier NORMAL_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_normal", "inventory" );
|
|
||||||
private static final ModelIdentifier ADVANCED_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_advanced", "inventory" );
|
|
||||||
private static final ModelIdentifier COLOUR_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_colour", "inventory" );
|
|
||||||
private static final ModelIdentifier ELF_OVERLAY_MODEL = new ModelIdentifier( "computercraft:turtle_elf_overlay", "inventory" );
|
|
||||||
|
|
||||||
private final Random random = new Random( 0 );
|
|
||||||
|
|
||||||
public TileEntityTurtleRenderer( BlockEntityRenderDispatcher renderDispatcher )
|
|
||||||
{
|
|
||||||
super( renderDispatcher );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ModelIdentifier getTurtleModel( ComputerFamily family, boolean coloured )
|
|
||||||
{
|
|
||||||
switch( family )
|
|
||||||
{
|
|
||||||
case NORMAL:
|
|
||||||
default:
|
|
||||||
return coloured ? COLOUR_TURTLE_MODEL : NORMAL_TURTLE_MODEL;
|
|
||||||
case ADVANCED:
|
|
||||||
return coloured ? COLOUR_TURTLE_MODEL : ADVANCED_TURTLE_MODEL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ModelIdentifier getTurtleOverlayModel( Identifier overlay, boolean christmas )
|
|
||||||
{
|
|
||||||
if( overlay != null )
|
|
||||||
{
|
|
||||||
return new ModelIdentifier( overlay, "inventory" );
|
|
||||||
}
|
|
||||||
if( christmas )
|
|
||||||
{
|
|
||||||
return ELF_OVERLAY_MODEL;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void renderQuads( @Nonnull MatrixStack transform, @Nonnull VertexConsumer buffer, int lightmapCoord, int overlayLight,
|
|
||||||
List<BakedQuad> quads, int[] tints )
|
|
||||||
{
|
|
||||||
MatrixStack.Entry matrix = transform.peek();
|
|
||||||
|
|
||||||
for( BakedQuad bakedquad : quads )
|
|
||||||
{
|
|
||||||
int tint = -1;
|
|
||||||
if( tints != null && bakedquad.hasColor() )
|
|
||||||
{
|
|
||||||
int idx = bakedquad.getColorIndex();
|
|
||||||
if( idx >= 0 && idx < tints.length )
|
|
||||||
{
|
|
||||||
tint = tints[bakedquad.getColorIndex()];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
float f = (float) (tint >> 16 & 255) / 255.0F;
|
|
||||||
float f1 = (float) (tint >> 8 & 255) / 255.0F;
|
|
||||||
float f2 = (float) (tint & 255) / 255.0F;
|
|
||||||
buffer.quad( matrix,
|
|
||||||
bakedquad,
|
|
||||||
new float[] { 1.0F, 1.0F, 1.0F, 1.0F },
|
|
||||||
f,
|
|
||||||
f1,
|
|
||||||
f2,
|
|
||||||
new int[] { lightmapCoord, lightmapCoord, lightmapCoord, lightmapCoord },
|
|
||||||
overlayLight,
|
|
||||||
true );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull TileTurtle turtle, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
|
|
||||||
int lightmapCoord, int overlayLight )
|
|
||||||
{
|
|
||||||
// Render the label
|
|
||||||
String label = turtle.createProxy()
|
|
||||||
.getLabel();
|
|
||||||
HitResult hit = dispatcher.crosshairTarget;
|
|
||||||
if( label != null && hit.getType() == HitResult.Type.BLOCK && turtle.getPos()
|
|
||||||
.equals( ((BlockHitResult) hit).getBlockPos() ) )
|
|
||||||
{
|
|
||||||
MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
TextRenderer font = mc.textRenderer;
|
|
||||||
|
|
||||||
transform.push();
|
|
||||||
transform.translate( 0.5, 1.2, 0.5 );
|
|
||||||
transform.multiply( mc.getEntityRenderDispatcher()
|
|
||||||
.getRotation() );
|
|
||||||
transform.scale( -0.025f, -0.025f, 0.025f );
|
|
||||||
|
|
||||||
Matrix4f matrix = transform.peek()
|
|
||||||
.getModel();
|
|
||||||
int opacity = (int) (mc.options.getTextBackgroundOpacity( 0.25f ) * 255) << 24;
|
|
||||||
float width = -font.getWidth( label ) / 2.0f;
|
|
||||||
font.draw( label, width, (float) 0, 0x20ffffff, false, matrix, renderer, true, opacity, lightmapCoord );
|
|
||||||
font.draw( label, width, (float) 0, 0xffffffff, false, matrix, renderer, false, 0, lightmapCoord );
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
transform.push();
|
|
||||||
|
|
||||||
// Setup the transform.
|
|
||||||
Vec3d offset = turtle.getRenderOffset( partialTicks );
|
|
||||||
float yaw = turtle.getRenderYaw( partialTicks );
|
|
||||||
transform.translate( offset.x, offset.y, offset.z );
|
|
||||||
|
|
||||||
transform.translate( 0.5f, 0.5f, 0.5f );
|
|
||||||
transform.multiply( Vec3f.POSITIVE_Y.getDegreesQuaternion( 180.0f - yaw ) );
|
|
||||||
if( label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" )) )
|
|
||||||
{
|
|
||||||
// Flip the model
|
|
||||||
transform.scale( 1.0f, -1.0f, 1.0f );
|
|
||||||
}
|
|
||||||
transform.translate( -0.5f, -0.5f, -0.5f );
|
|
||||||
|
|
||||||
// Render the turtle
|
|
||||||
int colour = turtle.getColour();
|
|
||||||
ComputerFamily family = turtle.getFamily();
|
|
||||||
Identifier overlay = turtle.getOverlay();
|
|
||||||
|
|
||||||
VertexConsumer buffer = renderer.getBuffer( TexturedRenderLayers.getEntityTranslucentCull() );
|
|
||||||
renderModel( transform, buffer, lightmapCoord, overlayLight, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } );
|
|
||||||
|
|
||||||
// Render the overlay
|
|
||||||
ModelIdentifier overlayModel = getTurtleOverlayModel( overlay, HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS );
|
|
||||||
if( overlayModel != null )
|
|
||||||
{
|
|
||||||
renderModel( transform, buffer, lightmapCoord, overlayLight, overlayModel, null );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Render the upgrades
|
|
||||||
renderUpgrade( transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.LEFT, partialTicks );
|
|
||||||
renderUpgrade( transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.RIGHT, partialTicks );
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void renderUpgrade( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, TileTurtle turtle,
|
|
||||||
TurtleSide side, float f )
|
|
||||||
{
|
|
||||||
ITurtleUpgrade upgrade = turtle.getUpgrade( side );
|
|
||||||
if( upgrade == null )
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
transform.push();
|
|
||||||
|
|
||||||
float toolAngle = turtle.getToolRenderAngle( side, f );
|
|
||||||
transform.translate( 0.0f, 0.5f, 0.5f );
|
|
||||||
transform.multiply( Vec3f.NEGATIVE_X.getDegreesQuaternion( toolAngle ) );
|
|
||||||
transform.translate( 0.0f, -0.5f, -0.5f );
|
|
||||||
|
|
||||||
TransformedModel model = upgrade.getModel( turtle.getAccess(), side );
|
|
||||||
model.push( transform );
|
|
||||||
TileEntityTurtleRenderer.renderModel( transform, renderer, lightmapCoord, overlayLight, model.getModel(), null );
|
|
||||||
transform.pop();
|
|
||||||
|
|
||||||
transform.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void renderModel( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight,
|
|
||||||
ModelIdentifier modelLocation, int[] tints )
|
|
||||||
{
|
|
||||||
BakedModelManager modelManager = MinecraftClient.getInstance()
|
|
||||||
.getItemRenderer()
|
|
||||||
.getModels()
|
|
||||||
.getModelManager();
|
|
||||||
renderModel( transform, renderer, lightmapCoord, overlayLight, modelManager.getModel( modelLocation ), tints );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void renderModel( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, BakedModel model,
|
|
||||||
int[] tints )
|
|
||||||
{
|
|
||||||
Random random = new Random();
|
|
||||||
random.setSeed( 0 );
|
|
||||||
renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, null, random ), tints );
|
|
||||||
for( Direction facing : DirectionUtil.FACINGS )
|
|
||||||
{
|
|
||||||
renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, facing, random ), tints );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.mojang.datafixers.util.Pair;
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.ModelBakeSettings;
|
|
||||||
import net.minecraft.client.render.model.ModelLoader;
|
|
||||||
import net.minecraft.client.render.model.UnbakedModel;
|
|
||||||
import net.minecraft.client.texture.Sprite;
|
|
||||||
import net.minecraft.client.util.SpriteIdentifier;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public final class TurtleModelLoader
|
|
||||||
{
|
|
||||||
public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
|
|
||||||
private static final Identifier NORMAL_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_normal" );
|
|
||||||
private static final Identifier ADVANCED_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_advanced" );
|
|
||||||
private static final Identifier COLOUR_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_colour" );
|
|
||||||
|
|
||||||
private TurtleModelLoader()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean accepts( @Nonnull Identifier name )
|
|
||||||
{
|
|
||||||
return name.getNamespace()
|
|
||||||
.equals( ComputerCraft.MOD_ID ) && (name.getPath()
|
|
||||||
.equals( "item/turtle_normal" ) || name.getPath()
|
|
||||||
.equals( "item/turtle_advanced" ));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
public UnbakedModel loadModel( @Nonnull Identifier name )
|
|
||||||
{
|
|
||||||
if( name.getNamespace()
|
|
||||||
.equals( ComputerCraft.MOD_ID ) )
|
|
||||||
{
|
|
||||||
switch( name.getPath() )
|
|
||||||
{
|
|
||||||
case "item/turtle_normal":
|
|
||||||
return new TurtleModel( NORMAL_TURTLE_MODEL );
|
|
||||||
case "item/turtle_advanced":
|
|
||||||
return new TurtleModel( ADVANCED_TURTLE_MODEL );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new IllegalStateException( "Loader does not accept " + name );
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final class TurtleModel implements UnbakedModel
|
|
||||||
{
|
|
||||||
private final Identifier family;
|
|
||||||
|
|
||||||
private TurtleModel( Identifier family )
|
|
||||||
{
|
|
||||||
this.family = family;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<SpriteIdentifier> getTextureDependencies( Function<Identifier, UnbakedModel> modelGetter,
|
|
||||||
Set<Pair<String, String>> missingTextureErrors )
|
|
||||||
{
|
|
||||||
return getModelDependencies()
|
|
||||||
.stream()
|
|
||||||
.flatMap( x -> modelGetter.apply( x )
|
|
||||||
.getTextureDependencies( modelGetter, missingTextureErrors )
|
|
||||||
.stream() )
|
|
||||||
.collect( Collectors.toSet() );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public Collection<Identifier> getModelDependencies()
|
|
||||||
{
|
|
||||||
return Arrays.asList( family, COLOUR_TURTLE_MODEL );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function<SpriteIdentifier, Sprite> spriteGetter, @Nonnull ModelBakeSettings state,
|
|
||||||
Identifier modelId )
|
|
||||||
{
|
|
||||||
return new TurtleSmartItemModel( loader.getOrLoadModel( family )
|
|
||||||
.bake( loader, spriteGetter, state, modelId ),
|
|
||||||
loader.getOrLoadModel( COLOUR_TURTLE_MODEL )
|
|
||||||
.bake( loader, spriteGetter, state, modelId ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.client.TransformedModel;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.BakedQuad;
|
|
||||||
import net.minecraft.client.render.model.json.ModelOverrideList;
|
|
||||||
import net.minecraft.client.render.model.json.ModelTransformation;
|
|
||||||
import net.minecraft.client.texture.Sprite;
|
|
||||||
import net.minecraft.util.math.AffineTransformation;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public class TurtleMultiModel implements BakedModel
|
|
||||||
{
|
|
||||||
private final BakedModel baseModel;
|
|
||||||
private final BakedModel overlayModel;
|
|
||||||
private final AffineTransformation generalTransform;
|
|
||||||
private final TransformedModel leftUpgradeModel;
|
|
||||||
private final TransformedModel rightUpgradeModel;
|
|
||||||
private List<BakedQuad> generalQuads = null;
|
|
||||||
private Map<Direction, List<BakedQuad>> faceQuads = new EnumMap<>( Direction.class );
|
|
||||||
|
|
||||||
public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, AffineTransformation generalTransform, TransformedModel leftUpgradeModel,
|
|
||||||
TransformedModel rightUpgradeModel )
|
|
||||||
{
|
|
||||||
// Get the models
|
|
||||||
this.baseModel = baseModel;
|
|
||||||
this.overlayModel = overlayModel;
|
|
||||||
this.leftUpgradeModel = leftUpgradeModel;
|
|
||||||
this.rightUpgradeModel = rightUpgradeModel;
|
|
||||||
this.generalTransform = generalTransform;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
|
|
||||||
{
|
|
||||||
if( side != null )
|
|
||||||
{
|
|
||||||
if( !faceQuads.containsKey( side ) )
|
|
||||||
{
|
|
||||||
faceQuads.put( side, buildQuads( state, side, rand ) );
|
|
||||||
}
|
|
||||||
return faceQuads.get( side );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if( generalQuads == null )
|
|
||||||
{
|
|
||||||
generalQuads = buildQuads( state, side, rand );
|
|
||||||
}
|
|
||||||
return generalQuads;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
|
|
||||||
{
|
|
||||||
ArrayList<BakedQuad> quads = new ArrayList<>();
|
|
||||||
|
|
||||||
|
|
||||||
ModelTransformer.transformQuadsTo( quads, baseModel.getQuads( state, side, rand ), generalTransform.getMatrix() );
|
|
||||||
if( overlayModel != null )
|
|
||||||
{
|
|
||||||
ModelTransformer.transformQuadsTo( quads, overlayModel.getQuads( state, side, rand ), generalTransform.getMatrix() );
|
|
||||||
}
|
|
||||||
if( leftUpgradeModel != null )
|
|
||||||
{
|
|
||||||
AffineTransformation upgradeTransform = generalTransform.multiply( leftUpgradeModel.getMatrix() );
|
|
||||||
ModelTransformer.transformQuadsTo( quads, leftUpgradeModel.getModel()
|
|
||||||
.getQuads( state, side, rand ),
|
|
||||||
upgradeTransform.getMatrix() );
|
|
||||||
}
|
|
||||||
if( rightUpgradeModel != null )
|
|
||||||
{
|
|
||||||
AffineTransformation upgradeTransform = generalTransform.multiply( rightUpgradeModel.getMatrix() );
|
|
||||||
ModelTransformer.transformQuadsTo( quads, rightUpgradeModel.getModel()
|
|
||||||
.getQuads( state, side, rand ),
|
|
||||||
upgradeTransform.getMatrix() );
|
|
||||||
}
|
|
||||||
quads.trimToSize();
|
|
||||||
return quads;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean useAmbientOcclusion()
|
|
||||||
{
|
|
||||||
return baseModel.useAmbientOcclusion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasDepth()
|
|
||||||
{
|
|
||||||
return baseModel.hasDepth();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSideLit()
|
|
||||||
{
|
|
||||||
return baseModel.isSideLit();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isBuiltin()
|
|
||||||
{
|
|
||||||
return baseModel.isBuiltin();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public Sprite getSprite()
|
|
||||||
{
|
|
||||||
return baseModel.getSprite();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public ModelTransformation getTransformation()
|
|
||||||
{
|
|
||||||
return baseModel.getTransformation();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public ModelOverrideList getOverrides()
|
|
||||||
{
|
|
||||||
return ModelOverrideList.EMPTY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import dan200.computercraft.shared.turtle.core.TurtlePlayer;
|
|
||||||
import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
|
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
|
||||||
import net.minecraft.client.render.entity.EntityRenderDispatcher;
|
|
||||||
import net.minecraft.client.render.entity.EntityRenderer;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
public class TurtlePlayerRenderer extends EntityRenderer<TurtlePlayer>
|
|
||||||
{
|
|
||||||
public TurtlePlayerRenderer( EntityRenderDispatcher renderManager )
|
|
||||||
{
|
|
||||||
super( renderManager );
|
|
||||||
}
|
|
||||||
|
|
||||||
public TurtlePlayerRenderer( EntityRenderDispatcher entityRenderDispatcher, EntityRendererRegistry.Context context )
|
|
||||||
{
|
|
||||||
super( entityRenderDispatcher );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render( @Nonnull TurtlePlayer entityIn, float entityYaw, float partialTicks, @Nonnull MatrixStack transform,
|
|
||||||
@Nonnull VertexConsumerProvider buffer, int packedLightIn )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public Identifier getTexture( @Nonnull TurtlePlayer entity )
|
|
||||||
{
|
|
||||||
return ComputerBorderRenderer.BACKGROUND_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,221 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
package dan200.computercraft.client.render;
|
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
|
||||||
import dan200.computercraft.api.client.TransformedModel;
|
|
||||||
import dan200.computercraft.api.turtle.ITurtleUpgrade;
|
|
||||||
import dan200.computercraft.api.turtle.TurtleSide;
|
|
||||||
import dan200.computercraft.shared.turtle.items.ItemTurtle;
|
|
||||||
import dan200.computercraft.shared.util.Holiday;
|
|
||||||
import dan200.computercraft.shared.util.HolidayUtil;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.block.BlockState;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.render.model.BakedModel;
|
|
||||||
import net.minecraft.client.render.model.BakedModelManager;
|
|
||||||
import net.minecraft.client.render.model.BakedQuad;
|
|
||||||
import net.minecraft.client.render.model.json.ModelOverrideList;
|
|
||||||
import net.minecraft.client.render.model.json.ModelTransformation;
|
|
||||||
import net.minecraft.client.texture.Sprite;
|
|
||||||
import net.minecraft.client.util.ModelIdentifier;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.client.world.ClientWorld;
|
|
||||||
import net.minecraft.entity.LivingEntity;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.math.AffineTransformation;
|
|
||||||
import net.minecraft.util.math.Direction;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
@Environment( EnvType.CLIENT )
|
|
||||||
public class TurtleSmartItemModel implements BakedModel
|
|
||||||
{
|
|
||||||
private static final AffineTransformation identity, flip;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
MatrixStack stack = new MatrixStack();
|
|
||||||
stack.scale( 0, -1, 0 );
|
|
||||||
stack.translate( 0, 0, 1 );
|
|
||||||
|
|
||||||
identity = AffineTransformation.identity();
|
|
||||||
flip = new AffineTransformation( stack.peek()
|
|
||||||
.getModel() );
|
|
||||||
}
|
|
||||||
|
|
||||||
private final BakedModel familyModel;
|
|
||||||
private final BakedModel colourModel;
|
|
||||||
private final HashMap<TurtleModelCombination, BakedModel> cachedModels = new HashMap<>();
|
|
||||||
private final ModelOverrideList overrides;
|
|
||||||
|
|
||||||
public TurtleSmartItemModel( BakedModel familyModel, BakedModel colourModel )
|
|
||||||
{
|
|
||||||
this.familyModel = familyModel;
|
|
||||||
this.colourModel = colourModel;
|
|
||||||
|
|
||||||
// this actually works I think, trust me
|
|
||||||
overrides = new ModelOverrideList( null, null, null, Collections.emptyList() )
|
|
||||||
{
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public BakedModel apply( @Nonnull BakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world,
|
|
||||||
@Nullable LivingEntity entity )
|
|
||||||
{
|
|
||||||
ItemTurtle turtle = (ItemTurtle) stack.getItem();
|
|
||||||
int colour = turtle.getColour( stack );
|
|
||||||
ITurtleUpgrade leftUpgrade = turtle.getUpgrade( stack, TurtleSide.LEFT );
|
|
||||||
ITurtleUpgrade rightUpgrade = turtle.getUpgrade( stack, TurtleSide.RIGHT );
|
|
||||||
Identifier overlay = turtle.getOverlay( stack );
|
|
||||||
boolean christmas = HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS;
|
|
||||||
String label = turtle.getLabel( stack );
|
|
||||||
// TODO make upside down turtle items render properly (currently inivisible)
|
|
||||||
//boolean flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm"));
|
|
||||||
boolean flip = false;
|
|
||||||
TurtleModelCombination combo = new TurtleModelCombination( colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip );
|
|
||||||
|
|
||||||
BakedModel model = cachedModels.get( combo );
|
|
||||||
if( model == null )
|
|
||||||
{
|
|
||||||
cachedModels.put( combo, model = buildModel( combo ) );
|
|
||||||
}
|
|
||||||
return model;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private BakedModel buildModel( TurtleModelCombination combo )
|
|
||||||
{
|
|
||||||
MinecraftClient mc = MinecraftClient.getInstance();
|
|
||||||
BakedModelManager modelManager = mc.getItemRenderer()
|
|
||||||
.getModels()
|
|
||||||
.getModelManager();
|
|
||||||
ModelIdentifier overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.overlay, combo.christmas );
|
|
||||||
|
|
||||||
BakedModel baseModel = combo.colour ? colourModel : familyModel;
|
|
||||||
BakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
|
|
||||||
AffineTransformation transform = combo.flip ? flip : identity;
|
|
||||||
TransformedModel leftModel = combo.leftUpgrade != null ? combo.leftUpgrade.getModel( null, TurtleSide.LEFT ) : null;
|
|
||||||
TransformedModel rightModel = combo.rightUpgrade != null ? combo.rightUpgrade.getModel( null, TurtleSide.RIGHT ) : null;
|
|
||||||
return new TurtleMultiModel( baseModel, overlayModel, transform, leftModel, rightModel );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand )
|
|
||||||
{
|
|
||||||
return familyModel.getQuads( state, facing, rand );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean useAmbientOcclusion()
|
|
||||||
{
|
|
||||||
return familyModel.useAmbientOcclusion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasDepth()
|
|
||||||
{
|
|
||||||
return familyModel.hasDepth();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSideLit()
|
|
||||||
{
|
|
||||||
return familyModel.isSideLit();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isBuiltin()
|
|
||||||
{
|
|
||||||
return familyModel.isBuiltin();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public Sprite getSprite()
|
|
||||||
{
|
|
||||||
return familyModel.getSprite();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public ModelTransformation getTransformation()
|
|
||||||
{
|
|
||||||
return familyModel.getTransformation();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public ModelOverrideList getOverrides()
|
|
||||||
{
|
|
||||||
return overrides;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class TurtleModelCombination
|
|
||||||
{
|
|
||||||
final boolean colour;
|
|
||||||
final ITurtleUpgrade leftUpgrade;
|
|
||||||
final ITurtleUpgrade rightUpgrade;
|
|
||||||
final Identifier overlay;
|
|
||||||
final boolean christmas;
|
|
||||||
final boolean flip;
|
|
||||||
|
|
||||||
TurtleModelCombination( boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, Identifier overlay, boolean christmas,
|
|
||||||
boolean flip )
|
|
||||||
{
|
|
||||||
this.colour = colour;
|
|
||||||
this.leftUpgrade = leftUpgrade;
|
|
||||||
this.rightUpgrade = rightUpgrade;
|
|
||||||
this.overlay = overlay;
|
|
||||||
this.christmas = christmas;
|
|
||||||
this.flip = flip;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode()
|
|
||||||
{
|
|
||||||
final int prime = 31;
|
|
||||||
int result = 0;
|
|
||||||
result = prime * result + (colour ? 1 : 0);
|
|
||||||
result = prime * result + (leftUpgrade != null ? leftUpgrade.hashCode() : 0);
|
|
||||||
result = prime * result + (rightUpgrade != null ? rightUpgrade.hashCode() : 0);
|
|
||||||
result = prime * result + (overlay != null ? overlay.hashCode() : 0);
|
|
||||||
result = prime * result + (christmas ? 1 : 0);
|
|
||||||
result = prime * result + (flip ? 1 : 0);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals( Object other )
|
|
||||||
{
|
|
||||||
if( other == this )
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if( !(other instanceof TurtleModelCombination) )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
TurtleModelCombination otherCombo = (TurtleModelCombination) other;
|
|
||||||
return otherCombo.colour == colour && otherCombo.leftUpgrade == leftUpgrade && otherCombo.rightUpgrade == rightUpgrade && Objects.equal(
|
|
||||||
otherCombo.overlay, overlay ) && otherCombo.christmas == christmas && otherCombo.flip == flip;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.core.apis;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.ILuaAPIFactory;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public final class ApiFactories
|
|
||||||
{
|
|
||||||
private ApiFactories()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Collection<ILuaAPIFactory> factories = new LinkedHashSet<>();
|
|
||||||
private static final Collection<ILuaAPIFactory> factoriesView = Collections.unmodifiableCollection( factories );
|
|
||||||
|
|
||||||
public static synchronized void register( @Nonnull ILuaAPIFactory factory )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( factory, "provider cannot be null" );
|
|
||||||
factories.add( factory );
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Iterable<ILuaAPIFactory> getAll()
|
|
||||||
{
|
|
||||||
return factoriesView;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.core.apis;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.filesystem.IMount;
|
|
||||||
import dan200.computercraft.api.filesystem.IWritableMount;
|
|
||||||
import dan200.computercraft.api.peripheral.IComputerAccess;
|
|
||||||
import dan200.computercraft.api.peripheral.IWorkMonitor;
|
|
||||||
import dan200.computercraft.core.filesystem.FileSystem;
|
|
||||||
import dan200.computercraft.core.filesystem.FileSystemException;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
public abstract class ComputerAccess implements IComputerAccess
|
|
||||||
{
|
|
||||||
private final IAPIEnvironment environment;
|
|
||||||
private final Set<String> mounts = new HashSet<>();
|
|
||||||
|
|
||||||
protected ComputerAccess( IAPIEnvironment environment )
|
|
||||||
{
|
|
||||||
this.environment = environment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void unmountAll()
|
|
||||||
{
|
|
||||||
FileSystem fileSystem = environment.getFileSystem();
|
|
||||||
for( String mount : mounts )
|
|
||||||
{
|
|
||||||
fileSystem.unmount( mount );
|
|
||||||
}
|
|
||||||
mounts.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized String mount( @Nonnull String desiredLoc, @Nonnull IMount mount, @Nonnull String driveName )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( desiredLoc, "desiredLocation cannot be null" );
|
|
||||||
Objects.requireNonNull( mount, "mount cannot be null" );
|
|
||||||
Objects.requireNonNull( driveName, "driveName cannot be null" );
|
|
||||||
|
|
||||||
// Mount the location
|
|
||||||
String location;
|
|
||||||
FileSystem fileSystem = environment.getFileSystem();
|
|
||||||
if( fileSystem == null ) throw new IllegalStateException( "File system has not been created" );
|
|
||||||
|
|
||||||
synchronized( fileSystem )
|
|
||||||
{
|
|
||||||
location = findFreeLocation( desiredLoc );
|
|
||||||
if( location != null )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
fileSystem.mount( driveName, location, mount );
|
|
||||||
}
|
|
||||||
catch( FileSystemException ignored )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( location != null ) mounts.add( location );
|
|
||||||
return location;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized String mountWritable( @Nonnull String desiredLoc, @Nonnull IWritableMount mount, @Nonnull String driveName )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( desiredLoc, "desiredLocation cannot be null" );
|
|
||||||
Objects.requireNonNull( mount, "mount cannot be null" );
|
|
||||||
Objects.requireNonNull( driveName, "driveName cannot be null" );
|
|
||||||
|
|
||||||
// Mount the location
|
|
||||||
String location;
|
|
||||||
FileSystem fileSystem = environment.getFileSystem();
|
|
||||||
if( fileSystem == null ) throw new IllegalStateException( "File system has not been created" );
|
|
||||||
|
|
||||||
synchronized( fileSystem )
|
|
||||||
{
|
|
||||||
location = findFreeLocation( desiredLoc );
|
|
||||||
if( location != null )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
fileSystem.mountWritable( driveName, location, mount );
|
|
||||||
}
|
|
||||||
catch( FileSystemException ignored )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( location != null ) mounts.add( location );
|
|
||||||
return location;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unmount( String location )
|
|
||||||
{
|
|
||||||
if( location == null ) return;
|
|
||||||
if( !mounts.contains( location ) ) throw new IllegalStateException( "You didn't mount this location" );
|
|
||||||
|
|
||||||
environment.getFileSystem().unmount( location );
|
|
||||||
mounts.remove( location );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getID()
|
|
||||||
{
|
|
||||||
return environment.getComputerID();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void queueEvent( @Nonnull String event, Object... arguments )
|
|
||||||
{
|
|
||||||
Objects.requireNonNull( event, "event cannot be null" );
|
|
||||||
environment.queueEvent( event, arguments );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
@Override
|
|
||||||
public IWorkMonitor getMainThreadMonitor()
|
|
||||||
{
|
|
||||||
return environment.getMainThreadMonitor();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String findFreeLocation( String desiredLoc )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
FileSystem fileSystem = environment.getFileSystem();
|
|
||||||
if( !fileSystem.exists( desiredLoc ) ) return desiredLoc;
|
|
||||||
|
|
||||||
// We used to check foo2, foo3, foo4, etc here but the disk drive does this itself now
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,508 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.core.apis;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.IArguments;
|
|
||||||
import dan200.computercraft.api.lua.ILuaAPI;
|
|
||||||
import dan200.computercraft.api.lua.LuaException;
|
|
||||||
import dan200.computercraft.api.lua.LuaFunction;
|
|
||||||
import dan200.computercraft.core.apis.handles.BinaryReadableHandle;
|
|
||||||
import dan200.computercraft.core.apis.handles.BinaryWritableHandle;
|
|
||||||
import dan200.computercraft.core.apis.handles.EncodedReadableHandle;
|
|
||||||
import dan200.computercraft.core.apis.handles.EncodedWritableHandle;
|
|
||||||
import dan200.computercraft.core.filesystem.FileSystem;
|
|
||||||
import dan200.computercraft.core.filesystem.FileSystemException;
|
|
||||||
import dan200.computercraft.core.filesystem.FileSystemWrapper;
|
|
||||||
import dan200.computercraft.core.tracking.TrackingField;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.BufferedWriter;
|
|
||||||
import java.nio.channels.ReadableByteChannel;
|
|
||||||
import java.nio.channels.WritableByteChannel;
|
|
||||||
import java.nio.file.attribute.BasicFileAttributes;
|
|
||||||
import java.nio.file.attribute.FileTime;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.OptionalLong;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The FS API allows you to manipulate files and the filesystem.
|
|
||||||
*
|
|
||||||
* @cc.module fs
|
|
||||||
*/
|
|
||||||
public class FSAPI implements ILuaAPI
|
|
||||||
{
|
|
||||||
private final IAPIEnvironment environment;
|
|
||||||
private FileSystem fileSystem = null;
|
|
||||||
|
|
||||||
public FSAPI( IAPIEnvironment env )
|
|
||||||
{
|
|
||||||
environment = env;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getNames()
|
|
||||||
{
|
|
||||||
return new String[] { "fs" };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startup()
|
|
||||||
{
|
|
||||||
fileSystem = environment.getFileSystem();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void shutdown()
|
|
||||||
{
|
|
||||||
fileSystem = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a list of files in a directory.
|
|
||||||
*
|
|
||||||
* @param path The path to list.
|
|
||||||
* @return A table with a list of files in the directory.
|
|
||||||
* @throws LuaException If the path doesn't exist.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final String[] list( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.list( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Combines several parts of a path into one full path, adding separators as
|
|
||||||
* needed.
|
|
||||||
*
|
|
||||||
* @param arguments The paths to combine.
|
|
||||||
* @return The new path, with separators added between parts as needed.
|
|
||||||
* @throws LuaException On argument errors.
|
|
||||||
* @cc.tparam string path The first part of the path. For example, a parent directory path.
|
|
||||||
* @cc.tparam string ... Additional parts of the path to combine.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final String combine( IArguments arguments ) throws LuaException
|
|
||||||
{
|
|
||||||
StringBuilder result = new StringBuilder();
|
|
||||||
result.append( FileSystem.sanitizePath( arguments.getString( 0 ), true ) );
|
|
||||||
|
|
||||||
for( int i = 1, n = arguments.count(); i < n; i++ )
|
|
||||||
{
|
|
||||||
String part = FileSystem.sanitizePath( arguments.getString( i ), true );
|
|
||||||
if( result.length() != 0 && !part.isEmpty() ) result.append( '/' );
|
|
||||||
result.append( part );
|
|
||||||
}
|
|
||||||
|
|
||||||
return FileSystem.sanitizePath( result.toString(), true );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the file name portion of a path.
|
|
||||||
*
|
|
||||||
* @param path The path to get the name from.
|
|
||||||
* @return The final part of the path (the file name).
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final String getName( String path )
|
|
||||||
{
|
|
||||||
return FileSystem.getName( path );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the parent directory portion of a path.
|
|
||||||
*
|
|
||||||
* @param path The path to get the directory from.
|
|
||||||
* @return The path with the final part removed (the parent directory).
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final String getDir( String path )
|
|
||||||
{
|
|
||||||
return FileSystem.getDirectory( path );
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the size of the specified file.
|
|
||||||
*
|
|
||||||
* @param path The file to get the file size of.
|
|
||||||
* @return The size of the file, in bytes.
|
|
||||||
* @throws LuaException If the path doesn't exist.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final long getSize( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.getSize( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether the specified path exists.
|
|
||||||
*
|
|
||||||
* @param path The path to check the existence of.
|
|
||||||
* @return Whether the path exists.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final boolean exists( String path )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.exists( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether the specified path is a directory.
|
|
||||||
*
|
|
||||||
* @param path The path to check.
|
|
||||||
* @return Whether the path is a directory.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final boolean isDir( String path )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.isDir( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether a path is read-only.
|
|
||||||
*
|
|
||||||
* @param path The path to check.
|
|
||||||
* @return Whether the path cannot be written to.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final boolean isReadOnly( String path )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.isReadOnly( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a directory, and any missing parents, at the specified path.
|
|
||||||
*
|
|
||||||
* @param path The path to the directory to create.
|
|
||||||
* @throws LuaException If the directory couldn't be created.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final void makeDir( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
fileSystem.makeDir( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Moves a file or directory from one path to another.
|
|
||||||
*
|
|
||||||
* Any parent directories are created as needed.
|
|
||||||
*
|
|
||||||
* @param path The current file or directory to move from.
|
|
||||||
* @param dest The destination path for the file or directory.
|
|
||||||
* @throws LuaException If the file or directory couldn't be moved.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final void move( String path, String dest ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
fileSystem.move( path, dest );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copies a file or directory to a new path.
|
|
||||||
*
|
|
||||||
* Any parent directories are created as needed.
|
|
||||||
*
|
|
||||||
* @param path The file or directory to copy.
|
|
||||||
* @param dest The path to the destination file or directory.
|
|
||||||
* @throws LuaException If the file or directory couldn't be copied.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final void copy( String path, String dest ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
fileSystem.copy( path, dest );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes a file or directory.
|
|
||||||
*
|
|
||||||
* If the path points to a directory, all of the enclosed files and
|
|
||||||
* subdirectories are also deleted.
|
|
||||||
*
|
|
||||||
* @param path The path to the file or directory to delete.
|
|
||||||
* @throws LuaException If the file or directory couldn't be deleted.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final void delete( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
fileSystem.delete( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME: Add individual handle type documentation
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens a file for reading or writing at a path.
|
|
||||||
*
|
|
||||||
* The mode parameter can be {@code r} to read, {@code w} to write (deleting
|
|
||||||
* all contents), or {@code a} to append (keeping contents). If {@code b} is
|
|
||||||
* added to the end, the file will be opened in binary mode; otherwise, it's
|
|
||||||
* opened in text mode.
|
|
||||||
*
|
|
||||||
* @param path The path to the file to open.
|
|
||||||
* @param mode The mode to open the file with.
|
|
||||||
* @return A file handle object for the file, or {@code nil} + an error message on error.
|
|
||||||
* @throws LuaException If an invalid mode was specified.
|
|
||||||
* @cc.treturn [1] table A file handle object for the file.
|
|
||||||
* @cc.treturn [2] nil If the file does not exist, or cannot be opened.
|
|
||||||
* @cc.treturn string|nil A message explaining why the file cannot be opened.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final Object[] open( String path, String mode ) throws LuaException
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
try
|
|
||||||
{
|
|
||||||
switch( mode )
|
|
||||||
{
|
|
||||||
case "r":
|
|
||||||
{
|
|
||||||
// Open the file for reading, then create a wrapper around the reader
|
|
||||||
FileSystemWrapper<BufferedReader> reader = fileSystem.openForRead( path, EncodedReadableHandle::openUtf8 );
|
|
||||||
return new Object[] { new EncodedReadableHandle( reader.get(), reader ) };
|
|
||||||
}
|
|
||||||
case "w":
|
|
||||||
{
|
|
||||||
// Open the file for writing, then create a wrapper around the writer
|
|
||||||
FileSystemWrapper<BufferedWriter> writer = fileSystem.openForWrite( path, false, EncodedWritableHandle::openUtf8 );
|
|
||||||
return new Object[] { new EncodedWritableHandle( writer.get(), writer ) };
|
|
||||||
}
|
|
||||||
case "a":
|
|
||||||
{
|
|
||||||
// Open the file for appending, then create a wrapper around the writer
|
|
||||||
FileSystemWrapper<BufferedWriter> writer = fileSystem.openForWrite( path, true, EncodedWritableHandle::openUtf8 );
|
|
||||||
return new Object[] { new EncodedWritableHandle( writer.get(), writer ) };
|
|
||||||
}
|
|
||||||
case "rb":
|
|
||||||
// Open the file for binary reading, then create a wrapper around the reader
|
|
||||||
FileSystemWrapper<ReadableByteChannel> reader = fileSystem.openForRead( path, Function.identity() );
|
|
||||||
return new Object[] { BinaryReadableHandle.of( reader.get(), reader ) };
|
|
||||||
case "wb":
|
|
||||||
{
|
|
||||||
// Open the file for binary writing, then create a wrapper around the writer
|
|
||||||
FileSystemWrapper<WritableByteChannel> writer = fileSystem.openForWrite( path, false, Function.identity() );
|
|
||||||
return new Object[] { BinaryWritableHandle.of( writer.get(), writer ) };
|
|
||||||
}
|
|
||||||
case "ab":
|
|
||||||
// Open the file for binary appending, then create a wrapper around the reader
|
|
||||||
FileSystemWrapper<WritableByteChannel> writer = fileSystem.openForWrite( path, true, Function.identity() );
|
|
||||||
return new Object[] { BinaryWritableHandle.of( writer.get(), writer ) };
|
|
||||||
default:
|
|
||||||
throw new LuaException( "Unsupported mode" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
return new Object[] { null, e.getMessage() };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the name of the mount that the specified path is located on.
|
|
||||||
*
|
|
||||||
* @param path The path to get the drive of.
|
|
||||||
* @return The name of the drive that the file is on; e.g. {@code hdd} for local files, or {@code rom} for ROM files.
|
|
||||||
* @throws LuaException If the path doesn't exist.
|
|
||||||
* @cc.treturn string The name of the drive that the file is on; e.g. {@code hdd} for local files, or {@code rom} for ROM files.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final Object[] getDrive( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return fileSystem.exists( path ) ? new Object[] { fileSystem.getMountLabel( path ) } : null;
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the amount of free space available on the drive the path is
|
|
||||||
* located on.
|
|
||||||
*
|
|
||||||
* @param path The path to check the free space for.
|
|
||||||
* @return The amount of free space available, in bytes.
|
|
||||||
* @throws LuaException If the path doesn't exist.
|
|
||||||
* @cc.treturn number|"unlimited" The amount of free space available, in bytes, or "unlimited".
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final Object getFreeSpace( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
long freeSpace = fileSystem.getFreeSpace( path );
|
|
||||||
return freeSpace >= 0 ? freeSpace : "unlimited";
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Searches for files matching a string with wildcards.
|
|
||||||
*
|
|
||||||
* This string is formatted like a normal path string, but can include any
|
|
||||||
* number of wildcards ({@code *}) to look for files matching anything.
|
|
||||||
* For example, {@code rom/* /command*} will look for any path starting with
|
|
||||||
* {@code command} inside any subdirectory of {@code /rom}.
|
|
||||||
*
|
|
||||||
* @param path The wildcard-qualified path to search for.
|
|
||||||
* @return A list of paths that match the search string.
|
|
||||||
* @throws LuaException If the path doesn't exist.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final String[] find( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
environment.addTrackingChange( TrackingField.FS_OPS );
|
|
||||||
return fileSystem.find( path );
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if a path is mounted to the parent filesystem.
|
|
||||||
*
|
|
||||||
* The root filesystem "/" is considered a mount, along with disk folders and the rom folder. Other programs
|
|
||||||
* (such as network shares) can extend this to make other mount types by correctly assigning their return value for
|
|
||||||
* getDrive.
|
|
||||||
*
|
|
||||||
* @param path The path of the drive to get.
|
|
||||||
* @return The drive's capacity.
|
|
||||||
* @throws LuaException If the capacity cannot be determined.
|
|
||||||
* @cc.treturn number|nil This drive's capacity. This will be nil for "read-only" drives, such as the ROM or
|
|
||||||
* treasure disks.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final Object getCapacity( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
OptionalLong capacity = fileSystem.getCapacity( path );
|
|
||||||
return capacity.isPresent() ? capacity.getAsLong() : null;
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get attributes about a specific file or folder.
|
|
||||||
*
|
|
||||||
* The returned attributes table contains information about the size of the file, whether it is a directory,
|
|
||||||
* when it was created and last modified, and whether it is read only.
|
|
||||||
*
|
|
||||||
* The creation and modification times are given as the number of milliseconds since the UNIX epoch. This may be
|
|
||||||
* given to {@link OSAPI#date} in order to convert it to more usable form.
|
|
||||||
*
|
|
||||||
* @param path The path to get attributes for.
|
|
||||||
* @return The resulting attributes.
|
|
||||||
* @throws LuaException If the path does not exist.
|
|
||||||
* @cc.treturn { size = number, isDir = boolean, isReadOnly = boolean, created = number, modified = number } The resulting attributes.
|
|
||||||
* @see #getSize If you only care about the file's size.
|
|
||||||
* @see #isDir If you only care whether a path is a directory or not.
|
|
||||||
*/
|
|
||||||
@LuaFunction
|
|
||||||
public final Map<String, Object> attributes( String path ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
BasicFileAttributes attributes = fileSystem.getAttributes( path );
|
|
||||||
Map<String, Object> result = new HashMap<>();
|
|
||||||
result.put( "modification", getFileTime( attributes.lastModifiedTime() ) );
|
|
||||||
result.put( "modified", getFileTime( attributes.lastModifiedTime() ) );
|
|
||||||
result.put( "created", getFileTime( attributes.creationTime() ) );
|
|
||||||
result.put( "size", attributes.isDirectory() ? 0 : attributes.size() );
|
|
||||||
result.put( "isDir", attributes.isDirectory() );
|
|
||||||
result.put( "isReadOnly", fileSystem.isReadOnly( path ) );
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
catch( FileSystemException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static long getFileTime( FileTime time )
|
|
||||||
{
|
|
||||||
return time == null ? 0 : time.toMillis();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.core.apis;
|
|
||||||
|
|
||||||
import dan200.computercraft.api.lua.LuaException;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A Lua exception which does not contain its stack trace.
|
|
||||||
*/
|
|
||||||
public class FastLuaException extends LuaException
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 5957864899303561143L;
|
|
||||||
|
|
||||||
public FastLuaException( @Nullable String message )
|
|
||||||
{
|
|
||||||
super( message );
|
|
||||||
}
|
|
||||||
|
|
||||||
public FastLuaException( @Nullable String message, int level )
|
|
||||||
{
|
|
||||||
super( message, level );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public synchronized Throwable fillInStackTrace()
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,214 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
||||||
* Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
|
|
||||||
* Send enquiries to dratcliffe@gmail.com
|
|
||||||
*/
|
|
||||||
package dan200.computercraft.core.apis;
|
|
||||||
|
|
||||||
import dan200.computercraft.ComputerCraft;
|
|
||||||
import dan200.computercraft.api.lua.IArguments;
|
|
||||||
import dan200.computercraft.api.lua.ILuaAPI;
|
|
||||||
import dan200.computercraft.api.lua.LuaException;
|
|
||||||
import dan200.computercraft.api.lua.LuaFunction;
|
|
||||||
import dan200.computercraft.core.apis.http.*;
|
|
||||||
import dan200.computercraft.core.apis.http.request.HttpRequest;
|
|
||||||
import dan200.computercraft.core.apis.http.websocket.Websocket;
|
|
||||||
import io.netty.handler.codec.http.DefaultHttpHeaders;
|
|
||||||
import io.netty.handler.codec.http.HttpHeaderNames;
|
|
||||||
import io.netty.handler.codec.http.HttpHeaders;
|
|
||||||
import io.netty.handler.codec.http.HttpMethod;
|
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static dan200.computercraft.core.apis.TableHelper.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The http library allows communicating with web servers, sending and receiving data from them.
|
|
||||||
*
|
|
||||||
* @cc.module http
|
|
||||||
* @hidden
|
|
||||||
*/
|
|
||||||
public class HTTPAPI implements ILuaAPI
|
|
||||||
{
|
|
||||||
private final IAPIEnvironment apiEnvironment;
|
|
||||||
|
|
||||||
private final ResourceGroup<CheckUrl> checkUrls = new ResourceGroup<>( ResourceGroup.DEFAULT );
|
|
||||||
private final ResourceGroup<HttpRequest> requests = new ResourceQueue<>( () -> ComputerCraft.httpMaxRequests );
|
|
||||||
private final ResourceGroup<Websocket> websockets = new ResourceGroup<>( () -> ComputerCraft.httpMaxWebsockets );
|
|
||||||
|
|
||||||
public HTTPAPI( IAPIEnvironment environment )
|
|
||||||
{
|
|
||||||
apiEnvironment = environment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getNames()
|
|
||||||
{
|
|
||||||
return new String[] { "http" };
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void startup()
|
|
||||||
{
|
|
||||||
checkUrls.startup();
|
|
||||||
requests.startup();
|
|
||||||
websockets.startup();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void shutdown()
|
|
||||||
{
|
|
||||||
checkUrls.shutdown();
|
|
||||||
requests.shutdown();
|
|
||||||
websockets.shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update()
|
|
||||||
{
|
|
||||||
// It's rather ugly to run this here, but we need to clean up
|
|
||||||
// resources as often as possible to reduce blocking.
|
|
||||||
Resource.cleanup();
|
|
||||||
}
|
|
||||||
|
|
||||||
@LuaFunction
|
|
||||||
public final Object[] request( IArguments args ) throws LuaException
|
|
||||||
{
|
|
||||||
String address, postString, requestMethod;
|
|
||||||
Map<?, ?> headerTable;
|
|
||||||
boolean binary, redirect;
|
|
||||||
|
|
||||||
if( args.get( 0 ) instanceof Map )
|
|
||||||
{
|
|
||||||
Map<?, ?> options = args.getTable( 0 );
|
|
||||||
address = getStringField( options, "url" );
|
|
||||||
postString = optStringField( options, "body", null );
|
|
||||||
headerTable = optTableField( options, "headers", Collections.emptyMap() );
|
|
||||||
binary = optBooleanField( options, "binary", false );
|
|
||||||
requestMethod = optStringField( options, "method", null );
|
|
||||||
redirect = optBooleanField( options, "redirect", true );
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Get URL and post information
|
|
||||||
address = args.getString( 0 );
|
|
||||||
postString = args.optString( 1, null );
|
|
||||||
headerTable = args.optTable( 2, Collections.emptyMap() );
|
|
||||||
binary = args.optBoolean( 3, false );
|
|
||||||
requestMethod = null;
|
|
||||||
redirect = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpHeaders headers = getHeaders( headerTable );
|
|
||||||
|
|
||||||
HttpMethod httpMethod;
|
|
||||||
if( requestMethod == null )
|
|
||||||
{
|
|
||||||
httpMethod = postString == null ? HttpMethod.GET : HttpMethod.POST;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
httpMethod = HttpMethod.valueOf( requestMethod.toUpperCase( Locale.ROOT ) );
|
|
||||||
if( httpMethod == null || requestMethod.equalsIgnoreCase( "CONNECT" ) )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Unsupported HTTP method" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
URI uri = HttpRequest.checkUri( address );
|
|
||||||
HttpRequest request = new HttpRequest( requests, apiEnvironment, address, postString, headers, binary, redirect );
|
|
||||||
|
|
||||||
// Make the request
|
|
||||||
if( !request.queue( r -> r.request( uri, httpMethod ) ) )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Too many ongoing HTTP requests" );
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Object[] { true };
|
|
||||||
}
|
|
||||||
catch( HTTPRequestException e )
|
|
||||||
{
|
|
||||||
return new Object[] { false, e.getMessage() };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@LuaFunction
|
|
||||||
public final Object[] checkURL( String address ) throws LuaException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
URI uri = HttpRequest.checkUri( address );
|
|
||||||
if( !new CheckUrl( checkUrls, apiEnvironment, address, uri ).queue( CheckUrl::run ) )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Too many ongoing checkUrl calls" );
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Object[] { true };
|
|
||||||
}
|
|
||||||
catch( HTTPRequestException e )
|
|
||||||
{
|
|
||||||
return new Object[] { false, e.getMessage() };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@LuaFunction
|
|
||||||
public final Object[] websocket( String address, Optional<Map<?, ?>> headerTbl ) throws LuaException
|
|
||||||
{
|
|
||||||
if( !ComputerCraft.httpWebsocketEnabled )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Websocket connections are disabled" );
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpHeaders headers = getHeaders( headerTbl.orElse( Collections.emptyMap() ) );
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
URI uri = Websocket.checkUri( address );
|
|
||||||
if( !new Websocket( websockets, apiEnvironment, uri, address, headers ).queue( Websocket::connect ) )
|
|
||||||
{
|
|
||||||
throw new LuaException( "Too many websockets already open" );
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Object[] { true };
|
|
||||||
}
|
|
||||||
catch( HTTPRequestException e )
|
|
||||||
{
|
|
||||||
return new Object[] { false, e.getMessage() };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nonnull
|
|
||||||
private HttpHeaders getHeaders( @Nonnull Map<?, ?> headerTable ) throws LuaException
|
|
||||||
{
|
|
||||||
HttpHeaders headers = new DefaultHttpHeaders();
|
|
||||||
for( Map.Entry<?, ?> entry : headerTable.entrySet() )
|
|
||||||
{
|
|
||||||
Object value = entry.getValue();
|
|
||||||
if( entry.getKey() instanceof String && value instanceof String )
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
headers.add( (String) entry.getKey(), value );
|
|
||||||
}
|
|
||||||
catch( IllegalArgumentException e )
|
|
||||||
{
|
|
||||||
throw new LuaException( e.getMessage() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !headers.contains( HttpHeaderNames.USER_AGENT ) )
|
|
||||||
{
|
|
||||||
headers.set( HttpHeaderNames.USER_AGENT, apiEnvironment.getComputerEnvironment().getUserAgent() );
|
|
||||||
}
|
|
||||||
return headers;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user