diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 36acce6..e1a9e66 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -167,7 +167,7 @@ public class ClientProxy extends SharedProxy implements CefDisplayHandler/*, IJS BlockSide side = BlockSide.values()[result.getDirection().ordinal()]; Multiblock.findOrigin(mc.level, pos, side, null); - TileEntityScreen te = (TileEntityScreen) mc.level.getBlockEntity(pos.toBlock()); + ScreenBlockEntity te = (ScreenBlockEntity) mc.level.getBlockEntity(pos.toBlock()); ScreenData sc = te.getScreen(side); diff --git a/src/main/java/net/montoyo/wd/client/gui/camera/KeyboardCamera.java b/src/main/java/net/montoyo/wd/client/gui/camera/KeyboardCamera.java index c23e722..6ef1cd8 100644 --- a/src/main/java/net/montoyo/wd/client/gui/camera/KeyboardCamera.java +++ b/src/main/java/net/montoyo/wd/client/gui/camera/KeyboardCamera.java @@ -9,14 +9,12 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.client.event.ViewportEvent; import net.minecraftforge.event.TickEvent; import net.montoyo.wd.client.js.WDRouter; +import net.montoyo.wd.entity.ScreenBlockEntity; import net.montoyo.wd.entity.ScreenData; -import net.montoyo.wd.entity.TileEntityScreen; -import net.montoyo.wd.utilities.BlockSide; - -import java.util.concurrent.CompletableFuture; +import net.montoyo.wd.utilities.data.BlockSide; public class KeyboardCamera { - private static TileEntityScreen tes; + private static ScreenBlockEntity tes; private static BlockSide side; private static double oxCrd = -1; @@ -49,7 +47,7 @@ public class KeyboardCamera { protected static void pollElement() { if (activeTask != null) return; - TileEntityScreen teTmp = tes; + ScreenBlockEntity teTmp = tes; BlockSide sdTmp = side; // async nonsense can occur here @@ -92,7 +90,6 @@ public class KeyboardCamera { } """.replace("\n", "") ).thenAccept((o1) -> { - System.out.println(o1); updateCrd(o1); activeTask = null; }); @@ -187,7 +184,7 @@ public class KeyboardCamera { event.setPitch(angle[0]); } - public static void focus(TileEntityScreen screen, BlockSide side) { + public static void focus(ScreenBlockEntity screen, BlockSide side) { KeyboardCamera.tes = screen; KeyboardCamera.side = side; } diff --git a/src/main/java/net/montoyo/wd/data/ScreenConfigData.java b/src/main/java/net/montoyo/wd/data/ScreenConfigData.java index 9e2f6ef..8ea1b73 100644 --- a/src/main/java/net/montoyo/wd/data/ScreenConfigData.java +++ b/src/main/java/net/montoyo/wd/data/ScreenConfigData.java @@ -63,12 +63,12 @@ public class ScreenConfigData extends GuiData { return null; BlockEntity te = world.getBlockEntity(pos.toBlock()); - if (te == null || !(te instanceof TileEntityScreen)) { + if (te == null || !(te instanceof ScreenBlockEntity)) { Log.error("TileEntity at %s is not a screen; can't open gui!", pos.toString()); return null; } - return new GuiScreenConfig(Component.nullToEmpty(""), (TileEntityScreen) te, side, friends, friendRights, otherRights); + return new GuiScreenConfig(Component.nullToEmpty(""), (ScreenBlockEntity) te, side, friends, friendRights, otherRights); } @Override diff --git a/src/main/java/net/montoyo/wd/entity/ScreenBlockEntity.java b/src/main/java/net/montoyo/wd/entity/ScreenBlockEntity.java index 60c5a4d..89414bc 100644 --- a/src/main/java/net/montoyo/wd/entity/ScreenBlockEntity.java +++ b/src/main/java/net/montoyo/wd/entity/ScreenBlockEntity.java @@ -112,7 +112,7 @@ public class ScreenBlockEntity extends BlockEntity { return; // very important to close these - for (Screen screen : screens) { + for (ScreenData screen : screens) { if (screen.browser != null) { screen.browser.close(true); screen.browser = null; @@ -234,7 +234,7 @@ public class ScreenBlockEntity extends BlockEntity { public void clear() { // very important that these get closed - for (Screen screen : screens) + for (ScreenData screen : screens) if (screen.browser != null) { screen.browser.close(true); screen.browser = null; diff --git a/src/main/java/net/montoyo/wd/entity/ScreenData.java b/src/main/java/net/montoyo/wd/entity/ScreenData.java index 4b52a82..f3b696a 100644 --- a/src/main/java/net/montoyo/wd/entity/ScreenData.java +++ b/src/main/java/net/montoyo/wd/entity/ScreenData.java @@ -15,6 +15,10 @@ import net.montoyo.wd.client.ClientProxy; import net.montoyo.wd.config.CommonConfig; import net.montoyo.wd.core.ScreenRights; import net.montoyo.wd.utilities.*; +import net.montoyo.wd.utilities.data.BlockSide; +import net.montoyo.wd.utilities.data.Rotation; +import net.montoyo.wd.utilities.math.Vector2i; +import net.montoyo.wd.utilities.serialization.NameUUIDPair; import org.cef.browser.CefBrowser; import java.util.ArrayList; diff --git a/src/main/java/net/montoyo/wd/item/ItemLaserPointer.java b/src/main/java/net/montoyo/wd/item/ItemLaserPointer.java index acec927..57abf04 100644 --- a/src/main/java/net/montoyo/wd/item/ItemLaserPointer.java +++ b/src/main/java/net/montoyo/wd/item/ItemLaserPointer.java @@ -82,7 +82,7 @@ public class ItemLaserPointer extends Item implements WDItem { deselectScreen(); } - private static void laserClick(TileEntityScreen tes, BlockSide side, ScreenData scr, Vector2i hit) { + private static void laserClick(ScreenBlockEntity tes, BlockSide side, ScreenData scr, Vector2i hit) { tes.handleMouseEvent(side, ClickControl.ControlType.MOVE, hit, -1); if (pointedScreen == tes && pointedScreenSide == side) { long t = System.currentTimeMillis(); diff --git a/src/main/java/net/montoyo/wd/item/ItemLinker.java b/src/main/java/net/montoyo/wd/item/ItemLinker.java index 322b2b6..b8f44f0 100644 --- a/src/main/java/net/montoyo/wd/item/ItemLinker.java +++ b/src/main/java/net/montoyo/wd/item/ItemLinker.java @@ -96,7 +96,7 @@ public class ItemLinker extends Item implements WDItem { return InteractionResult.SUCCESS; } - ScreenData scr = ((TileEntityScreen) te).getScreen(side); + ScreenData scr = ((ScreenBlockEntity) te).getScreen(side); if(scr == null) Util.toast(context.getPlayer(), "turnOn"); else if ((scr.rightsFor(context.getPlayer()) & ScreenRights.MANAGE_UPGRADES) == 0) diff --git a/src/main/java/net/montoyo/wd/item/ItemOwnershipThief.java b/src/main/java/net/montoyo/wd/item/ItemOwnershipThief.java index 41221c1..cdf515d 100644 --- a/src/main/java/net/montoyo/wd/item/ItemOwnershipThief.java +++ b/src/main/java/net/montoyo/wd/item/ItemOwnershipThief.java @@ -61,7 +61,7 @@ public class ItemOwnershipThief extends Item implements WDItem { if (te == null || !(te instanceof ScreenBlockEntity)) return InteractionResult.SUCCESS; - TileEntityScreen tes = (TileEntityScreen) te; + ScreenBlockEntity tes = (ScreenBlockEntity) te; ScreenData scr = tes.getScreen(side); if(scr == null) return InteractionResult.SUCCESS; diff --git a/src/main/java/net/montoyo/wd/item/ItemScreenConfigurator.java b/src/main/java/net/montoyo/wd/item/ItemScreenConfigurator.java index 1c323dc..0ee7a42 100644 --- a/src/main/java/net/montoyo/wd/item/ItemScreenConfigurator.java +++ b/src/main/java/net/montoyo/wd/item/ItemScreenConfigurator.java @@ -47,7 +47,7 @@ public class ItemScreenConfigurator extends Item implements WDItem { return InteractionResult.SUCCESS; } - ScreenData scr = ((TileEntityScreen) te).getScreen(side); + ScreenData scr = ((ScreenBlockEntity) te).getScreen(side); if(scr == null) Util.toast(context.getPlayer(), "turnOn"); else diff --git a/src/main/java/net/montoyo/wd/net/client_bound/S2CMessageAddScreen.java b/src/main/java/net/montoyo/wd/net/client_bound/S2CMessageAddScreen.java index b974b20..31ebfde 100644 --- a/src/main/java/net/montoyo/wd/net/client_bound/S2CMessageAddScreen.java +++ b/src/main/java/net/montoyo/wd/net/client_bound/S2CMessageAddScreen.java @@ -39,7 +39,7 @@ public class S2CMessageAddScreen extends Packet { screens[i] = tes.getScreen(i); } - public S2CMessageAddScreen(TileEntityScreen tes, ScreenData... toSend) { + public S2CMessageAddScreen(ScreenBlockEntity tes, ScreenData... toSend) { clear = false; pos = new Vector3i(tes.getBlockPos()); screens = toSend;