mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-07 04:22: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.
105 lines
2.5 KiB
Java
105 lines
2.5 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.client.gui.widgets;
|
|
|
|
import net.minecraft.client.gui.IGuiEventListener;
|
|
|
|
public class WidgetWrapper implements IGuiEventListener
|
|
{
|
|
private final IGuiEventListener listener;
|
|
private final int x;
|
|
private final int y;
|
|
private final int width;
|
|
private final int height;
|
|
|
|
public WidgetWrapper( IGuiEventListener 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 void focusChanged( boolean b )
|
|
{
|
|
listener.focusChanged( b );
|
|
}
|
|
|
|
@Override
|
|
public boolean canFocus()
|
|
{
|
|
return listener.canFocus();
|
|
}
|
|
|
|
@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 delta )
|
|
{
|
|
return listener.mouseScrolled( 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 );
|
|
}
|
|
|
|
public int getX()
|
|
{
|
|
return x;
|
|
}
|
|
|
|
public int getY()
|
|
{
|
|
return y;
|
|
}
|
|
|
|
public int getWidth()
|
|
{
|
|
return width;
|
|
}
|
|
|
|
public int getHeight()
|
|
{
|
|
return height;
|
|
}
|
|
}
|