mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-03 18:42:53 +00:00
f9e13ca67a
Look, I originally had this split into several commits, but lots of
other cleanups got mixed in. I then backported some of the cleanups to
1.12, did other tidy ups there, and eventually the web of merges was
unreadable.
Yes, this is a horrible mess, but it's still nicer than it was. Anyway,
changes:
- Flatten everything. For instance, there are now three instances of
BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no
more BlockPeripheral (thank heavens) - there's separate block classes
for each peripheral type.
- Remove pretty much all legacy code. As we're breaking world
compatibility anyway, we can remove all the code to load worlds from
1.4 days.
- The command system is largely rewriten to take advantage of 1.13's
new system. It's very fancy!
- WidgetTerminal now uses Minecraft's "GUI listener" system.
- BREAKING CHANGE: All the codes in keys.lua are different, due to the
move to LWJGL 3. Hopefully this won't have too much of an impact.
I don't want to map to the old key codes on the Java side, as there
always ends up being small but slight inconsistencies. IMO it's
better to make a clean break - people should be using keys rather
than hard coding the constants anyway.
- commands.list now allows fetching sub-commands. The ROM has already
been updated to allow fancy usage such as commands.time.set("noon").
- Turtles, modems and cables can be waterlogged.
87 lines
2.0 KiB
Java
87 lines
2.0 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
|
|
package dan200.computercraft.shared.common;
|
|
|
|
import dan200.computercraft.core.terminal.Terminal;
|
|
import net.minecraft.nbt.NBTTagCompound;
|
|
|
|
public class ClientTerminal implements ITerminal
|
|
{
|
|
private boolean m_colour;
|
|
private Terminal m_terminal;
|
|
private boolean m_terminalChanged;
|
|
|
|
public ClientTerminal( boolean colour )
|
|
{
|
|
m_colour = colour;
|
|
m_terminal = null;
|
|
m_terminalChanged = false;
|
|
}
|
|
|
|
public boolean pollTerminalChanged()
|
|
{
|
|
boolean changed = m_terminalChanged;
|
|
m_terminalChanged = false;
|
|
|
|
Terminal terminal = m_terminal;
|
|
if( terminal != null ) terminal.clearChanged();
|
|
|
|
return changed;
|
|
}
|
|
|
|
// ITerminal implementation
|
|
|
|
@Override
|
|
public Terminal getTerminal()
|
|
{
|
|
return m_terminal;
|
|
}
|
|
|
|
@Override
|
|
public boolean isColour()
|
|
{
|
|
return m_colour;
|
|
}
|
|
|
|
public void readDescription( NBTTagCompound nbt )
|
|
{
|
|
m_colour = nbt.getBoolean( "colour" );
|
|
if( nbt.contains( "terminal" ) )
|
|
{
|
|
NBTTagCompound terminal = nbt.getCompound( "terminal" );
|
|
resizeTerminal( terminal.getInt( "term_width" ), terminal.getInt( "term_height" ) );
|
|
m_terminal.readFromNBT( terminal );
|
|
}
|
|
else
|
|
{
|
|
deleteTerminal();
|
|
}
|
|
}
|
|
|
|
private void resizeTerminal( int width, int height )
|
|
{
|
|
if( m_terminal == null )
|
|
{
|
|
m_terminal = new Terminal( width, height, () -> m_terminalChanged = true );
|
|
m_terminalChanged = true;
|
|
}
|
|
else
|
|
{
|
|
m_terminal.resize( width, height );
|
|
}
|
|
}
|
|
|
|
private void deleteTerminal()
|
|
{
|
|
if( m_terminal != null )
|
|
{
|
|
m_terminal = null;
|
|
m_terminalChanged = true;
|
|
}
|
|
}
|
|
}
|